[Libreoffice-commits] core.git: i18npool/inc i18npool/source solenv/clang-format
i18npool/inc/servicename.hxx|3 i18npool/source/transliteration/hiraganaToKatakana.cxx | 11 i18npool/source/transliteration/ignoreKashida_CTL.cxx | 10 i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx | 15 i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx | 13 i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx|5 i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx | 151 -- i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx|5 i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx | 20 - i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx| 20 - i18npool/source/transliteration/katakanaToHiragana.cxx | 10 i18npool/source/transliteration/largeToSmall_ja_JP.cxx | 67 ++-- i18npool/source/transliteration/smallToLarge_ja_JP.cxx | 67 ++-- solenv/clang-format/excludelist | 13 14 files changed, 192 insertions(+), 218 deletions(-) New commits: commit 10b23330a9655658e6d7ef1d008a3302a15e9629 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:00:14 2020 +0100 Commit: Christian Lohmaier CommitDate: Sun Nov 22 01:58:10 2020 +0100 tdf#123936 Formatting files in module i18npool with clang-format Change-Id: I95fe065f4dcbe9d7bab105944ba4f835e80718ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105678 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx index cbe187729078..a988d31d031d 100644 --- a/i18npool/inc/servicename.hxx +++ b/i18npool/inc/servicename.hxx @@ -53,12 +53,11 @@ Implementation Name */ - #ifndef INCLUDED_I18NPOOL_INC_SERVICENAME_HXX #define INCLUDED_I18NPOOL_INC_SERVICENAME_HXX #define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration" -#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME ".l10n" +#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME ".l10n" #define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration." //1...5...901...5...901...5...901..4 --> 34 diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx index 439ec58365e2..80b6f14d82f8 100644 --- a/i18npool/source/transliteration/hiraganaToKatakana.cxx +++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx @@ -22,12 +22,14 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -namespace i18npool { - +namespace i18npool +{ // see http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F) // see http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF) -static sal_Unicode toKatakana (const sal_Unicode c) { -if ( (0x3041 <= c && c <= 0x3096) || (0x309d <= c && c <= 0x309f) ) { // 3040 - 309F HIRAGANA LETTER +static sal_Unicode toKatakana(const sal_Unicode c) +{ +if ((0x3041 <= c && c <= 0x3096) || (0x309d <= c && c <= 0x309f)) +{ // 3040 - 309F HIRAGANA LETTER // shift code point by 0x0060 return c + (0x30a0 - 0x3040); } @@ -41,7 +43,6 @@ hiraganaToKatakana::hiraganaToKatakana() transliterationName = "hiraganaToKatakana"; implementationName = "com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA"; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx b/i18npool/source/transliteration/ignoreKashida_CTL.cxx index 4dfb54da2e7d..e93ffd849481 100644 --- a/i18npool/source/transliteration/ignoreKashida_CTL.cxx +++ b/i18npool/source/transliteration/ignoreKashida_CTL.cxx @@ -9,12 +9,11 @@ #include -namespace i18npool { - -static sal_Unicode -ignoreKashida_CTL_translator (const sal_Unicode c) +namespace i18npool +{ +static sal_Unicode ignoreKashida_CTL_translator(const sal_Unicode c) { -if( c == 0x0640 ) // Check if it's Kashida +if (c == 0x0640) // Check if it's Kashida return 0x; // Then skip this character return c; @@ -28,7 +27,6 @@ ignoreKashida_CTL::ignoreKashida_CTL() transliterationName = "ignoreKashida_CTL"; implementationName = "com.sun.star.i18n.Transliteration.ignoreKashida_CTL"; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx index b95a46910ae2..8b03275695bf 100644 --- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx @@ -19,16 +19,16 @@ #include -namespace i18npool { - -static sal_Unicode -ignoreMiddleDot_ja_JP_translator (const sal_Unicode c) +namespace i18npool +{ +static sal_Unicode ignoreMiddleDot_ja_JP_translator(const sal_Unicode c) { -switch (c) { +switch (c) +{ case 0x30FB: // KATAKANA MIDDLE DOT
[Libreoffice-commits] core.git: chart2/inc chart2/qa chart2/source solenv/clang-format
chart2/inc/SpecialCharacters.hxx |3 chart2/qa/extras/xshape/chart2xshape.cxx | 39 ++--- chart2/source/controller/accessibility/AccessibleViewForwarder.hxx | 18 +- chart2/source/controller/accessibility/ChartElementFactory.cxx | 13 - chart2/source/controller/accessibility/ChartElementFactory.hxx |5 chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx | 15 +- chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx | 10 - chart2/source/controller/dialogs/ChangingResource.cxx | 13 - chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx | 19 +- chart2/source/controller/dialogs/dlg_ChartType.cxx | 13 - chart2/source/controller/dialogs/dlg_InsertLegend.cxx | 11 - chart2/source/controller/dialogs/dlg_InsertTitle.cxx |7 chart2/source/controller/dialogs/dlg_NumberFormat.hxx |8 - chart2/source/controller/dialogs/res_BarGeometry.cxx | 15 -- chart2/source/controller/dialogs/res_Titles.cxx | 74 -- chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 30 ++-- chart2/source/controller/dialogs/tp_AxisPositions.hxx | 33 ++-- chart2/source/controller/dialogs/tp_DataLabel.hxx | 11 - chart2/source/controller/dialogs/tp_PointGeometry.hxx |7 chart2/source/controller/inc/ConfigurationAccess.hxx |4 chart2/source/controller/inc/ItemPropertyMap.hxx |8 - chart2/source/controller/inc/RangeSelectionListener.hxx | 25 +-- chart2/source/controller/inc/TabPageNotifiable.hxx |5 chart2/source/controller/inc/TextDirectionListBox.hxx |2 chart2/source/controller/inc/TimerTriggeredControllerLock.hxx | 21 +- chart2/source/controller/inc/dlg_ChartType.hxx |8 - chart2/source/controller/inc/dlg_CreationWizard.hxx | 21 +- chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 10 - chart2/source/controller/inc/dlg_InsertErrorBars.hxx | 20 +- chart2/source/controller/inc/dlg_View3D.hxx |9 - chart2/source/controller/inc/res_Titles.hxx | 22 ++ chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx | 15 -- chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx |6 chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx |9 - chart2/source/inc/ChartViewHelper.hxx | 13 + chart2/source/inc/ControllerLockGuard.hxx | 26 ++- chart2/source/inc/DisposeHelper.hxx | 12 - chart2/source/inc/FastPropertyIdRanges.hxx | 17 +- chart2/source/inc/ModifyListenerCallBack.hxx | 14 + chart2/source/inc/PopupRequest.hxx | 10 - chart2/source/inc/ResId.hxx |3 chart2/source/inc/WrappedDirectStateProperty.hxx |9 - chart2/source/inc/chartview/ExplicitScaleValues.hxx | 30 ++-- chart2/source/inc/servicenames_charttypes.hxx |4 chart2/source/model/inc/CartesianCoordinateSystem.hxx | 21 +- chart2/source/model/inc/PolarCoordinateSystem.hxx | 21 +- chart2/source/model/template/ColumnLineDataInterpreter.hxx | 11 - chart2/source/model/template/FilledNetChartType.hxx | 14 - chart2/source/tools/ChartViewHelper.cxx | 18 +- chart2/source/tools/PopupRequest.cxx |8 - chart2/source/tools/TrueGuard.cxx | 10 - chart2/source/view/axes/TickmarkProperties.hxx |6 chart2/source/view/charttypes/BarPositionHelper.hxx |9 - chart2/source/view/charttypes/CategoryPositionHelper.hxx | 22 +- chart2/source/view/inc/LabelAlignment.hxx
[Libreoffice-commits] core.git: sdext/source solenv/clang-format
sdext/source/minimizer/pppoptimizer.cxx|9 - sdext/source/minimizer/pppoptimizer.hxx|3 +-- sdext/source/minimizer/pppoptimizertoken.hxx |4 ++-- sdext/source/presenter/PresenterHelper.hxx | 22 +++--- sdext/source/presenter/PresenterPane.hxx | 24 +++- sdext/source/presenter/PresenterSprite.hxx | 12 +--- sdext/source/presenter/PresenterSpritePane.hxx | 21 ++--- sdext/source/presenter/PresenterUIPainter.hxx | 15 ++- solenv/clang-format/excludelist|8 9 files changed, 50 insertions(+), 68 deletions(-) New commits: commit a9bce41c64bda648be2609a0dc4aea728fa8ec77 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:14:32 2020 +0100 Commit: Christian Lohmaier CommitDate: Sun Nov 22 01:56:27 2020 +0100 tdf#123936 Formatting files in module sdext with clang-format Change-Id: Ibfed67a0f772ea0c02bf0e7267e9ed46517e2018 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105704 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 4d21ca3aabc9..c869f72187f6 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -17,19 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pppoptimizer.hxx" #include // returning filesize, on error zero is returned -sal_Int64 PPPOptimizer::GetFileSize( const OUString& rURL ) +sal_Int64 PPPOptimizer::GetFileSize(const OUString& rURL) { sal_Int64 nFileSize = 0; osl::DirectoryItem aItem; -if ( osl::DirectoryItem::get( rURL, aItem ) == osl::FileBase::E_None ) +if (osl::DirectoryItem::get(rURL, aItem) == osl::FileBase::E_None) { -osl::FileStatus aStatus( osl_FileStatus_Mask_FileSize ); -if ( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None ) +osl::FileStatus aStatus(osl_FileStatus_Mask_FileSize); +if (aItem.getFileStatus(aStatus) == osl::FileBase::E_None) { nFileSize = aStatus.getFileSize(); } diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index cf1e5e0f244b..60b191a7bd07 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -22,10 +22,9 @@ #include - struct PPPOptimizer { -static sal_Int64 GetFileSize( const OUString& rURL ); +static sal_Int64 GetFileSize(const OUString& rURL); }; #endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index 8f83e8dd8f8e..d0ae65ed74ab 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -140,8 +140,8 @@ enum PPPOptimizerTokenEnum TK_NotFound }; -PPPOptimizerTokenEnum TKGet( const OUString& ); -OUString TKGet( const PPPOptimizerTokenEnum ); +PPPOptimizerTokenEnum TKGet(const OUString&); +OUString TKGet(const PPPOptimizerTokenEnum); #endif diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 6704844d730c..7f4387c163bd 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -23,23 +23,23 @@ #include #include -namespace sdext::presenter { - +namespace sdext::presenter +{ /** Collection of helper functions that do not fit in anywhere else. Provide access to frequently used strings of the drawing framework. */ namespace PresenterHelper { -extern const OUString msCenterPaneURL; -extern const OUString msFullScreenPaneURL; +extern const OUString msCenterPaneURL; +extern const OUString msFullScreenPaneURL; -/** Return the slide show controller of a running presentation that has -the same document as the given framework controller. -@return -When no presentation is running this method returns an empty reference. -*/ -css::uno::Reference GetSlideShowController ( -const css::uno::Reference& rxController); +/** Return the slide show controller of a running presentation that has +the same document as the given framework controller. +@return +When no presentation is running this method returns an empty reference. +*/ +css::uno::Reference +GetSlideShowController(const css::uno::Reference& rxController); } } // end of namespace presenter diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 62b1941695d6..2a057229f802 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -25,8 +25,8 @@ #include #include -namespace sdext::presenter { - +namespace sdext::presenter +{ /** Pane used by the presenter sc
[Libreoffice-commits] core.git: compilerplugins/clang solenv/clang-format
compilerplugins/clang/expressionalwayszero.cxx | 54 +++- compilerplugins/clang/store/cascadingcondop.cxx | 25 +-- compilerplugins/clang/store/test/deadclass.cxx |3 - compilerplugins/clang/test/datamembershadow.cxx |6 +- compilerplugins/clang/test/external.hxx |5 -- compilerplugins/clang/test/oslendian-1.cxx | 12 ++--- compilerplugins/clang/test/redundantcast.hxx| 11 ++-- compilerplugins/clang/test/stringconcatauto.cxx | 34 ++- solenv/clang-format/excludelist |8 --- 9 files changed, 72 insertions(+), 86 deletions(-) New commits: commit c096ab87c8a11e8d75dc689ea7024288419cfd22 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:51:50 2020 +0100 Commit: Christian Lohmaier CommitDate: Sun Nov 22 01:56:05 2020 +0100 tdf#123936 Formatting files in module compilerplugins with clang-format Change-Id: Ie6e23d3d2a20849e47d048b439d72fd7376c53db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105654 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/compilerplugins/clang/expressionalwayszero.cxx b/compilerplugins/clang/expressionalwayszero.cxx index 067aa9cc6dbd..24e7287615ba 100644 --- a/compilerplugins/clang/expressionalwayszero.cxx +++ b/compilerplugins/clang/expressionalwayszero.cxx @@ -21,13 +21,15 @@ Generally a mistake when people meant to use | or operator| */ -namespace { - -class ExpressionAlwaysZero: -public loplugin::FilteringPlugin +namespace +{ +class ExpressionAlwaysZero : public loplugin::FilteringPlugin { public: -explicit ExpressionAlwaysZero(loplugin::InstantiationData const & data): FilteringPlugin(data) {} +explicit ExpressionAlwaysZero(loplugin::InstantiationData const& data) +: FilteringPlugin(data) +{ +} virtual void run() override { @@ -57,15 +59,16 @@ public: TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } -bool VisitBinaryOperator(BinaryOperator const *); -bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const *); -bool TraverseStaticAssertDecl(StaticAssertDecl *); +bool VisitBinaryOperator(BinaryOperator const*); +bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*); +bool TraverseStaticAssertDecl(StaticAssertDecl*); + private: // note, abusing std::unique_ptr as a std::optional lookalike std::unique_ptr getExprValue(const Expr* arg); }; -bool ExpressionAlwaysZero::VisitBinaryOperator( BinaryOperator const * binaryOperator ) +bool ExpressionAlwaysZero::VisitBinaryOperator(BinaryOperator const* binaryOperator) { if (ignoreLocation(binaryOperator)) return true; @@ -86,16 +89,14 @@ bool ExpressionAlwaysZero::VisitBinaryOperator( BinaryOperator const * binaryOpe ; // ok else return true; -report( -DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1", -compat::getBeginLoc(binaryOperator)) +report(DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1", + compat::getBeginLoc(binaryOperator)) << (lhsValue ? lhsValue->toString(10) : "unknown") -<< (rhsValue ? rhsValue->toString(10) : "unknown") -<< binaryOperator->getSourceRange(); +<< (rhsValue ? rhsValue->toString(10) : "unknown") << binaryOperator->getSourceRange(); return true; } -bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr( CXXOperatorCallExpr const * cxxOperatorCallExpr ) +bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOperatorCallExpr) { if (ignoreLocation(cxxOperatorCallExpr)) return true; @@ -103,7 +104,7 @@ bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr( CXXOperatorCallExpr const * return true; auto op = cxxOperatorCallExpr->getOperator(); -if ( !(op == OO_Amp || op == OO_AmpEqual || op == OO_AmpAmp)) +if (!(op == OO_Amp || op == OO_AmpEqual || op == OO_AmpAmp)) return true; if (cxxOperatorCallExpr->getNumArgs() != 2) @@ -118,20 +119,19 @@ bool ExpressionAlwaysZero::VisitCXXOperatorCallExpr( CXXOperatorCallExpr const * ; // ok else return true; -report( -DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1", -compat::getBeginLoc(cxxOperatorCallExpr)) +report(DiagnosticsEngine::Warning, "expression always evaluates to zero, lhs=%0 rhs=%1", + compat::getBeginLoc(cxxOperatorCallExpr)) << (lhsValue ? lhsValue->toString(10) : "unknown") -<< (rhsValue ? rhsValue->toString(10) : "unknown") -<< cxxOperatorCallExpr->getSourceRange(); +<< (rhsValue ? rhsValue->toString(10) : "unknown") << cxxOperatorCallExpr->getSourceRange(); return true; } -std::unique_ptr ExpressionAlwaysZero::getExprValue(Expr const * expr) +std::unique_ptr ExpressionAlwaysZero::getExprVa
[Libreoffice-commits] core.git: sfx2/inc sfx2/qa sfx2/source solenv/clang-format
sfx2/inc/emojicontrol.hxx |5 +- sfx2/inc/emojiview.hxx| 20 - sfx2/inc/fwkhelper.hxx|4 - sfx2/inc/sidebar/DeckDescriptor.hxx |6 +- sfx2/inc/sidebar/DeckTitleBar.hxx |9 +--- sfx2/inc/strings.hxx | 28 ++--- sfx2/inc/templatecontaineritem.hxx|4 - sfx2/inc/templatedefaultview.hxx |6 +- sfx2/qa/unit/sfx2-dialogs-test.cxx|9 sfx2/source/appl/appquit.cxx | 17 +++- sfx2/source/bastyp/sfxresid.cxx |5 -- sfx2/source/control/charwin.cxx | 55 +++--- sfx2/source/control/emojipopup.cxx| 16 +++ sfx2/source/control/itemdel.cxx | 20 +++-- sfx2/source/control/templatecontaineritem.cxx |8 --- sfx2/source/dialog/alienwarn.cxx | 15 +++ sfx2/source/dialog/backingwindow.hxx | 11 ++--- sfx2/source/dialog/charmappopup.cxx | 18 +++- sfx2/source/dialog/dialoghelper.cxx |9 +--- sfx2/source/dialog/inputdlg.cxx | 14 +- sfx2/source/dialog/securitypage.hxx |9 ++-- sfx2/source/dialog/sfxdlg.cxx |7 --- sfx2/source/dialog/styfitem.cxx |7 ++- sfx2/source/doc/QuerySaveDocument.cxx |3 - sfx2/source/doc/syspath.cxx |4 - sfx2/source/inc/appopen.hxx |5 -- sfx2/source/inc/childwinimpl.hxx | 19 sfx2/source/inc/ctrlfactoryimpl.hxx | 12 ++--- sfx2/source/inc/documentfontsdialog.hxx | 14 -- sfx2/source/inc/helper.hxx| 11 ++--- sfx2/source/inc/nochaos.hxx |4 - sfx2/source/inc/openflag.hxx |7 +-- sfx2/source/inc/openurlhint.hxx |4 - sfx2/source/inc/sfxtypes.hxx |6 -- sfx2/source/inc/shellimpl.hxx | 26 +--- sfx2/source/inc/templatesearchviewitem.hxx|7 +-- sfx2/source/inc/versdlg.hxx | 10 ++-- sfx2/source/notebookbar/DropdownBox.cxx | 17 ++-- sfx2/source/notebookbar/PriorityHBox.cxx | 20 - sfx2/source/notify/hintpost.cxx | 17 +++- sfx2/source/safemode/safemode.cxx | 13 ++ sfx2/source/sidebar/SidebarModelUpdate.cxx|7 --- sfx2/source/sidebar/UnoSidebar.cxx| 26 sfx2/source/view/viewimp.hxx |8 +-- solenv/clang-format/excludelist | 44 45 files changed, 238 insertions(+), 348 deletions(-) New commits: commit b35232bdf56fbda34476cf537d53bbea31235a95 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:15:32 2020 +0100 Commit: Christian Lohmaier CommitDate: Sun Nov 22 01:55:36 2020 +0100 tdf#123936 Formatting files in module sfx2 with clang-format Change-Id: I0ddd7b531cbf9aed6a3834e3cd15c7fe3644736e (cherry picked from commit 92daf140419e4539f6843e30428e786c3e655dcc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105706 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx index eee551600da4..2e2ab150762f 100644 --- a/sfx2/inc/emojicontrol.hxx +++ b/sfx2/inc/emojicontrol.hxx @@ -14,7 +14,10 @@ #include #include -namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame +{ +class XFrame; +} class EmojiPopup; class EmojiView; diff --git a/sfx2/inc/emojiview.hxx b/sfx2/inc/emojiview.hxx index 223d3872..52bb47bf0bc0 100644 --- a/sfx2/inc/emojiview.hxx +++ b/sfx2/inc/emojiview.hxx @@ -34,21 +34,19 @@ enum class FILTER_CATEGORY class ViewFilter_Category final { public: - -ViewFilter_Category (FILTER_CATEGORY rCategory) +ViewFilter_Category(FILTER_CATEGORY rCategory) : mCategory(rCategory) -{} +{ +} -bool operator () (const ThumbnailViewItem *pItem); +bool operator()(const ThumbnailViewItem* pItem); -static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString &rCategory); +static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString& rCategory); private: - FILTER_CATEGORY mCategory; }; - class EmojiView final : public ThumbnailView { public: @@ -59,16 +57,16 @@ public: // Fill view with emojis void Populate(); -void setInsertEmojiHdl (const Link &rLink); +void setInsertEmojiHdl(const Link& rLink); -void AppendItem(const OUString &rTitle, const OUString &rCategory, const OUString &rName ); +void AppendItem(const OUString& rTitle, const OUString& rCategory, const OUString& rName); private: -virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; +virtual bool MouseButtonDown(const MouseEv
[Libreoffice-commits] core.git: solenv/clang-format vcl/backendtest vcl/headless vcl/inc vcl/opengl vcl/osx vcl/qa vcl/source vcl/unx vcl/win vcl/workben
solenv/clang-format/excludelist| 118 --- vcl/backendtest/outputdevice/gradient.cxx | 36 - vcl/backendtest/outputdevice/pixel.cxx |7 vcl/backendtest/outputdevice/polypolygon.cxx | 16 vcl/backendtest/outputdevice/rectangle.cxx | 30 vcl/headless/svpcairotextrender.cxx| 10 vcl/inc/BitmapScaleConvolutionFilter.hxx |6 vcl/inc/BitmapScaleSuperFilter.hxx |1 vcl/inc/BitmapSymmetryCheck.hxx|2 vcl/inc/ControlCacheKey.hxx| 13 vcl/inc/IconThemeScanner.hxx | 26 vcl/inc/android/androidinst.hxx| 14 vcl/inc/headless/svpprn.hxx|4 vcl/inc/iconview.hxx |5 vcl/inc/ios/iosinst.hxx| 13 vcl/inc/langboost.hxx |2 vcl/inc/opengl/BufferObject.hxx|8 vcl/inc/opengl/TextureState.hxx|7 vcl/inc/opengl/x11/gdiimpl.hxx |6 vcl/inc/opengl/zone.hxx| 12 vcl/inc/osx/a11ylistener.hxx | 11 vcl/inc/osx/keyboardfocuslistener.hxx |5 vcl/inc/osx/salnsmenu.h| 20 vcl/inc/osx/salnstimer.h |2 vcl/inc/quartz/ctfonts.hxx |2 vcl/inc/regionband.hxx | 11 vcl/inc/salsys.hxx | 10 vcl/inc/scanlinewriter.hxx | 15 vcl/inc/scrptrun.h | 47 - vcl/inc/unx/desktops.hxx |3 vcl/inc/unx/i18n_keysym.hxx|2 vcl/inc/unx/salunx.h |6 vcl/inc/unx/screensaverinhibitor.hxx | 18 vcl/inc/unx/x11/x11gdiimpl.h |4 vcl/inc/unx/x11_cursors/wshide_curs.h |6 vcl/inc/unx/x11_cursors/wshide_mask.h |6 vcl/inc/unx/x11_cursors/wsshow_curs.h |6 vcl/inc/unx/x11_cursors/wsshow_mask.h |6 vcl/inc/vcleventlisteners.hxx |9 vcl/opengl/DeviceInfo.cxx |4 vcl/osx/DragActionConversion.cxx | 40 - vcl/osx/PictToBmpFlt.hxx |9 vcl/osx/a11yactionwrapper.h|4 vcl/osx/a11ycomponentwrapper.h | 12 vcl/osx/a11yfocuslistener.hxx | 11 vcl/osx/a11yselectionwrapper.h |8 vcl/osx/a11ytablewrapper.h |8 vcl/osx/a11ytextwrapper.h | 50 - vcl/osx/a11yutil.h |7 vcl/osx/a11yvaluewrapper.h | 12 vcl/osx/a11ywrapperbutton.h|6 vcl/osx/a11ywrappercheckbox.h |6 vcl/osx/a11ywrappercombobox.h | 21 vcl/osx/a11ywrappergroup.h |4 vcl/osx/a11ywrapperlist.h |2 vcl/osx/a11ywrapperradiobutton.h |6 vcl/osx/a11ywrapperradiogroup.h|2 vcl/osx/a11ywrapperrow.h |4 vcl/osx/a11ywrapperscrollarea.h|6 vcl/osx/a11ywrapperscrollbar.h |2 vcl/osx/a11ywrappersplitter.h |2 vcl/osx/a11ywrapperstatictext.h|4 vcl/osx/a11ywrappertabgroup.h |2 vcl/osx/a11ywrappertextarea.h |2 vcl/osx/a11ywrappertoolbar.h |2 vcl/qa/cppunit/BitmapProcessorTest.cxx |1 vcl/qa/cppunit/fontcharmap.cxx | 11 vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 16 vcl/qa/cppunit/mnemonic.cxx|6 vcl/qa/cppunit/outdev.cxx | 33 - vcl/qa/cppunit/pdfexport/pdfexport.cxx | 385 +++ vcl/qa/unit/vcl-dialogs-test.cxx |9 vcl/source/app/ITiledRenderable.cxx| 30 vcl/source/app/salvtables.cxx | 675 + vcl/source/app/sound.cxx |2 vcl/source/bitmap/bitmapfilter.cxx |4 vcl/source/control/thumbpos.hxx|5 vcl/source/filter/graphicfilter_internal.hxx |2 vcl/source/filter/igif/gifread.hxx |2 vcl/source/filter/ixbm/xbmread.hxx |2 vcl/source/filter/ixpm/xpmread.hxx |2 vcl/source/filter/jpeg/JpegTransform.hxx |7 vcl/source/filter/jpeg/jinclude.h
[Libreoffice-commits] core.git: include/apple_remote include/avmedia include/basegfx include/basic include/canvas include/codemaker include/com include/comphelper include/cppu include/cppuhelper inclu
include/LibreOfficeKit/LibreOfficeKitTypes.h |3 include/apple_remote/RemoteMainController.h |9 include/avmedia/avmediadllapi.h |4 include/basegfx/basegfxdllapi.h |1 include/basegfx/color/bcolortools.hxx |6 include/basegfx/range/b2drectangle.hxx|8 include/basegfx/range/b2irectangle.hxx|8 include/basegfx/utils/zoomtools.hxx |2 include/basegfx/vector/b2dsize.hxx|8 include/basegfx/vector/b2isize.hxx|8 include/basic/basicdllapi.h |4 include/basic/basrdll.hxx |4 include/canvas/canvastoolsdllapi.h|4 include/codemaker/codemaker.hxx | 14 include/codemaker/generatedtypeset.hxx| 19 include/com/sun/star/uno/genfunc.h|8 include/comphelper/anytostring.hxx|9 include/comphelper/base64.hxx | 10 include/comphelper/comphelperdllapi.h |4 include/comphelper/evtmethodhelper.hxx|6 include/comphelper/extract.hxx| 22 include/comphelper/fileformat.h | 10 include/comphelper/fileurl.hxx|7 include/comphelper/genericpropertyset.hxx | 13 include/comphelper/getexpandeduri.hxx | 18 include/comphelper/lok.hxx| 14 include/comphelper/make_shared_from_uno.hxx | 17 include/comphelper/namecontainer.hxx |9 include/comphelper/profilezone.hxx| 16 include/comphelper/random.hxx |1 include/comphelper/refcountedmutex.hxx|2 include/comphelper/streamsection.hxx | 32 include/cppu/EnvDcp.hxx |7 include/cppu/cppudllapi.h |8 include/cppuhelper/cppuhelperdllapi.h |4 include/cppuhelper/exc_hlp.hxx|4 include/cppuhelper/unourl.hxx | 40 - include/dbaccess/dbaccessdllapi.h |4 include/desktop/dllapi.h |8 include/desktop/exithelper.h |3 include/desktop/minidump.hxx |7 include/editeng/AccessibleComponentBase.hxx | 30 include/editeng/Trie.hxx |2 include/editeng/editengdllapi.h |4 include/editeng/editerr.hxx |4 include/editeng/editund2.hxx | 19 include/editeng/eerdll.hxx|6 include/editeng/fieldupdater.hxx |7 include/editeng/frmdir.hxx|1 include/editeng/misspellrange.hxx |5 include/editeng/mutxhelp.hxx |1 include/editeng/numdef.hxx|4 include/editeng/section.hxx |5 include/editeng/unofdesc.hxx | 24 include/filter/msfilter/svxmsbas.hxx | 16 include/formula/formuladllapi.h |4 include/formula/funcvarargs.h |4 include/formula/types.hxx |9 include/framework/interaction.hxx | 43 - include/i18nlangtag/i18nlangtagdllapi.h |4 include/i18nutil/i18nutildllapi.h |4 include/i18nutil/paper.hxx| 18 include/i18nutil/unicode.hxx | 33 include/jvmaccess/classpath.hxx | 26 include/jvmaccess/jvmaccessdllapi.h |4 include/jvmaccess/unovirtualmachine.hxx | 29 include/jvmaccess/virtualmachine.hxx | 32 include/jvmfwk/framework.hxx | 46 - include/jvmfwk/jvmfwkdllapi.hxx |4 include/linguistic/lngdllapi.h|4 include/linguistic/lngprops.hxx |2 include/o3tl/deleter.hxx | 11 include/o3tl/lru_map.hxx | 21 include/o3tl/make_shared.hxx | 10 include/o3tl/runtimetooustring.hxx| 17 include/onlineupdate/mozilla/Likely.h |8 include/oox/mathml/importutils.hxx| 84 +- include/oox/token/namespacemap.hxx| 18 include/oox/token/propertynames.hxx | 15 include/oox/toke
[Libreoffice-commits] core.git: solenv/clang-format starmath/inc starmath/qa starmath/source
solenv/clang-format/excludelist | 14 starmath/inc/action.hxx |9 +- starmath/inc/caret.hxx | 72 +++-- starmath/inc/cursor.hxx | 80 starmath/inc/edit.hxx | 28 starmath/inc/error.hxx |5 - starmath/inc/smdll.hxx |2 starmath/inc/types.hxx | 13 ++- starmath/qa/cppunit/test_cursor.cxx | 13 +-- starmath/qa/cppunit/test_nodetotextvisitors.cxx | 66 ++- starmath/qa/unit/starmath-dialogs-test.cxx |4 - starmath/source/mathmlattr.cxx | 44 ++--- starmath/source/mathmlattr.hxx | 11 +-- starmath/source/ooxmlexport.hxx | 26 +++ starmath/source/tmpdevice.hxx |8 +- 15 files changed, 198 insertions(+), 197 deletions(-) New commits: commit 0108cd51faf942b3fc3a292522d4b2f421f1cf45 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:17:39 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:18:54 2020 +0100 tdf#123936 Formatting files in module starmath with clang-format Change-Id: I2b9e466d18ffd8033e5225d698b2dd0055e6fab7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105711 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 07de73698403..1ce036a02254 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11706,38 +11706,28 @@ sot/source/sdstor/ucbstorage.cxx sot/source/unoolestorage/xolesimplestorage.cxx sot/source/unoolestorage/xolesimplestorage.hxx starmath/inc/ElementsDockingWindow.hxx -starmath/inc/action.hxx -starmath/inc/caret.hxx -starmath/inc/cursor.hxx starmath/inc/dialog.hxx starmath/inc/document.hxx -starmath/inc/edit.hxx -starmath/inc/error.hxx starmath/inc/format.hxx starmath/inc/helpids.h starmath/inc/node.hxx starmath/inc/parse.hxx starmath/inc/rect.hxx starmath/inc/scrwin.hxx -starmath/inc/smdll.hxx starmath/inc/smmod.hxx starmath/inc/strings.hxx starmath/inc/symbol.hxx starmath/inc/token.hxx -starmath/inc/types.hxx starmath/inc/unomodel.hxx starmath/inc/utility.hxx starmath/inc/view.hxx starmath/inc/visitors.hxx starmath/qa/cppunit/mock-visitor.hxx -starmath/qa/cppunit/test_cursor.cxx starmath/qa/cppunit/test_node.cxx -starmath/qa/cppunit/test_nodetotextvisitors.cxx starmath/qa/cppunit/test_parse.cxx starmath/qa/cppunit/test_starmath.cxx starmath/qa/extras/mmlexport-test.cxx starmath/qa/extras/mmlimport-test.cxx -starmath/qa/unit/starmath-dialogs-test.cxx starmath/source/ElementsDockingWindow.cxx starmath/source/accessibility.cxx starmath/source/accessibility.hxx @@ -11752,8 +11742,6 @@ starmath/source/edit.cxx starmath/source/eqnolefilehdr.cxx starmath/source/eqnolefilehdr.hxx starmath/source/format.cxx -starmath/source/mathmlattr.cxx -starmath/source/mathmlattr.hxx starmath/source/mathmlexport.cxx starmath/source/mathmlexport.hxx starmath/source/mathmlimport.cxx @@ -11762,7 +11750,6 @@ starmath/source/mathtype.cxx starmath/source/mathtype.hxx starmath/source/node.cxx starmath/source/ooxmlexport.cxx -starmath/source/ooxmlexport.hxx starmath/source/ooxmlimport.cxx starmath/source/ooxmlimport.hxx starmath/source/parse.cxx @@ -11774,7 +11761,6 @@ starmath/source/smdll.cxx starmath/source/smmod.cxx starmath/source/symbol.cxx starmath/source/tmpdevice.cxx -starmath/source/tmpdevice.hxx starmath/source/uiobject.cxx starmath/source/uiobject.hxx starmath/source/unodoc.cxx diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index cb4a4eddf740..8f98d12cf2a4 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -24,15 +24,14 @@ class SmDocShell; - class SmFormatAction final : public SfxUndoAction { -SmDocShell *pDoc; -SmFormataOldFormat; -SmFormataNewFormat; +SmDocShell* pDoc; +SmFormat aOldFormat; +SmFormat aNewFormat; public: -SmFormatAction(SmDocShell *pDocSh, const SmFormat& rOldFormat, const SmFormat& rNewFormat); +SmFormatAction(SmDocShell* pDocSh, const SmFormat& rOldFormat, const SmFormat& rNewFormat); virtual void Undo() override; virtual void Redo() override; diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx index bc69139994ee..6cc663206da4 100644 --- a/starmath/inc/caret.hxx +++ b/starmath/inc/caret.hxx @@ -18,7 +18,8 @@ #include /** Representation of caret position with an equation */ -struct SmCaretPos{ +struct SmCaretPos +{ SmCaretPos(SmNode* selectedNode = nullptr, int iIndex = 0) : pSelectedNode(selectedNode) , nIndex(iIndex) @@ -43,7 +44,8 @@ struct SmCaretPos{ /** True, if this is a valid caret position */ bool IsValid() const { return pSelected
[Libreoffice-commits] core.git: odk/examples odk/qa solenv/clang-format
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h |6 -- odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h |6 -- odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx | 21 -- odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx | 12 ++--- odk/examples/OLE/activex/SOComWindowPeer.cpp | 10 +--- odk/examples/OLE/activex/StdAfx2.h |2 odk/examples/OLE/activex/so_activex.cpp | 17 +--- odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx |9 odk/qa/checkapi/checkapi.cxx |7 --- solenv/clang-format/excludelist |9 10 files changed, 30 insertions(+), 69 deletions(-) New commits: commit 2184efed3943fe9634e6e361e8b0306a374cbf59 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:08:05 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:18:11 2020 +0100 tdf#123936 Formatting files in module odk with clang-format Change-Id: I427263ee98206c00cd2b3392fc9f2f55ad1ded5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105692 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h index 81de2d9f1b31..99207192f796 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h @@ -47,16 +47,14 @@ extern "C" { * Method:getNativeWindowSystemType * Signature: ()I */ -JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType - (JNIEnv *, jobject); +JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType(JNIEnv*, jobject); /* * Class: org_openoffice_OpenOffice * Method:getNativeWindow * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow - (JNIEnv *, jobject); +JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow(JNIEnv*, jobject); #ifdef __cplusplus } diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h index 81de2d9f1b31..99207192f796 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h @@ -47,16 +47,14 @@ extern "C" { * Method:getNativeWindowSystemType * Signature: ()I */ -JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType - (JNIEnv *, jobject); +JNIEXPORT jint JNICALL Java_NativeView_getNativeWindowSystemType(JNIEnv*, jobject); /* * Class: org_openoffice_OpenOffice * Method:getNativeWindow * Signature: ()J */ -JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow - (JNIEnv *, jobject); +JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow(JNIEnv*, jobject); #ifdef __cplusplus } diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx index ecb21116a00a..26162eeb3617 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx @@ -53,35 +53,34 @@ SAL_IMPLEMENT_MAIN() // give it an initial size, should be a good guess. // stringbuffer extends if necessary -OUStringBuffer buf( 128 ); +OUStringBuffer buf(128); // append an ascii string -buf.append( "pi ( here " ); +buf.append("pi ( here "); // numbers can be simply appended -buf.append( pi ); +buf.append(pi); // lets the compiler count the stringlength, so this is more efficient than // the above appendAscii call, where length of the string must be calculated at // runtime -buf.append( " ) multiplied with " ); -buf.append( n ); -buf.append( " gives " ); -buf.append( (double)( n * pi ) ); -buf.append( "." ); +buf.append(" ) multiplied with "); +buf.append(n); +buf.append(" gives "); +buf.append((double)(n * pi)); +buf.append("."); // now transfer the buffer into the string. // afterwards buffer is empty and may be reused again ! OUString string = buf.makeStringAndClear(); // I could of course also used the OStringBuffer directly -OString oString = rtl::OUStringToOString( string , R
[Libreoffice-commits] core.git: extensions/source extensions/test solenv/clang-format
extensions/source/activex/SOActionsApproval.cxx |9 - extensions/source/activex/SOComWindowPeer.cxx |9 - extensions/source/activex/StdAfx2.h | 10 +- extensions/source/config/ldap/ldapaccess.hxx| 49 +- extensions/source/dbpilots/dbptypes.hxx | 10 -- extensions/source/macosx/spotlight/OOoSpotlightImporter.h |7 + extensions/source/ole/oledll.cxx|6 - extensions/source/propctrlr/modulepcr.cxx |5 - extensions/source/propctrlr/modulepcr.hxx |2 extensions/source/propctrlr/pcrcommontypes.hxx |8 - extensions/source/update/check/download.hxx | 12 +- extensions/test/ole/AxTestComponents/AxTestComponents.cpp | 23 extensions/test/ole/AxTestComponents/Foo.cpp| 16 --- extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp | 23 extensions/test/ole/MfcControl/MfcControl.cpp | 13 -- extensions/test/ole/MfcControl/MfcControl.h |5 - extensions/test/ole/OleClient/axhost.cxx| 13 -- extensions/test/ole/cpptest/cpptest.cxx | 39 +++ extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp | 24 solenv/clang-format/excludelist | 19 --- 20 files changed, 98 insertions(+), 204 deletions(-) New commits: commit d0b3815392d1fb253ed05218422a7f9b37c9df24 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:56:36 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:17:51 2020 +0100 tdf#123936 Formatting files in module extensions with clang-format Change-Id: I6e86641bc93bf4b3941b01fbef69c1e7984aad3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105667 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index dec824dcebfa..a4092166272b 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -39,17 +39,16 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { -static const IID* arr[] = -{ +static const IID* arr[] = { &IID_ISOActionsApproval, }; -for (std::size_t i=0;i //You may derive a class from CComModule and use it if you want to override @@ -61,7 +61,7 @@ extern CComModule _Module; #if defined __clang__ #pragma clang diagnostic pop #endif -#pragma warning (pop) +#pragma warning(pop) //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 34ba5a04f625..274cdb88009d 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -26,7 +26,7 @@ #ifdef _WIN32 #if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #endif #include #include @@ -38,28 +38,27 @@ #include -namespace extensions::config::ldap { - -namespace uno = css::uno ; -namespace lang = css::lang ; -namespace ldap = css::ldap ; +namespace extensions::config::ldap +{ +namespace uno = css::uno; +namespace lang = css::lang; +namespace ldap = css::ldap; struct LdapUserProfile; - /** Struct containing the information on LDAP connection */ struct LdapDefinition { /** LDAP server name */ -OUString mServer ; +OUString mServer; /** LDAP server port number */ -sal_Int32 mPort ; +sal_Int32 mPort; /** Repository base DN */ -OUString mBaseDN ; +OUString mBaseDN; /** DN to use for "anonymous" connection */ -OUString mAnonUser ; +OUString mAnonUser; /** Credentials to use for "anonymous" connection */ -OUString mAnonCredentials ; +OUString mAnonCredentials; /** User Entity Object Class */ OUString mUserObjectClass; /** User Entity Unique Attribute */ @@ -71,23 +70,27 @@ struct LdapDefinition } }; -typedef std::map< OUString, OUString > LdapData; // key/value pairs +typedef std::map LdapData; // key/value pairs /** Class encapsulating all LDAP functionality */ class LdapConnection { friend struct LdapMessageHolder; -public: +public: /** Default constructor */ -LdapConnection() : mConnection(nullptr),mLdapDefinition() {} +LdapConnection() +: mConnection(nullptr) +, mLdapDefinition() +{ +} /** Destructor, rele
[Libreoffice-commits] core.git: sal/inc sal/osl sal/qa sal/rtl sal/textenc solenv/clang-format
sal/inc/backtraceasstring.hxx|6 -- sal/inc/oslmemory.h |4 - sal/osl/all/signalshared.cxx | 15 +++--- sal/osl/unx/createfilehandlefromfd.hxx |5 -- sal/osl/unx/file_error_transl.cxx|7 +-- sal/osl/unx/memory.cxx |7 --- sal/osl/unx/nlsupport.hxx|7 ++- sal/osl/unx/random.cxx |6 +- sal/osl/unx/readwrite_helper.hxx |4 - sal/osl/unx/secimpl.hxx |5 +- sal/osl/w32/file-impl.hxx|3 - sal/osl/w32/file_error.hxx |2 sal/osl/w32/filetime.hxx | 15 +++--- sal/osl/w32/mutex.cxx| 17 +++ sal/osl/w32/nlsupport.hxx|2 sal/osl/w32/procimpl.hxx |5 +- sal/osl/w32/random.cxx | 15 +++--- sal/osl/w32/secimpl.hxx |9 ++-- sal/osl/w32/signal.cxx |7 +-- sal/osl/w32/system.h |4 - sal/qa/inc/stringhelper.hxx |4 - sal/qa/osl/condition/osl_Condition_Const.h |2 sal/qa/osl/module/osl_Module_DLL.cxx |5 -- sal/qa/osl/security/osl_Security_Const.h |4 - sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx | 11 ++--- sal/qa/rtl/process/child_process_id.cxx | 18 sal/qa/rtl/process/rtl_Process_Const.h |3 - sal/rtl/unload.cxx |7 +-- sal/textenc/context.cxx | 13 ++--- sal/textenc/context.hxx |6 +- sal/textenc/gettextencodingdata.hxx |3 - sal/textenc/unichars.cxx |6 -- sal/textenc/unichars.hxx | 10 +--- solenv/clang-format/excludelist | 33 --- 34 files changed, 111 insertions(+), 159 deletions(-) New commits: commit 70e36068a43cb6747232441ee67e609c86362aa0 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:11:00 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:16:53 2020 +0100 tdf#123936 Formatting files in module sal with clang-format Change-Id: I04a773e8fd565f57dc0eb887fb4714b6edbb35e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105699 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/sal/inc/backtraceasstring.hxx b/sal/inc/backtraceasstring.hxx index d49aa2690ea5..e857ea476730 100644 --- a/sal/inc/backtraceasstring.hxx +++ b/sal/inc/backtraceasstring.hxx @@ -15,12 +15,10 @@ #include #include -namespace osl::detail { - +namespace osl::detail +{ /// Build a debugging backtrace from current PC location. OUString backtraceAsString(sal_uInt32 maxDepth); - } #endif // INCLUDED_SAL_INC_INTERNAL_MISC_H - diff --git a/sal/inc/oslmemory.h b/sal/inc/oslmemory.h index 011a6e320606..de99e9851e80 100644 --- a/sal/inc/oslmemory.h +++ b/sal/inc/oslmemory.h @@ -17,9 +17,9 @@ extern "C" { #endif -void* osl_aligned_alloc( sal_Size align, sal_Size size ); +void* osl_aligned_alloc(sal_Size align, sal_Size size); -void osl_aligned_free( void* p ); +void osl_aligned_free(void* p); #if defined __cplusplus } diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx index d6998eb006ca..2fc72c478fcc 100644 --- a/sal/osl/all/signalshared.cxx +++ b/sal/osl/all/signalshared.cxx @@ -47,7 +47,6 @@ bool deInitSignal() return bRet; } - } oslSignalAction callSignalHandler(oslSignalInfo* pInfo) @@ -57,8 +56,7 @@ oslSignalAction callSignalHandler(oslSignalInfo* pInfo) while (pHandler) { -if ((Action = pHandler->Handler(pHandler->pData, pInfo)) -!= osl_Signal_ActCallNextHdl) +if ((Action = pHandler->Handler(pHandler->pData, pInfo)) != osl_Signal_ActCallNextHdl) break; pHandler = pHandler->pNext; @@ -75,17 +73,18 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction handler, if (!bInitSignal) bInitSignal = initSignal(); -oslSignalHandlerImpl* pHandler = static_cast(calloc(1, sizeof(oslSignalHandlerImpl))); +oslSignalHandlerImpl* pHandler += static_cast(calloc(1, sizeof(oslSignalHandlerImpl))); if (pHandler) { pHandler->Handler = handler; -pHandler->pData = pData; +pHandler->pData = pData; osl_acquireMutex(SignalListMutex); pHandler->pNext = SignalList; -SignalList
[Libreoffice-commits] core.git: filter/source solenv/clang-format
filter/source/graphicfilter/ipict/ipict.hxx|7 +++ filter/source/graphicfilter/itiff/lzwdecom.hxx | 23 ++- filter/source/msfilter/dffrecordheader.cxx | 14 +++--- filter/source/svg/test/odfserializer.hxx |6 +++--- solenv/clang-format/excludelist|4 5 files changed, 23 insertions(+), 31 deletions(-) New commits: commit e8e093f14b698fc710930b2dead57c7d4fb63b8e Author: Philipp Hofer AuthorDate: Thu Nov 12 12:57:13 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:16:08 2020 +0100 tdf#123936 Formatting files in module filter with clang-format Change-Id: I787835eb102868bbd52cdb1cb5dad553947f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105669 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/filter/source/graphicfilter/ipict/ipict.hxx b/filter/source/graphicfilter/ipict/ipict.hxx index 5e87a4a5b897..31ffdac0a81e 100644 --- a/filter/source/graphicfilter/ipict/ipict.hxx +++ b/filter/source/graphicfilter/ipict/ipict.hxx @@ -15,11 +15,10 @@ class GDIMetaFile; class SvStream; -namespace pict { - +namespace pict +{ /// Function to access PictReader::ReadPict for unit testing. -void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile); - +void ReadPictFile(SvStream& rStreamPict, GDIMetaFile& rGDIMetaFile); } #endif // INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx index 8f2675b9d53f..71ec833b21db 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.hxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx @@ -25,7 +25,8 @@ #define MAX_TABLE_SIZE 4096 -struct LZWTableEntry { +struct LZWTableEntry +{ sal_uInt16 nPrevCode; sal_uInt16 nDataCount; sal_uInt8 nData; @@ -33,26 +34,24 @@ struct LZWTableEntry { class SvStream; -class LZWDecompressor { - +class LZWDecompressor +{ public: - LZWDecompressor(); ~LZWDecompressor(); -void StartDecompression(SvStream & rIStream); +void StartDecompression(SvStream& rIStream); -sal_uInt64 Decompress(sal_uInt8 * pTarget, sal_uInt32 nMaxCount); -// Returns the number of written bytes. If < nMaxCount there is -// no more data to be unpacked or an error occurred. +// Returns the number of written bytes. If < nMaxCount there is +// no more data to be unpacked or an error occurred. +sal_uInt64 Decompress(sal_uInt8* pTarget, sal_uInt32 nMaxCount); private: - sal_uInt16 GetNextCode(); void AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); void DecompressSome(); -SvStream * pIStream; +SvStream* pIStream; std::array pTable; sal_uInt16 nTableSize; @@ -62,15 +61,13 @@ private: sal_uInt16 nOldCode; std::array pOutBuf; -sal_uInt8 * pOutBufData; +sal_uInt8* pOutBufData; sal_uInt16 nOutBufDataLen; sal_uInt8 nInputBitsBuf; sal_uInt16 nInputBitsBufSize; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/dffrecordheader.cxx b/filter/source/msfilter/dffrecordheader.cxx index e0adfe9460f0..b1d4316b630b 100644 --- a/filter/source/msfilter/dffrecordheader.cxx +++ b/filter/source/msfilter/dffrecordheader.cxx @@ -19,21 +19,21 @@ #include -bool ReadDffRecordHeader( SvStream& rIn, DffRecordHeader& rRec ) +bool ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec) { rRec.nFilePos = rIn.Tell(); sal_uInt16 nTmp(0); -rIn.ReadUInt16( nTmp ); +rIn.ReadUInt16(nTmp); rRec.nImpVerInst = nTmp; -rRec.nRecVer = sal::static_int_cast< sal_uInt8 >(nTmp & 0x000F); +rRec.nRecVer = sal::static_int_cast(nTmp & 0x000F); rRec.nRecInstance = nTmp >> 4; -rIn.ReadUInt16( rRec.nRecType ); -rIn.ReadUInt32( rRec.nRecLen ); +rIn.ReadUInt16(rRec.nRecType); +rIn.ReadUInt32(rRec.nRecLen); // preserving overflow, optimally we would check // the record size against the parent header -if ( rRec.nRecLen > ( SAL_MAX_UINT32 - rRec.nFilePos ) ) - rIn.SetError( SVSTREAM_FILEFORMAT_ERROR ); +if (rRec.nRecLen > (SAL_MAX_UINT32 - rRec.nFilePos)) +rIn.SetError(SVSTREAM_FILEFORMAT_ERROR); return rIn.good(); } diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx index bff8cb68fa69..8bce673b40a2 100644 --- a/filter/source/svg/test/odfserializer.hxx +++ b/filter/source/svg/test/odfserializer.hxx @@ -26,9 +26,9 @@ namespace svgi { -/// Creates a XDocumentHandler that serializes directly to an XOutputStream -css::uno::Reference< css::xml::sax::XDocumentHandler> -createSerializer(const css::uno::Reference& ); +/// Creates a XDocumentHandler that serializes directly to an XOutputStream +css::uno::Reference +createSerializer(const css::uno::Reference&); } #endif // INCLUDED_FILTER
[Libreoffice-commits] core.git: canvas/source solenv/clang-format
canvas/source/directx/dx_bitmapprovider.hxx | 10 +- canvas/source/directx/dx_surfacegraphics.hxx | 14 +++--- solenv/clang-format/excludelist |2 -- 3 files changed, 12 insertions(+), 14 deletions(-) New commits: commit 302d64cb3c21335867b447970ab8db8d1fabdef3 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:49:50 2020 +0100 Commit: Christian Lohmaier CommitDate: Sat Nov 21 13:15:48 2020 +0100 tdf#123936 Formatting files in module canvas with clang-format Change-Id: Ifcdecb0a60f5a4b09acc83ed38b6d1ec46765ba6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105649 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx index be0a3318557e..ad83abee0ffb 100644 --- a/canvas/source/directx/dx_bitmapprovider.hxx +++ b/canvas/source/directx/dx_bitmapprovider.hxx @@ -24,11 +24,11 @@ namespace dxcanvas { -struct BitmapProvider -{ -virtual ~BitmapProvider() {} -virtual IBitmapSharedPtr getBitmap() const = 0; -}; +struct BitmapProvider +{ +virtual ~BitmapProvider() {} +virtual IBitmapSharedPtr getBitmap() const = 0; +}; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx index 19f195a6ecd4..5f4e1a742ac5 100644 --- a/canvas/source/directx/dx_surfacegraphics.hxx +++ b/canvas/source/directx/dx_surfacegraphics.hxx @@ -23,14 +23,14 @@ namespace dxcanvas { -/** Container providing a Gdiplus::Graphics for a Surface +/** Container providing a Gdiplus::Graphics for a Surface -This wrapper class transparently handles allocation and -release of surface resources the RAII way (the -GraphicsSharedPtr returned has a deleter that does all the -necessary DX cleanup work). - */ -GraphicsSharedPtr createSurfaceGraphics(const COMReference& rSurface ); +This wrapper class transparently handles allocation and +release of surface resources the RAII way (the +GraphicsSharedPtr returned has a deleter that does all the +necessary DX cleanup work). +*/ +GraphicsSharedPtr createSurfaceGraphics(const COMReference& rSurface); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 769695e2f178..30590df8c4af 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -641,7 +641,6 @@ canvas/source/directx/dx_bitmap.cxx canvas/source/directx/dx_bitmap.hxx canvas/source/directx/dx_bitmapcanvashelper.cxx canvas/source/directx/dx_bitmapcanvashelper.hxx -canvas/source/directx/dx_bitmapprovider.hxx canvas/source/directx/dx_canvas.cxx canvas/source/directx/dx_canvas.hxx canvas/source/directx/dx_canvasbitmap.cxx @@ -678,7 +677,6 @@ canvas/source/directx/dx_spritehelper.hxx canvas/source/directx/dx_surfacebitmap.cxx canvas/source/directx/dx_surfacebitmap.hxx canvas/source/directx/dx_surfacegraphics.cxx -canvas/source/directx/dx_surfacegraphics.hxx canvas/source/directx/dx_textlayout.cxx canvas/source/directx/dx_textlayout.hxx canvas/source/directx/dx_textlayout_drawhelper.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/source solenv/clang-format
setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx | 10 +- setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx |8 solenv/clang-format/excludelist |2 -- 3 files changed, 9 insertions(+), 11 deletions(-) New commits: commit 2d72bc353b9d086e3eb3f9cf00a034c86f13ca21 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:14:53 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:28:45 2020 +0100 tdf#123936 Formatting files in module setup_native with clang-format Change-Id: I40c25e54b1348a17d4e639a77a1834462c8a5c27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105705 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx index 68faed45aac7..c600329ee659 100644 --- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx +++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx @@ -21,19 +21,19 @@ #include -extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink(MSIHANDLE hMSI) { -WCHARszStartupPath[MAX_PATH]; +WCHAR szStartupPath[MAX_PATH]; -if ( SHGetSpecialFolderPathW( nullptr, szStartupPath, CSIDL_STARTUP, FALSE ) ) +if (SHGetSpecialFolderPathW(nullptr, szStartupPath, CSIDL_STARTUP, FALSE)) { std::wstring sQuickstartLinkPath = szStartupPath; sQuickstartLinkPath += L"\\"; -sQuickstartLinkPath += GetQuickstarterLinkNameW( hMSI ); +sQuickstartLinkPath += GetQuickstarterLinkNameW(hMSI); sQuickstartLinkPath += L".lnk"; -DeleteFileW( sQuickstartLinkPath.c_str() ); +DeleteFileW(sQuickstartLinkPath.c_str()); } return ERROR_SUCCESS; diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx index 5c68659950ef..8e4166b0d95d 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx @@ -37,7 +37,7 @@ extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE // unsetting all properties -UnsetMsiPropertyW( handle, L"DIRECTORY_NOT_EMPTY" ); +UnsetMsiPropertyW(handle, L"DIRECTORY_NOT_EMPTY"); // 1. Searching for file setup.ini @@ -49,11 +49,11 @@ extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE // std::wstring mystr = L"Searching for " + sSetupIniPath; // MessageBoxW(NULL, mystr.c_str(), L"DEBUG", MB_OK); -if ( IsValidHandle(hdl) ) +if (IsValidHandle(hdl)) { // setup.ini found -> directory cannot be used for installation. -SetMsiPropertyW( handle, L"DIRECTORY_NOT_EMPTY", L"1" ); -SetMsiErrorCode( MSI_ERROR_DIRECTORY_NOT_EMPTY ); +SetMsiPropertyW(handle, L"DIRECTORY_NOT_EMPTY", L"1"); +SetMsiErrorCode(MSI_ERROR_DIRECTORY_NOT_EMPTY); // std::wstring notEmptyStr = L"Directory is not empty. Please choose another installation directory."; // std::wstring notEmptyTitle = L"Directory not empty"; // MessageBoxW(NULL, notEmptyStr.c_str(), notEmptyTitle.c_str(), MB_OK); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 07cd34532515..c92305942951 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11078,12 +11078,10 @@ sdext/source/presenter/PresenterWindowManager.cxx sdext/source/presenter/PresenterWindowManager.hxx setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx setup_native/source/win32/customactions/quickstarter/quickstarter.cxx -setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx setup_native/source/win32/customactions/regactivex/regactivex.cxx setup_native/source/win32/customactions/sellang/sellang.cxx -setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx setup_native/source/win32/customactions/shellextensions/checkpatches.cxx setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source solenv/clang-format
slideshow/source/engine/transitions/barndoorwipe.hxx | 17 +++--- slideshow/source/engine/transitions/clockwipe.hxx| 11 +-- slideshow/source/engine/transitions/doublediamondwipe.hxx|9 +-- slideshow/source/engine/transitions/iriswipe.cxx | 13 +--- slideshow/source/engine/transitions/iriswipe.hxx | 15 ++--- slideshow/source/engine/transitions/randomwipe.hxx | 17 ++ slideshow/source/engine/transitions/transitionfactorytab.hxx | 10 +-- slideshow/source/engine/transitions/transitiontools.hxx | 12 +--- slideshow/source/engine/transitions/veewipe.hxx |9 +-- slideshow/source/inc/animationnode.hxx | 31 --- slideshow/source/inc/event.hxx | 15 +++-- slideshow/source/inc/framerate.hxx |4 - solenv/clang-format/excludelist | 12 13 files changed, 72 insertions(+), 103 deletions(-) New commits: commit 156da5b55362db37d4e61a22e43e489e48797452 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:16:29 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:28:27 2020 +0100 tdf#123936 Formatting files in module slideshow with clang-format Change-Id: I108be5e01ed319f42912a6762ebceb97795113ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105708 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index decc63dab0ef..775c54b6c994 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -25,22 +25,23 @@ #include "parametricpolypolygon.hxx" #include "transitiontools.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generate a barn door wipe or double barn door wipe: class BarnDoorWipe : public ParametricPolyPolygon { public: -explicit BarnDoorWipe( bool doubled = false ) -: m_unitRect( createUnitRect() ), m_doubled(doubled) {} -virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; +explicit BarnDoorWipe(bool doubled = false) +: m_unitRect(createUnitRect()) +, m_doubled(doubled) +{ +} +virtual ::basegfx::B2DPolyPolygon operator()(double x) override; + private: const ::basegfx::B2DPolygon m_unitRect; const bool m_doubled; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_BARNDOORWIPE_HXX diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index 437f308285f3..b6745ed36c09 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -23,19 +23,16 @@ #include #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generates a clockWiseTwelve clock wipe: class ClockWipe : public ParametricPolyPolygon { public: /// 0,1 to 1,1 to 1,0 to 0,-1 to -1,0 to 0,1: -static ::basegfx::B2DPolygon calcCenteredClock( double t, double e = 1.0 ); -virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; +static ::basegfx::B2DPolygon calcCenteredClock(double t, double e = 1.0); +virtual ::basegfx::B2DPolyPolygon operator()(double t) override; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLOCKWIPE_HXX diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index eca5d865c0ef..c77a783ef707 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -24,18 +24,15 @@ #include "parametricpolypolygon.hxx" - -namespace slideshow::internal { - +namespace slideshow::internal +{ /// Generates a double diamond wipe: class DoubleDiamondWipe : public ParametricPolyPolygon { public: DoubleDiamondWipe() {} -virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; +virtual ::basegfx::B2DPolyPolygon operator()(double x) override; }; - - } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_DOUBLEDIAMONDWIPE_HXX diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 72d3e5a61bdf..ebceddb19078 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.cxx @@ -17,25 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include "iriswipe.hxx" - -namespace slideshow::internal { - -::basegfx::B2DPolyPolygon IrisWipe::operator () ( double t ) +namespace slideshow::internal +{ +::basegfx::B2DPolyPolygon IrisWipe::operator()(double t) { const double d = ::basegfx::
[Libreoffice-commits] core.git: solenv/clang-format xmlsecurity/inc xmlsecurity/qa xmlsecurity/source
solenv/clang-format/excludelist | 13 xmlsecurity/inc/biginteger.hxx |5 + xmlsecurity/inc/xmlsec/xmlstreamio.hxx | 19 -- xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx|4 - xmlsecurity/source/framework/buffernode.hxx | 34 +++- xmlsecurity/source/framework/elementmark.hxx| 10 +-- xmlsecurity/source/gpg/CipherContext.cxx|5 + xmlsecurity/source/gpg/CipherContext.hxx|8 +- xmlsecurity/source/gpg/DigestContext.cxx|8 -- xmlsecurity/source/gpg/DigestContext.hxx|6 +- xmlsecurity/source/gpg/SEInitializer.cxx| 29 -- xmlsecurity/source/gpg/XMLSecurityContext.cxx | 30 +- xmlsecurity/source/xmlsec/certificateextension_certextn.hxx |7 +- xmlsecurity/source/xmlsec/nss/secerror.hxx |6 -- 14 files changed, 89 insertions(+), 95 deletions(-) New commits: commit 15d080d2ca19891187a547f66d77183ebed0811b Author: Philipp Hofer AuthorDate: Thu Nov 12 13:08:26 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:27:01 2020 +0100 tdf#123936 Formatting files in module xmlsecurity with clang-format Change-Id: I25c8d1a3c706f1ba7565a5f018b9660faf63ffaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105734 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 0de8382faae6..2678beef6272 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -17103,7 +17103,6 @@ xmlscript/source/xmlmod_imexp/imp_share.hxx xmlscript/source/xmlmod_imexp/xmlmod_export.cxx xmlscript/source/xmlmod_imexp/xmlmod_import.cxx xmlscript/test/imexp.cxx -xmlsecurity/inc/biginteger.hxx xmlsecurity/inc/certificatechooser.hxx xmlsecurity/inc/certificateviewer.hxx xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -17119,12 +17118,10 @@ xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx xmlsecurity/inc/macrosecurity.hxx xmlsecurity/inc/xmlsec/saxhelper.hxx xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx -xmlsecurity/inc/xmlsec/xmlstreamio.hxx xmlsecurity/inc/xmlsignaturehelper.hxx xmlsecurity/inc/xmlsignaturehelper2.hxx xmlsecurity/inc/xsecctl.hxx xmlsecurity/qa/certext/SanCertExt.cxx -xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx xmlsecurity/source/component/certificatecontainer.cxx xmlsecurity/source/component/documentdigitalsignatures.cxx xmlsecurity/source/dialogs/certificatechooser.cxx @@ -17132,11 +17129,9 @@ xmlsecurity/source/dialogs/certificateviewer.cxx xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx xmlsecurity/source/dialogs/macrosecurity.cxx xmlsecurity/source/framework/buffernode.cxx -xmlsecurity/source/framework/buffernode.hxx xmlsecurity/source/framework/elementcollector.cxx xmlsecurity/source/framework/elementcollector.hxx xmlsecurity/source/framework/elementmark.cxx -xmlsecurity/source/framework/elementmark.hxx xmlsecurity/source/framework/saxeventkeeperimpl.cxx xmlsecurity/source/framework/securityengine.cxx xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -17145,16 +17140,10 @@ xmlsecurity/source/framework/signatureverifierimpl.cxx xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx xmlsecurity/source/gpg/CertificateImpl.cxx xmlsecurity/source/gpg/CertificateImpl.hxx -xmlsecurity/source/gpg/CipherContext.cxx -xmlsecurity/source/gpg/CipherContext.hxx -xmlsecurity/source/gpg/DigestContext.cxx -xmlsecurity/source/gpg/DigestContext.hxx -xmlsecurity/source/gpg/SEInitializer.cxx xmlsecurity/source/gpg/SecurityEnvironment.cxx xmlsecurity/source/gpg/SecurityEnvironment.hxx xmlsecurity/source/gpg/XMLEncryption.cxx xmlsecurity/source/gpg/XMLEncryption.hxx -xmlsecurity/source/gpg/XMLSecurityContext.cxx xmlsecurity/source/gpg/XMLSecurityContext.hxx xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -17169,7 +17158,6 @@ xmlsecurity/source/helper/xsecsign.cxx xmlsecurity/source/helper/xsecverify.cxx xmlsecurity/source/xmlsec/biginteger.cxx xmlsecurity/source/xmlsec/certificateextension_certextn.cxx -xmlsecurity/source/xmlsec/certificateextension_certextn.hxx xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx xmlsecurity/source/xmlsec/errorcallback.cxx xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx @@ -17195,7 +17183,6 @@ xmlsecurity/source/xmlsec/nss/nssinitializer.hxx xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx xmlsecurity/source/xmlsec/nss/secerror.cxx -xmlsecurity/source/xmlsec/nss/secerror.hxx xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx xmlsecurity/source/xmlsec/nss/seiniti
[Libreoffice-commits] core.git: solenv/clang-format xmloff/inc xmloff/source
solenv/clang-format/excludelist | 22 --- xmloff/inc/MultiPropertySetHelper.hxx | 62 ++-- xmloff/inc/PropertySetMerger.hxx|7 -- xmloff/inc/XMLTextColumnsExport.hxx | 13 ++-- xmloff/inc/animimp.hxx |9 +- xmloff/inc/forms/form_handler_factory.hxx | 13 +--- xmloff/inc/xmltabi.hxx | 13 +--- xmloff/source/chart/SchXMLEnumConverter.hxx |4 - xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx |5 - xmloff/source/chart/XMLLabelSeparatorContext.hxx| 14 ++-- xmloff/source/draw/XMLNumberStylesExport.hxx|8 +- xmloff/source/draw/ximpnote.cxx | 35 +-- xmloff/source/forms/formenums.hxx | 27 xmloff/source/forms/formevents.hxx |7 -- xmloff/source/script/XMLScriptContextFactory.cxx| 22 ++- xmloff/source/style/StyleMap.cxx|8 -- xmloff/source/style/xmlprhdl.cxx|4 - xmloff/source/text/XMLAutoTextEventImport.cxx | 21 ++ xmloff/source/text/txtdropi.hxx | 15 +--- xmloff/source/text/txtprhdl.hxx |4 - xmloff/source/transform/DocumentTContext.hxx|6 - xmloff/source/transform/EventMap.hxx|4 - xmloff/source/transform/TransformerTokenMap.hxx |5 - 23 files changed, 139 insertions(+), 189 deletions(-) New commits: commit c927d6daa9a6403c53cc41b1ab4dde820f08f387 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:29:07 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:25:20 2020 +0100 tdf#123936 Formatting files in module xmloff with clang-format Change-Id: I4d9016a0e646da5d9f0044762f6ecce86ce1242b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105732 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index b36977f1c8b5..0de8382faae6 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -16484,10 +16484,8 @@ xmloff/inc/DomBuilderContext.hxx xmloff/inc/DomExport.hxx xmloff/inc/EnhancedCustomShapeToken.hxx xmloff/inc/MetaExportComponent.hxx -xmloff/inc/MultiPropertySetHelper.hxx xmloff/inc/PageMasterImportContext.hxx xmloff/inc/PageMasterStyleMap.hxx -xmloff/inc/PropertySetMerger.hxx xmloff/inc/RDFaExportHelper.hxx xmloff/inc/RDFaImportHelper.hxx xmloff/inc/SchXMLAutoStylePoolP.hxx @@ -16526,13 +16524,10 @@ xmloff/inc/XMLStarBasicContextFactory.hxx xmloff/inc/XMLStarBasicExportHandler.hxx xmloff/inc/XMLStringBufferImportContext.hxx xmloff/inc/XMLTextColumnsContext.hxx -xmloff/inc/XMLTextColumnsExport.hxx xmloff/inc/XMLTextColumnsPropertyHandler.hxx xmloff/inc/XMLTextHeaderFooterContext.hxx xmloff/inc/animationimport.hxx -xmloff/inc/animimp.hxx xmloff/inc/fasttokenhandler.hxx -xmloff/inc/forms/form_handler_factory.hxx xmloff/inc/forms/property_handler.hxx xmloff/inc/forms/property_ids.hxx xmloff/inc/propimp0.hxx @@ -16544,7 +16539,6 @@ xmloff/inc/xexptran.hxx xmloff/inc/xmlmultiimagehelper.hxx xmloff/inc/xmlsdtypes.hxx xmloff/inc/xmltabe.hxx -xmloff/inc/xmltabi.hxx xmloff/inc/xmlversion.hxx xmloff/qa/unit/tokenmap-test.cxx xmloff/qa/unit/uxmloff.cxx @@ -16561,7 +16555,6 @@ xmloff/source/chart/SchXMLCalculationSettingsContext.hxx xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLChartContext.hxx xmloff/source/chart/SchXMLEnumConverter.cxx -xmloff/source/chart/SchXMLEnumConverter.hxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.cxx @@ -16589,11 +16582,9 @@ xmloff/source/chart/XMLChartPropertyContext.cxx xmloff/source/chart/XMLChartPropertyContext.hxx xmloff/source/chart/XMLChartStyleContext.cxx xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx -xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx xmloff/source/chart/XMLLabelSeparatorContext.cxx -xmloff/source/chart/XMLLabelSeparatorContext.hxx xmloff/source/chart/XMLSymbolImageContext.cxx xmloff/source/chart/XMLSymbolImageContext.hxx xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -16641,7 +16632,6 @@ xmloff/source/draw/XMLGraphicsDefaultStyle.cxx xmloff/source/draw/XMLImageMapContext.cxx xmloff/source/draw/XMLImageMapExport.cxx xmloff/source/draw/XMLNumberStyles.cxx -xmloff/source/draw/XMLNumberStylesExport.hxx xmloff/source/draw/XMLReplacementImageContext.cxx xmloff/source/draw/XMLShapePropertySetContext.cxx xmloff/source/draw/XMLShapeStyleContext.cxx @@ -16680,7 +16670,6 @@ xmloff/source/draw/ximpgrp.cxx xmloff/source/draw/ximpgrp.hxx xmloff/source/draw/ximplink.cxx xmloff/source/draw/ximplink.hxx -xmloff/source/dra
[Libreoffice-commits] core.git: solenv/clang-format writerfilter/inc writerfilter/qa writerfilter/source
solenv/clang-format/excludelist | 25 -- writerfilter/inc/dmapper/resourcemodel.hxx | 44 +-- writerfilter/inc/ooxml/QNameToString.hxx |4 writerfilter/qa/cppunittests/misc/misc.cxx | 15 - writerfilter/source/dmapper/FFDataHandler.hxx| 35 +- writerfilter/source/dmapper/FormControlHelper.hxx| 11 writerfilter/source/dmapper/GraphicHelpers.hxx | 34 +- writerfilter/source/dmapper/LoggedResources.cxx | 74 ++ writerfilter/source/dmapper/LoggedResources.hxx | 49 +-- writerfilter/source/dmapper/MeasureHandler.hxx |9 writerfilter/source/dmapper/ModelEventListener.hxx |9 writerfilter/source/dmapper/PageBordersHandler.hxx | 21 - writerfilter/source/dmapper/PropertyMapHelper.cxx| 16 - writerfilter/source/dmapper/PropertyMapHelper.hxx|8 writerfilter/source/dmapper/SectionColumnHandler.cxx | 29 +- writerfilter/source/dmapper/SettingsTable.hxx| 24 - writerfilter/source/dmapper/TextEffectsHandler.hxx |9 writerfilter/source/dmapper/ThemeTable.hxx |9 writerfilter/source/dmapper/TrackChangesHandler.hxx |8 writerfilter/source/dmapper/WrapPolygonHandler.hxx | 22 - writerfilter/source/dmapper/util.cxx | 13 - writerfilter/source/dmapper/util.hxx |5 writerfilter/source/ooxml/Handler.hxx| 103 writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx |7 writerfilter/source/ooxml/OOXMLParserState.hxx | 27 -- writerfilter/source/ooxml/OOXMLPropertySet.hxx | 185 --- 26 files changed, 366 insertions(+), 429 deletions(-) New commits: commit 7b49f8c7ebf40048181b56e9bfb11135bd473cab Author: Philipp Hofer AuthorDate: Thu Nov 12 13:28:09 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:24:47 2020 +0100 tdf#123936 Formatting files in module writerfilter with clang-format Change-Id: Ia60e7c5e2d3be0baa0496a6bd99c6ae98cd4ff96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105730 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ee1544646f0d..b36977f1c8b5 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -16383,10 +16383,7 @@ winaccessibility/source/service/AccTopWindowListener.cxx winaccessibility/source/service/AccTreeEventListener.cxx winaccessibility/source/service/AccWindowEventListener.cxx winaccessibility/source/service/msaaservice_impl.cxx -writerfilter/inc/dmapper/resourcemodel.hxx writerfilter/inc/ooxml/OOXMLDocument.hxx -writerfilter/inc/ooxml/QNameToString.hxx -writerfilter/qa/cppunittests/misc/misc.cxx writerfilter/source/dmapper/BorderHandler.cxx writerfilter/source/dmapper/BorderHandler.hxx writerfilter/source/dmapper/CellColorHandler.cxx @@ -16404,38 +16401,26 @@ writerfilter/source/dmapper/DomainMapperTableManager.hxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/FFDataHandler.cxx -writerfilter/source/dmapper/FFDataHandler.hxx writerfilter/source/dmapper/FieldTypes.hxx writerfilter/source/dmapper/FontTable.cxx writerfilter/source/dmapper/FontTable.hxx writerfilter/source/dmapper/FormControlHelper.cxx -writerfilter/source/dmapper/FormControlHelper.hxx writerfilter/source/dmapper/GraphicHelpers.cxx -writerfilter/source/dmapper/GraphicHelpers.hxx writerfilter/source/dmapper/GraphicImport.cxx writerfilter/source/dmapper/GraphicImport.hxx -writerfilter/source/dmapper/LoggedResources.cxx -writerfilter/source/dmapper/LoggedResources.hxx writerfilter/source/dmapper/MeasureHandler.cxx -writerfilter/source/dmapper/MeasureHandler.hxx writerfilter/source/dmapper/ModelEventListener.cxx -writerfilter/source/dmapper/ModelEventListener.hxx writerfilter/source/dmapper/NumberingManager.cxx writerfilter/source/dmapper/NumberingManager.hxx writerfilter/source/dmapper/OLEHandler.cxx writerfilter/source/dmapper/OLEHandler.hxx writerfilter/source/dmapper/PageBordersHandler.cxx -writerfilter/source/dmapper/PageBordersHandler.hxx writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyIds.hxx writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.hxx -writerfilter/source/dmapper/PropertyMapHelper.cxx -writerfilter/source/dmapper/PropertyMapHelper.hxx -writerfilter/source/dmapper/SectionColumnHandler.cxx writerfilter/source/dmapper/SectionColumnHandler.hxx writerfilter/source/dmapper/SettingsTable.cxx -writerfilter/source/dmapper/SettingsTable.hxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/StyleSheetTable.hxx writerfilter/source/dmapper/TDefTableHandler.cxx @@ -164
[Libreoffice-commits] core.git: salhelper/test solenv/clang-format
salhelper/test/Symbols/samplelib.hxx | 11 --- salhelper/test/dynamicloader/samplelib.hxx | 11 --- salhelper/test/rtti/rttitest.cxx |6 +++--- salhelper/test/rtti/samplelibrtti.hxx | 17 + solenv/clang-format/excludelist|4 5 files changed, 20 insertions(+), 29 deletions(-) New commits: commit 481fdcc619dadf0a65e5af73b0c33b26df2400e5 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:11:21 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:24:26 2020 +0100 tdf#123936 Formatting files in module salhelper with clang-format Change-Id: I2c1337f54934222580a95ac90c162d880e923110 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105700 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx index d1213f6dea8b..99dc0f6f774a 100644 --- a/salhelper/test/Symbols/samplelib.hxx +++ b/salhelper/test/Symbols/samplelib.hxx @@ -24,19 +24,16 @@ struct SampleLib_Api { -sal_Int32 (*funcA)( sal_Int32 ); -double (*funcB)( double ); +sal_Int32 (*funcA)(sal_Int32); +double (*funcB)(double); }; - typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" - -sal_Int32 funcA( sal_Int32 a); -double funcB( double a); - +sal_Int32 funcA(sal_Int32 a); +double funcB(double a); #endif diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx index 7b65a0ceb182..c254470fbbb6 100644 --- a/salhelper/test/dynamicloader/samplelib.hxx +++ b/salhelper/test/dynamicloader/samplelib.hxx @@ -24,19 +24,16 @@ struct SampleLib_Api { -sal_Int32 (*funcA)( sal_Int32 ); -double (*funcB)( double ); +sal_Int32 (*funcA)(sal_Int32); +double (*funcB)(double); }; - typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" - -sal_Int32 SAL_CALL funcA( sal_Int32 a); -double SAL_CALL funcB( double a); - +sal_Int32 SAL_CALL funcA(sal_Int32 a); +double SAL_CALL funcB(double a); #endif diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx index 7e753d3a6f43..0e06650034cc 100644 --- a/salhelper/test/rtti/rttitest.cxx +++ b/salhelper/test/rtti/rttitest.cxx @@ -23,14 +23,14 @@ int main() { MyClassB b; -MyClassA* pA= &b; +MyClassA* pA = &b; // test the virtual function pA->funcA(); -if( typeid( b) == typeid( pA)) +if (typeid(b) == typeid(pA)) printf("\nsame types"); -MyClassB* pB= dynamic_cast( pA); +MyClassB* pB = dynamic_cast(pA); pB->funcA(); return 0; } diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx index ae7e984a943d..b6bbe62224eb 100644 --- a/salhelper/test/rtti/samplelibrtti.hxx +++ b/salhelper/test/rtti/samplelibrtti.hxx @@ -23,20 +23,21 @@ class MyClassA { public: -virtual void funcA(); -virtual void funcB(); +virtual void funcA(); +virtual void funcB(); + protected: -virtual void funcC(); +virtual void funcC(); }; - -class MyClassB: public MyClassA +class MyClassB : public MyClassA { public: -virtual void funcA(); -virtual void funcB(); +virtual void funcA(); +virtual void funcB(); + protected: -virtual void funcC(); +virtual void funcC(); }; #endif diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 3de0a580b7e4..ee1544646f0d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -8437,13 +8437,9 @@ salhelper/source/thread.cxx salhelper/source/timer.cxx salhelper/test/Symbols/loader.cxx salhelper/test/Symbols/samplelib.cxx -salhelper/test/Symbols/samplelib.hxx salhelper/test/dynamicloader/loader.cxx salhelper/test/dynamicloader/samplelib.cxx -salhelper/test/dynamicloader/samplelib.hxx -salhelper/test/rtti/rttitest.cxx salhelper/test/rtti/samplelibrtti.cxx -salhelper/test/rtti/samplelibrtti.hxx sax/inc/xml2utf.hxx sax/qa/cppunit/attributes.cxx sax/qa/cppunit/parser.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/tools solenv/clang-format
registry/tools/fileurl.cxx |3 +-- registry/tools/fileurl.hxx |3 +-- solenv/clang-format/excludelist |2 -- 3 files changed, 2 insertions(+), 6 deletions(-) New commits: commit 5d8cf2021d8f7f171924f2b1adf824532cd67497 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:10:05 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:24:01 2020 +0100 tdf#123936 Formatting files in module registry with clang-format Change-Id: I57dbd6b8c944f2adb158db9c3086b3ad26c5c084 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105697 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx index dec3be5e5b0d..155995115b92 100644 --- a/registry/tools/fileurl.cxx +++ b/registry/tools/fileurl.cxx @@ -36,8 +36,7 @@ using osl::FileBase; namespace registry::tools { - -OUString convertToFileUrl(char const * filename, sal_Int32 length) +OUString convertToFileUrl(char const* filename, sal_Int32 length) { OUString const uFileName(filename, length, osl_getThreadTextEncoding()); if (strncmp(filename, "file://", 7) == 0) diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx index b2a68502618c..c09c7ff6a913 100644 --- a/registry/tools/fileurl.hxx +++ b/registry/tools/fileurl.hxx @@ -24,8 +24,7 @@ namespace registry::tools { - -OUString convertToFileUrl(char const * filename, sal_Int32 length); +OUString convertToFileUrl(char const* filename, sal_Int32 length); } // namespace registry::tools diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index a405f5979149..3de0a580b7e4 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -8002,8 +8002,6 @@ registry/source/regkey.hxx registry/test/regdiagnose.h registry/test/testmerge.cxx registry/test/testregcpp.cxx -registry/tools/fileurl.cxx -registry/tools/fileurl.hxx registry/tools/options.cxx registry/tools/options.hxx registry/tools/regmerge.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/inc package/source solenv/clang-format
package/inc/EncryptedDataHeader.hxx |3 + package/inc/PackageConstants.hxx | 26 +++--- package/inc/ZipEnumeration.hxx|7 ++- package/source/xstor/disposelistener.hxx |6 +-- package/source/zipapi/ZipEnumeration.cxx | 15 ++-- package/source/zippackage/ZipPackageFolderEnumeration.cxx | 26 ++ package/source/zippackage/ZipPackageFolderEnumeration.hxx | 21 --- package/source/zippackage/ZipPackageSink.cxx | 11 ++--- package/source/zippackage/ZipPackageSink.hxx | 10 +++-- solenv/clang-format/excludelist |9 10 files changed, 59 insertions(+), 75 deletions(-) New commits: commit eb4c2e96f38a6b5280a83709e55fbb5b8d7e9d36 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:09:45 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:23:33 2020 +0100 tdf#123936 Formatting files in module package with clang-format Change-Id: I3ff80c6c636003d468f384e0d6fbfb5233e0b4da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105696 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index 26d8e62d02db..6860c50abb48 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -42,7 +42,8 @@ */ const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005" -const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length +const sal_Int32 n_ConstHeaderSize += 38; // + salt length + iv length + digest length + mediatype length const sal_Int16 n_ConstCurrentVersion = 1; #endif diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index b81c0dd0a904..141da220ec69 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -30,22 +30,22 @@ const sal_Int32 n_ConstDigestLength = 1024; const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32 // the constants related to the manifest.xml entries -#define PKG_MNFST_FULLPATH0 //FullPath (Put full-path property first for MBA) -#define PKG_MNFST_VERSION 1 //Version -#define PKG_MNFST_MEDIATYPE 2 //MediaType - -#define PKG_MNFST_INIVECTOR 3 //InitialisationVector -#define PKG_MNFST_SALT4 //Salt -#define PKG_MNFST_ITERATION 5 //IterationCount -#define PKG_MNFST_UCOMPSIZE 6 //Size -#define PKG_MNFST_DIGEST 7 //Digest -#define PKG_MNFST_ENCALG 8 //EncryptionAlgorithm -#define PKG_MNFST_STARTALG9 //StartKeyAlgorithm -#define PKG_MNFST_DIGESTALG 10 //DigestAlgorithm +#define PKG_MNFST_FULLPATH 0 //FullPath (Put full-path property first for MBA) +#define PKG_MNFST_VERSION 1 //Version +#define PKG_MNFST_MEDIATYPE 2 //MediaType + +#define PKG_MNFST_INIVECTOR 3 //InitialisationVector +#define PKG_MNFST_SALT 4 //Salt +#define PKG_MNFST_ITERATION 5 //IterationCount +#define PKG_MNFST_UCOMPSIZE 6 //Size +#define PKG_MNFST_DIGEST 7 //Digest +#define PKG_MNFST_ENCALG 8 //EncryptionAlgorithm +#define PKG_MNFST_STARTALG 9 //StartKeyAlgorithm +#define PKG_MNFST_DIGESTALG 10 //DigestAlgorithm #define PKG_MNFST_DERKEYSIZE 11 //DerivedKeySize #define PKG_SIZE_NOENCR_MNFST 3 -#define PKG_SIZE_ENCR_MNFST 12 +#define PKG_SIZE_ENCR_MNFST 12 // the properties related constants #define ENCRYPTION_KEY_PROPERTY "EncryptionKey" diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index cc4156a0ee52..f0a810ea29cd 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -23,12 +23,13 @@ class ZipEnumeration final { -EntryHash &rEntryHash; +EntryHash& rEntryHash; EntryHash::const_iterator aIterator; + public: bool hasMoreElements(); -const ZipEntry * nextElement(); -ZipEnumeration( EntryHash &rNewEntryHash ); +const ZipEntry* nextElement(); +ZipEnumeration(EntryHash& rNewEntryHash); ~ZipEnumeration(); }; diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx index 5abb727cdbff..79b0976d8188 100644 --- a/package/source/xstor/disposelistener.hxx +++ b/package/source/xstor/disposelistener.hxx @@ -25,18 +25,18 @@ #include class OStorage; -class OChildDispListener_Impl : public ::cppu::WeakImplHelper < css::lang::XEventListener > +class OChildDispListener_Impl : public ::cppu::WeakImplHelper { ::osl::Mutex m_aMutex; OStorage* m_pStorage; public: -explicit OChildDispListener_Impl( OStorage& aStorage ); +explicit OChildDispListener_Impl(OStorage& aStorage); virtual ~OChildDispListener_Impl() override; void OwnerIsDisposed(); -virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; +virtual void SAL_CALL disposing(const css::lang::EventObject& Source)
[Libreoffice-commits] core.git: opencl/inc opencl/source solenv/clang-format
opencl/inc/opencl_device.hxx|9 ++--- opencl/source/OpenCLZone.cxx|6 -- solenv/clang-format/excludelist |2 -- 3 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 4d4e95be173e84b5040af46a459b3c071bfd744a Author: Philipp Hofer AuthorDate: Thu Nov 12 13:09:22 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:23:02 2020 +0100 tdf#123936 Formatting files in module opencl with clang-format Change-Id: I16a00ceee4c2b772ec9ed6b1b349253114b22239 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105695 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 93cc5f7a1271..69a9cbbc9c1a 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -12,12 +12,15 @@ #include -namespace openclwrapper { struct GPUEnv; } +namespace openclwrapper +{ +struct GPUEnv; +} struct ds_device; -ds_device const & getDeviceSelection(OUString const & pFileName, bool bForceSelection); +ds_device const& getDeviceSelection(OUString const& pFileName, bool bForceSelection); -void releaseOpenCLEnv( openclwrapper::GPUEnv *gpuInfo ); +void releaseOpenCLEnv(openclwrapper::GPUEnv* gpuInfo); #endif diff --git a/opencl/source/OpenCLZone.cxx b/opencl/source/OpenCLZone.cxx index 01b50ed14a54..1eaf3f43fc96 100644 --- a/opencl/source/OpenCLZone.cxx +++ b/opencl/source/OpenCLZone.cxx @@ -30,12 +30,14 @@ void OpenCLZone::hardDisable() bDisabled = true; -std::shared_ptr xChanges(comphelper::ConfigurationChanges::create()); +std::shared_ptr xChanges( +comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Misc::UseOpenCL::set(false, xChanges); xChanges->commit(); // Force synchronous config write -auto xConfProvider = css::configuration::theDefaultProvider::get(comphelper::getProcessComponentContext()); +auto xConfProvider += css::configuration::theDefaultProvider::get(comphelper::getProcessComponentContext()); css::uno::Reference xFlushable(xConfProvider, css::uno::UNO_QUERY_THROW); xFlushable->flush(); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 34d6c2190f5d..510f3fe90ac8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7897,9 +7897,7 @@ oox/source/vml/vmlshapecontainer.cxx oox/source/vml/vmlshapecontext.cxx oox/source/vml/vmltextbox.cxx oox/source/vml/vmltextboxcontext.cxx -opencl/inc/opencl_device.hxx opencl/inc/opencl_device_selection.h -opencl/source/OpenCLZone.cxx opencl/source/opencl_device.cxx opencl/source/openclconfig.cxx opencl/source/openclwrapper.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/inc reportdesign/qa reportdesign/source solenv/clang-format
reportdesign/inc/dllapi.h |4 - reportdesign/qa/unit/reportdesign-dialogs-test.cxx|4 - reportdesign/source/core/api/ReportControlModel.cxx | 47 +- reportdesign/source/core/api/ReportVisitor.cxx| 43 reportdesign/source/core/resource/core_resource.cxx |5 - reportdesign/source/filter/xml/xmlPropertyHandler.cxx | 19 ++- reportdesign/source/ui/inc/dlgedclip.hxx | 15 +++-- reportdesign/source/ui/inc/dlgedfac.hxx |4 - reportdesign/source/ui/inc/dlgpage.hxx|7 +- solenv/clang-format/excludelist |9 --- 10 files changed, 68 insertions(+), 89 deletions(-) New commits: commit dab1e6435728c6d7e81d6d6158e1fa45470345d2 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:10:28 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:22:35 2020 +0100 tdf#123936 Formatting files in module reportdesign with clang-format Change-Id: Ib734a1ada8dac37c1cd168377863f1edd21c7aeb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105698 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/reportdesign/inc/dllapi.h b/reportdesign/inc/dllapi.h index 118bfb3429f9..bb730c003e06 100644 --- a/reportdesign/inc/dllapi.h +++ b/reportdesign/inc/dllapi.h @@ -23,9 +23,9 @@ #include #if defined(REPORTDESIGN_DLLIMPLEMENTATION) -#define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_REPORTDESIGN_INC_DLLAPI_H diff --git a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx index aef61b008425..30e421409c41 100644 --- a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx +++ b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx @@ -36,9 +36,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -ReportdesignDialogsTest::ReportdesignDialogsTest() -{ -} +ReportdesignDialogsTest::ReportdesignDialogsTest() {} void ReportdesignDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index c13b326f5dc3..480f21377e6b 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -26,48 +26,50 @@ using namespace com::sun::star; using namespace comphelper; // XContainer -void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) +void OReportControlModel::addContainerListener( +const uno::Reference& xListener) { aContainerListeners.addInterface(xListener); } -void OReportControlModel::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) +void OReportControlModel::removeContainerListener( +const uno::Reference& xListener) { aContainerListeners.removeInterface(xListener); } -bool OReportControlModel::hasElements( ) +bool OReportControlModel::hasElements() { ::osl::MutexGuard aGuard(m_rMutex); return !m_aFormatConditions.empty(); } // XIndexContainer -void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) +void OReportControlModel::insertByIndex(::sal_Int32 Index, const uno::Any& Element) { -uno::Reference xElement(Element,uno::UNO_QUERY); -if ( !xElement.is() ) +uno::Reference xElement(Element, uno::UNO_QUERY); +if (!xElement.is()) throw lang::IllegalArgumentException(); -uno::Reference< container::XContainer > xBroadcaster; +uno::Reference xBroadcaster; { ::osl::MutexGuard aGuard(m_rMutex); xBroadcaster = m_pOwner; -if ( Index > static_cast(m_aFormatConditions.size()) ) +if (Index > static_cast(m_aFormatConditions.size())) throw lang::IndexOutOfBoundsException(); -m_aFormatConditions.insert(m_aFormatConditions.begin() + Index,xElement); +m_aFormatConditions.insert(m_aFormatConditions.begin() + Index, xElement); } // notify our container listeners container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any()); - aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent); + aContainerListeners.notifyEach(&container::XContainerListener::elementInserted, aEvent); } -void OReportControlModel::removeByIndex( ::sal_Int32 Index ) +void OReportControlModel::removeByIndex(::sal_Int32 Index) { uno::Any Element; -uno::Reference< container::XContainer > xBroadcaster; +uno::Reference xBroadcaster; { ::osl::MutexGuard aGuard(m_rMutex); xBroadcaster = m_pOwner; @@ -76,16 +78,16 @@ void OReport
[Libreoffice-commits] core.git: oox/inc oox/qa oox/source solenv/clang-format
oox/inc/drawingml/objectdefaultcontext.hxx | 10 +-- oox/inc/drawingml/shapepropertiescontext.hxx| 12 ++-- oox/inc/drawingml/shapestylecontext.hxx | 12 ++-- oox/inc/drawingml/spdefcontext.hxx | 10 +-- oox/inc/drawingml/table/tablecellcontext.hxx| 13 ++-- oox/inc/drawingml/table/tablecontext.hxx| 11 +--- oox/inc/drawingml/table/tablerow.hxx| 13 +--- oox/inc/drawingml/table/tablerowcontext.hxx | 13 ++-- oox/inc/drawingml/textliststyle.hxx | 20 +++ oox/inc/drawingml/themeelementscontext.hxx | 10 +-- oox/qa/unit/vba_encryption.cxx |1 oox/source/crypto/DocumentDecryption.cxx| 54 +++- oox/source/drawingml/diagram/layoutatomvisitors.cxx | 33 +++- oox/source/drawingml/embeddedwavaudiofile.cxx | 15 ++--- oox/source/drawingml/table/tablerow.cxx |7 +- oox/source/drawingml/table/tablestyle.cxx |7 -- oox/source/drawingml/table/tablestylelist.cxx | 11 +--- oox/source/drawingml/table/tablestylepart.cxx |7 -- oox/source/drawingml/textspacingcontext.hxx | 12 ++-- oox/source/mathml/export.cxx|5 - oox/source/ppt/animationtypes.cxx | 13 ++-- oox/source/ppt/animationtypes.hxx |9 +-- oox/source/ppt/comments.cxx | 18 ++ oox/source/token/namespacemap.cxx |5 - oox/source/token/propertynames.cxx | 15 ++--- solenv/clang-format/excludelist | 25 - 26 files changed, 159 insertions(+), 202 deletions(-) New commits: commit c4ab5393e1c2332d92ea6672d3c8ffc3a6220afa Author: Philipp Hofer AuthorDate: Thu Nov 12 13:08:56 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:22:02 2020 +0100 tdf#123936 Formatting files in module oox with clang-format Change-Id: Ie061189450e0f9004ca503bb28164885812f2acc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105694 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx index 703b03097673..45873c8253ff 100644 --- a/oox/inc/drawingml/objectdefaultcontext.hxx +++ b/oox/inc/drawingml/objectdefaultcontext.hxx @@ -22,20 +22,20 @@ #include -namespace oox::drawingml { - +namespace oox::drawingml +{ class Theme; class objectDefaultContext final : public oox::core::ContextHandler2 { public: -objectDefaultContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme ); -virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; +objectDefaultContext(::oox::core::ContextHandler2Helper const& rParent, Theme& rTheme); +virtual ::oox::core::ContextHandlerRef +onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: Theme& mrTheme; }; - } #endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX diff --git a/oox/inc/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx index 6736403f6063..9d047c15c224 100644 --- a/oox/inc/drawingml/shapepropertiescontext.hxx +++ b/oox/inc/drawingml/shapepropertiescontext.hxx @@ -23,19 +23,19 @@ #include #include -namespace oox::drawingml { - +namespace oox::drawingml +{ class ShapePropertiesContext : public ::oox::core::ContextHandler2 { public: -ShapePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape ); +ShapePropertiesContext(::oox::core::ContextHandler2Helper const& rParent, Shape& rShape); -virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; +virtual ::oox::core::ContextHandlerRef +onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; protected: -Shape& mrShape; +Shape& mrShape; }; - } #endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx index 8a2cf9f904fd..02faa22a7670 100644 --- a/oox/inc/drawingml/shapestylecontext.hxx +++ b/oox/inc/drawingml/shapestylecontext.hxx @@ -23,20 +23,20 @@ #include #include -namespace oox::drawingml { - +namespace oox::drawingml +{ class ShapeStyleContext final : public ::oox::core::ContextHandler2 { public: -ShapeStyleContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape ); +ShapeStyleContext(::oox::core::ContextHandler2Helper const& rParent, Shape& rShape); virtual ~ShapeStyleContext() override; -virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox:
[Libreoffice-commits] core.git: onlineupdate/inc onlineupdate/source solenv/clang-format
onlineupdate/inc/bspatch.h| 10 - onlineupdate/source/service/servicebase.hxx |5 onlineupdate/source/service/workmonitor.hxx |2 onlineupdate/source/update/common/errors.h|2 onlineupdate/source/update/common/win_dirent.h|4 onlineupdate/source/update/updater/progressui.h |4 onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx | 69 +++--- solenv/clang-format/excludelist |7 - 8 files changed, 37 insertions(+), 66 deletions(-) New commits: commit de80fdc2060abe5b171bcef72944dd7b914ccd33 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:08:26 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 19:21:39 2020 +0100 tdf#123936 Formatting files in module onlineupdate with clang-format Change-Id: I17aba4fbf7c2e914e64c62e9370695e20d7c14d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105693 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/onlineupdate/inc/bspatch.h b/onlineupdate/inc/bspatch.h index ff1a8072964f..e9326262c243 100644 --- a/onlineupdate/inc/bspatch.h +++ b/onlineupdate/inc/bspatch.h @@ -69,7 +69,7 @@ typedef struct MBSPatchHeader_ * @param fd Must have been opened for reading, and be at the beginning * of the file. */ -int MBS_ReadHeader(FILE* file, MBSPatchHeader *header); +int MBS_ReadHeader(FILE* file, MBSPatchHeader* header); /** * Apply a patch. This method does not validate the checksum of the original @@ -82,14 +82,14 @@ int MBS_ReadHeader(FILE* file, MBSPatchHeader *header); *to header->dlen if it is an existing file. The offset *should be at the beginning of the file. */ -int MBS_ApplyPatch(const MBSPatchHeader *header, FILE* patchFile, - unsigned char *fbuffer, FILE* file); +int MBS_ApplyPatch(const MBSPatchHeader* header, FILE* patchFile, unsigned char* fbuffer, + FILE* file); typedef struct MBSPatchTriple_ { uint32_t x; /* add x bytes from oldfile to x bytes from the diff block */ uint32_t y; /* copy y bytes from the extra block */ -int32_t z; /* seek forwards in oldfile by z bytes */ +int32_t z; /* seek forwards in oldfile by z bytes */ } MBSPatchTriple; -#endif // bspatch_h__ +#endif // bspatch_h__ diff --git a/onlineupdate/source/service/servicebase.hxx b/onlineupdate/source/service/servicebase.hxx index c47f966ad551..45375fbe5d32 100644 --- a/onlineupdate/source/service/servicebase.hxx +++ b/onlineupdate/source/service/servicebase.hxx @@ -6,7 +6,7 @@ #include "updatelogging.h" BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); -BOOL VerifySameFiles(LPCWSTR file1Path, LPCWSTR file2Path, BOOL &sameContent); +BOOL VerifySameFiles(LPCWSTR file1Path, LPCWSTR file2Path, BOOL& sameContent); // 32KiB for comparing files at a time seems reasonable. // The bigger the better for speed, but this will be used @@ -17,6 +17,5 @@ BOOL VerifySameFiles(LPCWSTR file1Path, LPCWSTR file2Path, BOOL &sameContent); // Mozilla application as an updater. Before the maintenance service will // execute the updater it must have this updater identity string in its string // table. No other signed Mozilla product will have this string table value. -#define UPDATER_IDENTITY_STRING \ - "libreoffice-updater.exe-7bab28a0-0599-4f37-9efe-f7f8b71f05e3" +#define UPDATER_IDENTITY_STRING "libreoffice-updater.exe-7bab28a0-0599-4f37-9efe-f7f8b71f05e3" #define IDS_UPDATER_IDENTITY 1006 diff --git a/onlineupdate/source/service/workmonitor.hxx b/onlineupdate/source/service/workmonitor.hxx index ac4cd679bf8d..8fc2e51a7ded 100644 --- a/onlineupdate/source/service/workmonitor.hxx +++ b/onlineupdate/source/service/workmonitor.hxx @@ -2,4 +2,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -BOOL ExecuteServiceCommand(int argc, LPWSTR *argv); +BOOL ExecuteServiceCommand(int argc, LPWSTR* argv); diff --git a/onlineupdate/source/update/common/errors.h b/onlineupdate/source/update/common/errors.h index 95bdcdfa73e5..2216b54491ee 100644 --- a/onlineupdate/source/update/common/errors.h +++ b/onlineupdate/source/update/common/errors.h @@ -93,4 +93,4 @@ #define FALLBACKKEY_SERVICE_NO_STOP_ERROR 103 #define FALLBACKKEY_LAUNCH_ERROR 104 -#endif // Errors_h__ +#endif // Errors_h__ diff --git a/onlineupdate/source/update/common/win_dirent.h b/onlineupdate/source/update/common/win_dirent.h index ee2ab6c67bd5..fff13f9e0c9f 100644 --- a/onlineupdate/source/update/common/win_dirent.h +++ b/onlineupdate/source/update/common/win_dirent.h @@ -27,5 +27,5 @@ DIR* opendir(const WCHAR* path); int closedir(DIR* dir); dirent* readdir(DIR* dir); -#endif // WNT -#endif // WINDI
[Libreoffice-commits] core.git: solenv/clang-format stoc/source stoc/test
solenv/clang-format/excludelist |3 --- stoc/source/javavm/jvmargs.cxx | 12 +++- stoc/test/mergekeys_.cxx|1 - stoc/test/testsmgr.cxx | 18 -- 4 files changed, 11 insertions(+), 23 deletions(-) New commits: commit 5ce88c782e44dae6de8df2933b7c036f0dd48172 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:18:01 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 14:47:21 2020 +0100 tdf#123936 Formatting files in module stoc with clang-format Change-Id: I401279561e2481a8af7ed600d4133812b08386ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105712 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 602463bac622..09ed9297e0b9 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11947,7 +11947,6 @@ stoc/source/javavm/interact.cxx stoc/source/javavm/interact.hxx stoc/source/javavm/javavm.cxx stoc/source/javavm/javavm.hxx -stoc/source/javavm/jvmargs.cxx stoc/source/javavm/jvmargs.hxx stoc/source/loader/dllcomponentloader.cxx stoc/source/namingservice/namingservice.cxx @@ -11969,7 +11968,6 @@ stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx stoc/test/javavm/jvm_interaction/interactionhandler.cxx stoc/test/javavm/testjavavm.cxx -stoc/test/mergekeys_.cxx stoc/test/registry_tdprovider/testregistrytdprovider.cxx stoc/test/tdmanager/testtdmanager.cxx stoc/test/testconv.cxx @@ -11979,7 +11977,6 @@ stoc/test/testintrosp.cxx stoc/test/testloader.cxx stoc/test/testproxyfac.cxx stoc/test/testregistry.cxx -stoc/test/testsmgr.cxx stoc/test/testsmgr2.cxx stoc/test/testsmgr_cpnt.cxx stoc/test/uriproc/test_uriproc.cxx diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx index 9668df2037a6..a7110841565b 100644 --- a/stoc/source/javavm/jvmargs.cxx +++ b/stoc/source/javavm/jvmargs.cxx @@ -17,22 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "jvmargs.hxx" #include -namespace stoc_javavm { - -JVM::JVM() throw()//: _enabled(sal_False) +namespace stoc_javavm { -} - -void JVM::pushProp(const OUString & property) +JVM::JVM() throw() //: _enabled(sal_False) { -_props.push_back(property); } - +void JVM::pushProp(const OUString& property) { _props.push_back(property); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/test/mergekeys_.cxx b/stoc/test/mergekeys_.cxx index 02bd486fb98a..079e12670abe 100644 --- a/stoc/test/mergekeys_.cxx +++ b/stoc/test/mergekeys_.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "../source/implementationregistration/mergekeys.cxx" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx index d65b1c2e3a07..a8243386e27d 100644 --- a/stoc/test/testsmgr.cxx +++ b/stoc/test/testsmgr.cxx @@ -38,14 +38,13 @@ extern "C" void SAL_CALL test_ServiceManager(); #define TRUE 1 #endif - OString userRegEnv("STAR_USER_REGISTRY="); OUString getExePath() { -OUStringexe; +OUString exe; -OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None); +OSL_VERIFY(osl_getExecutableFile(&exe.pData) == osl_Process_E_None); #if defined(_WIN32) exe = exe.copy(0, exe.getLength() - 16); @@ -57,13 +56,13 @@ OUString getExePath() void setStarUserRegistry() { -Registry *myRegistry = new Registry(); +Registry* myRegistry = new Registry(); RegistryKey rootKey, rKey, rKey2; OUString userReg = getExePath(); userReg += "user.rdb"; -if(myRegistry->open(userReg, RegAccessMode::READWRITE)) +if (myRegistry->open(userReg, RegAccessMode::READWRITE)) { OSL_VERIFY(!myRegistry->create(userReg)); } @@ -72,18 +71,17 @@ void setStarUserRegistry() delete myRegistry; userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US); -putenv((char *)userRegEnv.getStr()); +putenv((char*)userRegEnv.getStr()); } - SAL_IMPLEMENT_MAIN() { -printf( "ServiceManagerTest : \r"); +printf("ServiceManagerTest : \r"); setStarUserRegistry(); -fflush( stdout ); +fflush(stdout); test_ServiceManager(); -printf( "ServiceManagerTest : OK\n" ); +printf("ServiceManagerTest : OK\n"); return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/bluez_bluetooth solenv/clang-format
external/bluez_bluetooth/inc/bluetooth/hci.h | 106 +++ external/bluez_bluetooth/inc/bluetooth/hci_lib.h |5 - external/bluez_bluetooth/inc/bluetooth/rfcomm.h |6 - external/bluez_bluetooth/inc/bluetooth/sco.h |6 - solenv/clang-format/excludelist |4 5 files changed, 61 insertions(+), 66 deletions(-) New commits: commit c19cc6ad7676a987475fc718488007af3672a025 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:56:54 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 14:46:43 2020 +0100 tdf#123936 Formatting files in module external with clang-format Change-Id: If304aa6be018442a72e284f62d7745b3cdaef536 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105668 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/external/bluez_bluetooth/inc/bluetooth/hci.h b/external/bluez_bluetooth/inc/bluetooth/hci.h index 3b78f4b5f7d0..7a5b6ab0a23a 100644 --- a/external/bluez_bluetooth/inc/bluetooth/hci.h +++ b/external/bluez_bluetooth/inc/bluetooth/hci.h @@ -96,7 +96,7 @@ #define ESCO_3EV5 0x0200 #define SCO_ESCO_MASK (ESCO_HV1 | ESCO_HV2 | ESCO_HV3) #define EDR_ESCO_MASK (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5) -#define ALL_ESCO_MASK (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 | EDR_ESCO_MASK) +#define ALL_ESCO_MASK (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 | EDR_ESCO_MASK) #define HCI_UNKNOWN_COMMAND 0x01 #define HCI_NO_CONNECTION 0x02 #define HCI_HARDWARE_FAILURE 0x03 @@ -414,9 +414,9 @@ #define OCF_READ_NUM_SUPPORTED_IAC 0x0038 #define MAX_IAC_LAP 0x40 #define OCF_READ_CURRENT_IAC_LAP 0x0039 -#define READ_CURRENT_IAC_LAP_RP_SIZE 2+3*MAX_IAC_LAP +#define READ_CURRENT_IAC_LAP_RP_SIZE 2 + 3 * MAX_IAC_LAP #define OCF_WRITE_CURRENT_IAC_LAP 0x003A -#define WRITE_CURRENT_IAC_LAP_CP_SIZE 1+3*MAX_IAC_LAP +#define WRITE_CURRENT_IAC_LAP_CP_SIZE 1 + 3 * MAX_IAC_LAP #define OCF_READ_PAGE_SCAN_PERIOD_MODE 0x003B #define OCF_WRITE_PAGE_SCAN_PERIOD_MODE 0x003C #define OCF_READ_PAGE_SCAN_MODE 0x003D @@ -620,10 +620,10 @@ #define HCI_ACL_HDR_SIZE 4 #define HCI_SCO_HDR_SIZE 3 #define HCI_MSG_HDR_SIZE 6 -#define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff)|(ogf << 10)) +#define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff) | (ogf << 10)) #define cmd_opcode_ogf(op) (op >> 10) #define cmd_opcode_ocf(op) (op & 0x03ff) -#define acl_handle_pack(h, f) (uint16_t)((h & 0x0fff)|(f << 12)) +#define acl_handle_pack(h, f) (uint16_t)((h & 0x0fff) | (f << 12)) #define acl_handle(h) (h & 0x0fff) #define acl_flags(h) (h >> 12) #endif @@ -642,77 +642,77 @@ #endif struct hci_dev_stats { - uint32_t err_rx; - uint32_t err_tx; - uint32_t cmd_tx; - uint32_t evt_rx; - uint32_t acl_tx; - uint32_t acl_rx; - uint32_t sco_tx; - uint32_t sco_rx; - uint32_t byte_rx; - uint32_t byte_tx; +uint32_t err_rx; +uint32_t err_tx; +uint32_t cmd_tx; +uint32_t evt_rx; +uint32_t acl_tx; +uint32_t acl_rx; +uint32_t sco_tx; +uint32_t sco_rx; +uint32_t byte_rx; +uint32_t byte_tx; }; struct hci_dev_info { - uint16_t dev_id; - char name[8]; +uint16_t dev_id; +char name[8]; - bdaddr_t bdaddr; +bdaddr_t bdaddr; - uint32_t flags; - uint8_t type; +uint32_t flags; +uint8_t type; - uint8_t features[8]; +uint8_t features[8]; - uint32_t pkt_type; - uint32_t link_policy; - uint32_t link_mode; +uint32_t pkt_type; +uint32_t link_policy; +uint32_t link_mode; - uint16_t acl_mtu; - uint16_t acl_pkts; - uint16_t sco_mtu; - uint16_t sco_pkts; +uint16_t acl_mtu; +uint16_t acl_pkts; +uint16_t sco_mtu; +uint16_t sco_pkts; - struct hci_dev_stats stat; +struct hci_dev_stats stat; }; enum { - HCI_UP, - HCI_INIT, - HCI_RUNNING, +HCI_UP, +HCI_INIT, +HCI_RUNNING, - HCI_PSCAN, - HCI_ISCAN, - HCI_AUTH, - HCI_ENCRYPT, - HCI_INQUIRY, +HCI_PSCAN, +HCI_ISCAN, +HCI_AUTH, +HCI_ENCRYPT, +HCI_INQUIRY, - HCI_RAW, +HCI_RAW, - HCI_SECMGR +HCI_SECMGR }; struct sockaddr_hci { - sa_family_t hci_family; - unsigned short hci_dev; +sa_family_t hci_family; +unsigned short hci_dev; }; struct hci_conn_info { - uint16_t handle; - bdaddr_t bdaddr; - uint8_t type; - uint8_t out; - uint16_t state; - uint32_t link_mode; - uint32_t mtu; - uint32_t cnt; - uint32_t pkts; +uint16_t handle; +bdaddr_t bdaddr; +uint8_t type; +uint8_t out; +uint16_t state; +uint32_t link_mode; +uint32_t mtu; +uint32_t cnt; +uint32_t pkts; }; struct hci_conn_list_req { - uint16_t dev_id; - uint16_t conn_num; - struct hci_conn_info conn_info[0]; +uint16_t dev_id; +uint16_t conn_num; +struct hci_conn_info conn_info[0]; }; #endif diff --git a/external/bluez_bluetooth/inc/bluetooth/hci_lib.h b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h index ef290bc45464..d6886c146d6f 100644 --- a/external/bluez_bluetooth/i
[Libreoffice-commits] core.git: solenv/clang-format soltools/cpp
solenv/clang-format/excludelist |2 - soltools/cpp/_cpp.c | 73 soltools/cpp/_getopt.h |4 +- 3 files changed, 32 insertions(+), 47 deletions(-) New commits: commit 672ddcb7d7a496f4a4f761b32aceaa72e4f600ed Author: Philipp Hofer AuthorDate: Thu Nov 12 13:16:52 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 14:46:26 2020 +0100 tdf#123936 Formatting files in module soltools with clang-format Change-Id: I5aa4c38b33193f33f71516e347ef1a58d0c10ae7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105709 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 0256bb8c292c..6a43df5e136e 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11808,10 +11808,8 @@ smoketest/smoketest.cxx solenv/bin/concat-deps.c solenv/gbuildtojson/gbuildtojson.cxx solenv/gcc-wrappers/wrapper.cxx -soltools/cpp/_cpp.c soltools/cpp/_eval.c soltools/cpp/_getopt.c -soltools/cpp/_getopt.h soltools/cpp/_include.c soltools/cpp/_lex.c soltools/cpp/_macro.c diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c index 77a7193477c9..9dd3a294d1b5 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -24,13 +24,13 @@ #include #include "cpp.h" -#define OUTS16384 +#define OUTS 16384 static char outbuf[OUTS]; -char *outptr = outbuf; -Source *cursource; +char* outptr = outbuf; +Source* cursource; static int nerrs; -struct token nltoken = {NL, 0, 1, (uchar *) "\n", 0}; -char *curtime; +struct token nltoken = { NL, 0, 1, (uchar*)"\n", 0 }; +char* curtime; int incdepth; int ifdepth; int ifsatisfied[NIF]; @@ -38,11 +38,10 @@ int skipping; int #ifdef _WIN32 -__cdecl +__cdecl #endif // _WIN32 -main(int argc, char **argv) +main(int argc, char** argv) { - Tokenrow tr; time_t t; char ebuf[BUFSIZ]; @@ -63,8 +62,7 @@ __cdecl exit(nerrs > 0); } -void -process(Tokenrow * trp) +void process(Tokenrow* trp) { int anymacros = 0; @@ -83,8 +81,7 @@ void if (--incdepth >= 0) { if (cursource->ifdepth) -error(ERROR, - "Unterminated conditional in #include"); +error(ERROR, "Unterminated conditional in #include"); unsetsource(); cursource->line += cursource->lineinc; trp->tp = trp->lp; @@ -101,9 +98,8 @@ void trp->tp += 1; control(trp); } -else -if (!skipping && anymacros) -expandrow(trp, NULL); +else if (!skipping && anymacros) +expandrow(trp, NULL); if (skipping) setempty(trp); puttokens(trp); @@ -114,11 +110,10 @@ void } } -void -control(Tokenrow * trp) +void control(Tokenrow* trp) { -Nlist *np; -Token *tp; +Nlist* np; +Token* tp; tp = trp->tp; if (tp->type != NAME) @@ -127,7 +122,7 @@ void goto kline; if (tp->type != NL) error(ERROR, "Unidentifiable control line"); -return; /* else empty line */ +return; /* else empty line */ } np = lookup(tp, 0); if (np == NULL || ((np->flag & ISKW) == 0 && !skipping)) @@ -267,20 +262,19 @@ void trp->tp = tp + 1; expandrow(trp, ""); tp = trp->bp + 2; -kline: +kline: if (tp + 1 >= trp->lp || tp->type != NUMBER || tp + 3 < trp->lp -|| (tp + 3 == trp->lp -&& ((tp + 1)->type != STRING || *(tp + 1)->t == 'L'))) +|| (tp + 3 == trp->lp && ((tp + 1)->type != STRING || *(tp + 1)->t == 'L'))) { error(ERROR, "Syntax error in #line"); return; } -cursource->line = atol((char *) tp->t) - 1; +cursource->line = atol((char*)tp->t) - 1; if (cursource->line < 0 || cursource->line >= 32768) error(WARNING, "#line specifies number out of range"); tp = tp + 1; if (tp + 1 < trp->lp) -cursource->filename = (char *) newstring(tp->t + 1, tp->len - 2, 0); +cursource->filename = (char*)newstring(tp->t + 1, tp->len - 2, 0); return; case KDEFINED: @@ -314,30 +308,24 @@ void return; } -void * -domalloc(size_t size) +void* domalloc(size_t size) { -void *p = malloc(size); +void* p = malloc(size); if (p == NULL) error(FATAL, "Out of memory from malloc"); return p; } -void -dofree(void *p) -{ -free(p); -} +void dofree(void* p) { free(p); } -void -error(enum errtype type, char *string,...) +void error(enum errtype type, char* string, ...) { va_list ap; char c, *cp, *ep; -
[Libreoffice-commits] core.git: solenv/clang-format sot/source
solenv/clang-format/excludelist |1 - sot/source/base/object.cxx |5 + 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 2e4529c0016529325289701080499b3498a270f9 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:17:13 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 10:44:32 2020 +0100 tdf#123936 Formatting files in module sot with clang-format Change-Id: I2c375689049fcb65ca56cfcf5c5f61f8108c38bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105710 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 611a6d7aedc7..0256bb8c292c 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11836,7 +11836,6 @@ sot/qa/cppunit/test_sot.cxx sot/source/base/exchange.cxx sot/source/base/filelist.cxx sot/source/base/formats.cxx -sot/source/base/object.cxx sot/source/sdstor/stg.cxx sot/source/sdstor/stgavl.cxx sot/source/sdstor/stgavl.hxx diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 5c91afeccba9..98dd8ea064d6 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -61,9 +61,6 @@ bool SotObject::DoClose() return bRet; } -bool SotObject::Close() -{ -return true; -} +bool SotObject::Close() { return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/qa dbaccess/source shell/inc shell/qa shell/source solenv/clang-format
dbaccess/inc/strings.hxx | 37 +++ dbaccess/qa/extras/macros-test.cxx|6 - dbaccess/qa/unit/hsqldb.cxx |9 - dbaccess/source/core/dataaccess/SharedConnection.cxx | 69 ++ dbaccess/source/core/dataaccess/databaseregistrations.hxx |5 - dbaccess/source/core/dataaccess/myucp_datasupplier.hxx| 23 ++-- dbaccess/source/ui/app/AppIconControl.cxx | 22 +--- dbaccess/source/ui/app/AppSwapWindow.cxx | 24 ++-- dbaccess/source/ui/app/AppTitleWindow.cxx | 15 --- dbaccess/source/ui/app/templwin.hxx |3 dbaccess/source/ui/browser/AsynchronousLink.cxx | 32 +++--- dbaccess/source/ui/dlg/dsselect.hxx | 13 -- dbaccess/source/ui/inc/dbu_dlg.hxx|4 dbaccess/source/ui/inc/stringlistitem.hxx | 11 +- dbaccess/source/ui/misc/stringlistitem.cxx| 17 +-- dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx |3 dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 26 ++--- dbaccess/source/ui/querydesign/QueryTextView.cxx | 34 +- dbaccess/source/ui/querydesign/TableFieldInfo.cxx |9 - dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 68 +++-- dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 22 +--- dbaccess/source/ui/uno/admindlg.cxx | 33 +++--- shell/inc/filepath.hxx|2 shell/inc/global.hxx |2 shell/inc/iso8601_converter.hxx |2 shell/inc/metainforeader.hxx | 30 ++ shell/inc/shlxthdl.hxx| 16 +-- shell/inc/stream_helper.hxx | 22 ++-- shell/inc/types.hxx | 26 ++--- shell/inc/utilities.hxx | 30 ++ shell/inc/xml_parser.hxx | 15 +-- shell/inc/zipfile.hxx | 28 ++--- shell/qa/zip/testzipimpl.cxx | 16 +-- shell/qa/zip/testzipimpl.hxx |7 - shell/qa/zip/ziptest.cxx | 16 ++- shell/source/tools/lngconvex/cmdline.cxx | 19 +-- shell/source/tools/lngconvex/cmdline.hxx | 13 -- shell/source/win32/ooofilereader/keywordstag.cxx | 20 +--- shell/source/win32/zipfile/zipexcptn.hxx |6 - solenv/clang-format/excludelist | 39 --- 40 files changed, 325 insertions(+), 469 deletions(-) New commits: commit 7c9a2c4b97c145a358084bed4b875396d3dc3e5c Author: Philipp Hofer AuthorDate: Thu Nov 12 13:16:05 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 10:44:14 2020 +0100 tdf#123936 Formatting files in module shell with clang-format Change-Id: Iba0c34cff0e04b18a3b4c5b7bb2aa42e14aedb81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105707 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/shell/inc/filepath.hxx b/shell/inc/filepath.hxx index cc1d42a1ccef..7472ccf8252f 100644 --- a/shell/inc/filepath.hxx +++ b/shell/inc/filepath.hxx @@ -10,10 +10,8 @@ #ifndef INCLUDED_SHELL_INC_INTERNAL_FILEPATH_HXX #define INCLUDED_SHELL_INC_INTERNAL_FILEPATH_HXX - // typedefs to allow using Unicode paths on Windows - #include #if defined _WIN32 diff --git a/shell/inc/global.hxx b/shell/inc/global.hxx index 07b7d5f79e7d..fb812bcf8140 100644 --- a/shell/inc/global.hxx +++ b/shell/inc/global.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX #if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #endif #include diff --git a/shell/inc/iso8601_converter.hxx b/shell/inc/iso8601_converter.hxx index a8a0b4ed2ae2..daf2afd0b51a 100644 --- a/shell/inc/iso8601_converter.hxx +++ b/shell/inc/iso8601_converter.hxx @@ -22,7 +22,6 @@ #include - /* Converts ISO 8601 compliant date/time representation to the representation conforming to the current locale, @@ -30,7 +29,6 @@ */ std::wstring iso8601_date_to_local_date(const std::wstring& iso8601date); - /* Converts ISO 8601 compliant duration representation to the representation conforming to the current locale diff --git a/shell/inc/metainforeader.hxx b/shell/inc/metainforeader.hxx index 7ff0a734fc3f..6a4e82527e0f 100644 --- a/shell/inc/metainforeader.hxx +++ b/shell/inc/metainforeader.hxx @@ -35,9 +35,9 @@ class CMetaInfoReader : public CBaseReader public: virtual ~CMetaInfoReader() override; -CMetaInfoReader( const Filepath_t& DocumentName ); +CMetaInfoReader(const Fil
[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source solenv/clang-format
libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx | 10 +++ libreofficekit/qa/unit/compile_test.c|5 --- libreofficekit/source/gtk/tilebuffer.hxx | 21 +-- solenv/clang-format/excludelist |3 -- 4 files changed, 19 insertions(+), 20 deletions(-) New commits: commit 39821e7d24deffa72bd9254414d4b58f22be2fca Author: Philipp Hofer AuthorDate: Thu Nov 12 13:05:19 2020 +0100 Commit: Christian Lohmaier CommitDate: Thu Nov 19 10:43:43 2020 +0100 tdf#123936 Formatting files in module libreofficekit with clang-format Change-Id: I3f086de3a49181d32e54d7d58e1206615a9371e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105687 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx index bddf5c29e625..a441d4e13bf5 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx @@ -22,19 +22,19 @@ void createView(GtkWidget* pButton, gpointer /*pItem*/); void getRulerState(GtkWidget* pButton, gpointer /*pItem*/); -void recentUnoChanged( GtkWidget* pSelector, gpointer /* pItem */ ); +void recentUnoChanged(GtkWidget* pSelector, gpointer /* pItem */); void unoCommandDebugger(GtkWidget* pButton, gpointer /* pItem */); void toggleEditing(GtkWidget* pButton, gpointer /*pItem*/); -void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ ); +void changePartMode(GtkWidget* pSelector, gpointer /* pItem */); -void changePart( GtkWidget* pSelector, gpointer /*pItem*/ ); +void changePart(GtkWidget* pSelector, gpointer /*pItem*/); -void openLokDialog( GtkWidget* pSelector, gpointer /*pItem*/ ); +void openLokDialog(GtkWidget* pSelector, gpointer /*pItem*/); -void changeZoom( GtkWidget* pButton, gpointer /* pItem */ ); +void changeZoom(GtkWidget* pButton, gpointer /* pItem */); void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/); diff --git a/libreofficekit/qa/unit/compile_test.c b/libreofficekit/qa/unit/compile_test.c index bf0b1e5f1824..650718efaab2 100644 --- a/libreofficekit/qa/unit/compile_test.c +++ b/libreofficekit/qa/unit/compile_test.c @@ -15,9 +15,6 @@ #include "test.h" // just make sure this stuff compiles from a plain C file -LibreOfficeKit* compile_test(void) -{ -return lok_init("install/path"); -} +LibreOfficeKit* compile_test(void) { return lok_init("install/path"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx index 9e7203b3bd69..79fa48c555db 100644 --- a/libreofficekit/source/gtk/tilebuffer.hxx +++ b/libreofficekit/source/gtk/tilebuffer.hxx @@ -54,8 +54,12 @@ GQuark LOKTileBufferErrorQuark(void); */ class Tile { - public: -Tile() : valid(false), m_pBuffer(nullptr) {} +public: +Tile() +: valid(false) +, m_pBuffer(nullptr) +{ +} ~Tile() { if (m_pBuffer) @@ -75,7 +79,7 @@ class Tile private: /// Pixel buffer data for this tile -cairo_surface_t *m_pBuffer; +cairo_surface_t* m_pBuffer; }; /** @@ -87,11 +91,12 @@ private: */ class TileBuffer { - public: - TileBuffer(int columns = 0, int scale = 1) - : m_nWidth(columns) +public: +TileBuffer(int columns = 0, int scale = 1) +: m_nWidth(columns) { -cairo_surface_t *pSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, nTileSizePixels * scale); +cairo_surface_t* pSurface = cairo_image_surface_create( +CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, nTileSizePixels * scale); m_DummyTile.setSurface(pSurface); cairo_surface_destroy(pSurface); } @@ -118,7 +123,7 @@ class TileBuffer /* Takes ownership of the surface and sets it on a tile at a given location */ -void setTile(int x, int y, cairo_surface_t *surface); +void setTile(int x, int y, cairo_surface_t* surface); /// Returns true if a valid tile exists at this location bool hasValidTile(int x, int y); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ec3e954aacd4..c5a0601d11ba 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7282,13 +7282,10 @@ libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx -libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx libreofficekit/qa/tilebench/tilebench.cxx -libreofficekit/qa/unit/compile_test.c libreofficekit/qa/unit/tiledrendering.cxx libreofficekit/source/gtk/lokdocview.cxx libreofficekit/source/gtk/tilebuffer.cxx -libreofficekit/source/gtk
[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source solenv/clang-format
lotuswordpro/inc/localtime.hxx | 20 lotuswordpro/inc/lwpatomholder.hxx | 18 lotuswordpro/inc/lwpbasetype.hxx | 15 lotuswordpro/inc/lwpfilehdr.hxx| 14 lotuswordpro/inc/lwpfrib.hxx | 37 - lotuswordpro/inc/lwpglobalmgr.hxx | 16 lotuswordpro/inc/lwpobj.hxx| 15 lotuswordpro/inc/lwpobjstrm.hxx| 30 - lotuswordpro/inc/lwpsvstream.hxx | 20 lotuswordpro/inc/xfilter/ixfstream.hxx | 14 lotuswordpro/inc/xfilter/ixfstyle.hxx | 22 lotuswordpro/inc/xfilter/xfannotation.hxx | 32 - lotuswordpro/inc/xfilter/xfarrowstyle.hxx | 52 - lotuswordpro/inc/xfilter/xfbgimage.hxx | 32 - lotuswordpro/inc/xfilter/xfcellstyle.hxx | 33 - lotuswordpro/inc/xfilter/xfchange.hxx | 35 - lotuswordpro/inc/xfilter/xfcolstyle.hxx| 20 lotuswordpro/inc/xfilter/xfconfigmanager.hxx | 12 lotuswordpro/inc/xfilter/xfcontentcontainer.hxx| 20 lotuswordpro/inc/xfilter/xfcrossref.hxx| 18 lotuswordpro/inc/xfilter/xfdatestyle.hxx | 52 - lotuswordpro/inc/xfilter/xfdrawgroup.hxx | 21 lotuswordpro/inc/xfilter/xfdrawpath.hxx| 27 lotuswordpro/inc/xfilter/xfdrawpolyline.hxx| 10 lotuswordpro/inc/xfilter/xfdrawrect.hxx| 14 lotuswordpro/inc/xfilter/xfdrawstyle.hxx | 31 - lotuswordpro/inc/xfilter/xfentry.hxx | 37 - lotuswordpro/inc/xfilter/xffloatframe.hxx |9 lotuswordpro/inc/xfilter/xffontdecl.hxx| 10 lotuswordpro/inc/xfilter/xffooter.hxx | 12 lotuswordpro/inc/xfilter/xffooterstyle.hxx | 11 lotuswordpro/inc/xfilter/xffootnote.hxx| 36 - lotuswordpro/inc/xfilter/xfglobal.hxx | 40 - lotuswordpro/inc/xfilter/xfheader.hxx | 13 lotuswordpro/inc/xfilter/xfheaderstyle.hxx | 36 - lotuswordpro/inc/xfilter/xfhyperlink.hxx | 59 -- lotuswordpro/inc/xfilter/xfimagestyle.hxx | 30 - lotuswordpro/inc/xfilter/xflinebreak.hxx | 10 lotuswordpro/inc/xfilter/xflist.hxx| 22 lotuswordpro/inc/xfilter/xflistitem.hxx| 36 - lotuswordpro/inc/xfilter/xfmasterpage.hxx | 10 lotuswordpro/inc/xfilter/xfofficemeta.hxx | 22 lotuswordpro/inc/xfilter/xfpagecount.hxx | 10 lotuswordpro/inc/xfilter/xfpagenumber.hxx | 21 lotuswordpro/inc/xfilter/xfplaceholder.hxx | 53 - lotuswordpro/inc/xfilter/xfrowstyle.hxx| 22 lotuswordpro/inc/xfilter/xfruby.hxx| 40 - lotuswordpro/inc/xfilter/xfrubystyle.hxx | 31 - lotuswordpro/inc/xfilter/xfsectionstyle.hxx| 16 lotuswordpro/inc/xfilter/xfstyle.hxx | 24 lotuswordpro/inc/xfilter/xfstylecont.hxx | 27 lotuswordpro/inc/xfilter/xftablestyle.hxx | 32 - lotuswordpro/inc/xfilter/xftabstop.hxx | 10 lotuswordpro/inc/xfilter/xftextspan.hxx| 15 lotuswordpro/inc/xfilter/xftextstyle.hxx | 18 lotuswordpro/inc/xfilter/xfutil.hxx| 26 lotuswordpro/source/filter/benlist.cxx | 23 lotuswordpro/source/filter/benobj.cxx | 15 lotuswordpro/source/filter/explode.hxx | 37 - lotuswordpro/source/filter/first.hxx |6 lotuswordpro/source/filter/localtime.cxx | 32 - lotuswordpro/source/filter/lwp9reader.cxx | 58 +- lotuswordpro/source/filter/lwp9reader.hxx |8 lotuswordpro/source/filter/lwpatomholder.cxx | 18 lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 28 - lotuswordpro/source/filter/lwpbackgroundstuff.hxx | 12 lotuswordpro/source/filter/lwpbasetype.cxx | 14 lotuswordpro/source/filter/lwpbreaksoverride.cxx | 29 - lotuswordpro/source/filter/lwpbreaksoverride.hxx | 41 - lotuswordpro/source/filter/lwpcharacterstyle.cxx | 28 - lotuswordpro/source/filter/lwpcharborderoverride.hxx | 14 lotuswordpro/source/filter/lwpcharsetmgr.cxx | 53 - lotuswordpro/source/filter/lwpcontent.cxx | 15 lotuswordpro/source/filter/lwpdivinfo.cxx | 20 lotuswordpro/source/filter/lwpdivinfo.hxx | 21 lotuswordpro/source/filter/lwpdivopts.hxx | 10 lotuswordpro/source/filter/lwpdlvlist.cxx | 51 - lotuswordpro/source/filter/lwpdlvlist.h
[Libreoffice-commits] core.git: scaddins/source sc/inc sc/qa sc/source solenv/clang-format
sc/inc/bulkdatahint.hxx| 13 sc/inc/calcconfig.hxx | 24 - sc/inc/celltextattr.hxx|7 sc/inc/cellvalues.hxx | 53 +-- sc/inc/chartarr.hxx| 20 - sc/inc/clipoptions.hxx |5 sc/inc/columniterator.hxx | 10 sc/inc/columnset.hxx |7 sc/inc/datamapper.hxx | 10 sc/inc/datastreamgettime.hxx |8 sc/inc/documentstreamaccess.hxx| 15 sc/inc/dpfilteredcache.hxx | 35 +- sc/inc/dpresfilter.hxx | 24 - sc/inc/edittextiterator.hxx|7 sc/inc/formulaiter.hxx |5 sc/inc/generalfunction.hxx | 14 sc/inc/listenercontext.hxx | 27 - sc/inc/listenerquery.hxx | 21 - sc/inc/macromgr.hxx|8 sc/inc/mid.h |8 sc/inc/numformat.hxx |9 sc/inc/pageuno.hxx |6 sc/inc/reffind.hxx |8 sc/inc/refreshtimerprotector.hxx |4 sc/inc/scdllapi.h |4 sc/inc/scopetools.hxx | 25 - sc/inc/segmenttree.hxx | 49 +- sc/inc/stylehelper.hxx |4 sc/inc/tokenstringcontext.hxx | 21 - sc/inc/unitconv.hxx| 17 - sc/inc/userlist.hxx| 20 - sc/inc/zforauto.hxx| 12 sc/qa/extras/check_data_pilot_field.cxx| 61 +-- sc/qa/extras/recordchanges-test.cxx| 27 - sc/qa/extras/sccellrangesobj.cxx | 39 +- sc/qa/extras/scmodelobj.cxx| 25 - sc/qa/extras/scoutlineobj.cxx | 17 - sc/qa/extras/scsubtotalfieldobj.cxx| 29 - sc/qa/unit/dataproviders_test.cxx | 45 +- sc/qa/unit/test_ScChartListenerCollection.cxx | 38 +- sc/source/core/data/table5.cxx | 279 - sc/source/core/inc/arraysumfunctor.hxx | 13 sc/source/core/inc/cellkeytranslator.hxx | 12 sc/source/core/inc/doubleref.hxx | 19 - sc/source/core/inc/scrdata.hxx |7 sc/source/core/tool/addincfg.cxx | 19 - sc/source/core/tool/math.cxx | 27 - sc/source/core/tool/subtotal.cxx | 52 +-- sc/source/filter/excel/xltracer.cxx| 66 +--- sc/source/filter/inc/optab.h | 10 sc/source/filter/inc/qpro.hxx | 10 sc/source/filter/inc/qproform.hxx | 19 - sc/source/filter/inc/sharedformulagroups.hxx | 13 sc/source/filter/inc/xepivotxml.hxx| 25 - sc/source/filter/lotus/memory.cxx | 14 sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 10 sc/source/filter/xml/XMLEmptyContext.hxx |9 sc/source/filter/xml/XMLExportDatabaseRanges.hxx |7 sc/source/filter/xml/XMLTrackedChangesContext.hxx | 18 - sc/source/filter/xml/importcontext.hxx |5 sc/source/filter/xml/pivotsource.hxx | 29 - sc/source/filter/xml/xmlcvali.hxx |8 sc/source/ui/Accessibility/AccessibleDocumentBase.cxx |9 sc/source/ui/attrdlg/scuiexp.cxx | 19 - sc/source/ui/cctrl/cbnumberformat.cxx | 11 sc/source/ui/dataprovider/htmldataprovider.hxx |7 sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 18 - sc/source/ui/formdlg/formdata.cxx |9 sc/source/ui/inc/AccessibleDocumentBase.hxx|7 sc/source/ui/inc/IAnyRefDialog.hxx | 12 sc/source/ui/inc/PivotLayoutTreeListBase.hxx |7 sc/source/ui/inc/PivotLayoutTreeListLabel.hxx |3 sc/source/ui/inc/attrdlg.hxx |6 sc/source/ui/inc/chartsh.hxx |5 sc/source/ui/inc/condformatdlgitem.hxx | 18 - sc/source/ui/inc/dapitype.hxx | 10 sc/source/ui/inc/dataproviderdlg.hxx | 11 sc/sour
[Libreoffice-commits] core.git: solenv/clang-format sw/inc sw/qa sw/source
solenv/clang-format/excludelist| 202 -- sw/inc/HandleAnchorNodeChg.hxx | 10 sw/inc/IDocumentChartDataProviderAccess.hxx|9 sw/inc/IDocumentDeviceAccess.hxx | 21 - sw/inc/IDocumentDrawModelAccess.hxx| 10 sw/inc/IDocumentSettingAccess.hxx | 42 +- sw/inc/IDocumentState.hxx |4 sw/inc/IDocumentStatistics.hxx |7 sw/inc/IDocumentStylePoolAccess.hxx| 21 - sw/inc/IDocumentTimerAccess.hxx|2 sw/inc/IGrammarContact.hxx | 11 sw/inc/IShellCursorSupplier.hxx| 10 sw/inc/PageColumnPopup.hxx |5 sw/inc/PageMarginPopup.hxx |4 sw/inc/PageOrientationPopup.hxx|4 sw/inc/PageSizePopup.hxx |5 sw/inc/SidebarWindowsTypes.hxx | 10 sw/inc/SwCapObjType.hxx|5 sw/inc/SwDocIdle.hxx | 11 sw/inc/SwGetPoolIdFromName.hxx | 13 sw/inc/SwNodeNum.hxx | 30 - sw/inc/SwNumberTree.hxx| 85 +--- sw/inc/SwNumberTreeTypes.hxx |4 sw/inc/SwRewriter.hxx |4 sw/inc/SwSmartTagMgr.hxx |6 sw/inc/ToxWhitespaceStripper.hxx | 12 sw/inc/UndoParagraphSignature.hxx | 13 sw/inc/checkit.hxx |7 sw/inc/colwd.hxx |4 sw/inc/dbgoutsw.hxx| 58 +- sw/inc/dobjfac.hxx |2 sw/inc/docfac.hxx |4 sw/inc/docfunc.hxx | 50 +- sw/inc/drawdoc.hxx |4 sw/inc/flddropdown.hxx | 34 - sw/inc/hintids.hxx | 422 ++--- sw/inc/pausethreadstarting.hxx | 12 sw/inc/prtopt.hxx |6 sw/inc/sw_primitivetypes2d.hxx |8 sw/inc/swcli.hxx |6 sw/inc/swcommands.h|3 sw/inc/swddetbl.hxx| 12 sw/inc/swdll.hxx |9 sw/inc/swdllapi.h |4 sw/inc/toxe.hxx|2 sw/inc/unoprnms.hxx|3 sw/qa/core/test_ToxMiscTest.cxx|7 sw/qa/core/test_ToxWhitespaceStripper.cxx | 28 - sw/qa/extras/htmlexport/htmlexport.cxx | 113 +++-- sw/qa/extras/ooxmlexport/ooxmlencryption.cxx |5 sw/qa/extras/ooxmlexport/ooxmllinks.cxx| 11 sw/source/core/access/accheaderfooter.hxx | 22 - sw/source/core/attr/fmtfollowtextflow.cxx |2 sw/source/core/bastyp/SwSmartTagMgr.cxx| 24 - sw/source/core/bastyp/checkit.cxx |2 sw/source/core/bastyp/proofreadingiterator.cxx | 21 - sw/source/core/bastyp/swtypes.cxx | 14 sw/source/core/crsr/BlockCursor.cxx|9 sw/source/core/doc/swstylemanager.hxx |2 sw/source/core/docnode/cancellablejob.hxx |8 sw/source/core/docnode/ndsect.hxx |3 sw/source/core/docnode/pausethreadstarting.cxx |8 sw/source/core/docnode/swthreadjoiner.cxx | 17 sw/source/core/edit/edfldexp.cxx | 15 sw/source/core/inc/DocumentDeviceManager.hxx | 29 - sw/source/core/inc/DocumentDrawModelManager.hxx| 12 sw/source/core/inc/DocumentExternalDataManager.hxx | 10 sw/source/core/inc/DocumentStatisticsManager.hxx | 22 - sw/source/core/inc/DocumentTimerManager.hxx|8 sw/source/core/inc/SwGrammarMarkUp.hxx | 23 - sw/source/core/inc/SwUndoTOXChange.hxx |8 sw/source/core/inc/UndoBookmark.hxx| 49 +- sw/source/core/inc/UndoDraw.hxx| 43 +- sw/source/core/inc/colfrm.hxx |6 sw/source/core/inc/docedt.hxx |4 sw/source/core/inc/docredln.hxx|2 sw/source/core/inc/environmentofanchoredobject.hxx | 132 +++--- sw/source/core/inc/fefly.hxx |3 sw/source/core/inc/fieldhint.hxx |6 sw/source/core/inc/node2lay.hxx| 12 sw/source/core/inc/noteurl.hxx |2 sw/source/core/inc/paintfrm.hxx|7 sw/source/c
[Libreoffice-commits] core.git: o3tl/qa solenv/clang-format
o3tl/qa/test-lru_map.cxx| 59 ++-- o3tl/qa/test-safeint.cxx| 14 + solenv/clang-format/excludelist |2 - 3 files changed, 36 insertions(+), 39 deletions(-) New commits: commit 6d5ff94b994e7279cea3d54d9d546f4f1a8cdb4d Author: Philipp Hofer AuthorDate: Thu Nov 12 13:07:41 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:55:43 2020 +0100 tdf#123936 Formatting files in module o3tl with clang-format Change-Id: Ieb1229869cae8c14480243af98b270b9053fbde1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105691 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/o3tl/qa/test-lru_map.cxx b/o3tl/qa/test-lru_map.cxx index a03a6bf37200..ba9ee71835ce 100644 --- a/o3tl/qa/test-lru_map.cxx +++ b/o3tl/qa/test-lru_map.cxx @@ -103,7 +103,6 @@ void lru_map_test::testReplaceValue() CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size()); CPPUNIT_ASSERT_EQUAL(6, lru.find(1)->second); CPPUNIT_ASSERT_EQUAL(300, lru.find(3)->second); - } void lru_map_test::testReplaceKey() @@ -182,8 +181,8 @@ void lru_map_test::testLruRemoval() CPPUNIT_ASSERT_EQUAL(700, lru.find(7)->second); } -namespace { - +namespace +{ struct TestClassKey { int mA; @@ -192,13 +191,10 @@ struct TestClassKey TestClassKey(int a, int b) : mA(a) , mB(b) -{} - -bool operator==(TestClassKey const& aOther) const { -return mA == aOther.mA -&& mB == aOther.mB; } + +bool operator==(TestClassKey const& aOther) const { return mA == aOther.mA && mB == aOther.mB; } }; struct TestClassKeyHashFunction @@ -211,7 +207,6 @@ struct TestClassKeyHashFunction return seed; } }; - } void lru_map_test::testCustomHash() @@ -220,45 +215,47 @@ void lru_map_test::testCustomHash() o3tl::lru_map lru(2); CPPUNIT_ASSERT_EQUAL(size_t(0), lru.size()); -lru.insert(std::make_pair(TestClassKey(1,1), 2)); +lru.insert(std::make_pair(TestClassKey(1, 1), 2)); CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size()); -lru.insert(std::make_pair(TestClassKey(1,1), 7)); +lru.insert(std::make_pair(TestClassKey(1, 1), 7)); CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size()); -lru.insert(std::make_pair(TestClassKey(1,2), 9)); +lru.insert(std::make_pair(TestClassKey(1, 2), 9)); CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size()); -CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(0,0; // non existent -CPPUNIT_ASSERT_EQUAL(7, lru.find(TestClassKey(1,1))->second); -CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1,2))->second); +CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(0, 0; // non existent +CPPUNIT_ASSERT_EQUAL(7, lru.find(TestClassKey(1, 1))->second); +CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1, 2))->second); -lru.insert(std::make_pair(TestClassKey(2,1), 13)); +lru.insert(std::make_pair(TestClassKey(2, 1), 13)); CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size()); -CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(1,1; -CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1,2))->second); -CPPUNIT_ASSERT_EQUAL(13, lru.find(TestClassKey(2,1))->second); +CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(1, 1; +CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1, 2))->second); +CPPUNIT_ASSERT_EQUAL(13, lru.find(TestClassKey(2, 1))->second); } void lru_map_test::testRemoveIf() { typedef o3tl::lru_map IntMap; typedef IntMap::key_value_pair_t IntMapPair; -struct limit_except : public std::exception {}; +struct limit_except : public std::exception +{ +}; IntMap lru(6); int i = 0; for (; i < 8; i++) -lru.insert({i, i}); +lru.insert({ i, i }); CPPUNIT_ASSERT_EQUAL(size_t(6), lru.size()); // now contains 7..2 // remove everything < 4 from the back try { -lru.remove_if([] (IntMapPair const& rPair) { +lru.remove_if([](IntMapPair const& rPair) { if (rPair.first >= 4) throw limit_except(); return true; @@ -272,26 +269,26 @@ void lru_map_test::testRemoveIf() } // remove all even numbers -lru.remove_if([] (IntMapPair const& rPair) { return (0 == rPair.first % 2); }); +lru.remove_if([](IntMapPair const& rPair) { return (0 == rPair.first % 2); }); CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size()); // contains 7, 5 -lru.insert({5, 5}); +lru.insert({ 5, 5 }); // contains 5, 7 i = 5; -for (auto &rPair : lru) +for (auto& rPair : lru) { CPPUNIT_ASSERT_EQUAL(i, rPair.first); i += 2; } // remove the first item -lru.remove_if([] (IntMapPair const& rPair) { return (rPair.first == 5); }); +lru.remove_if([](IntMapPair const& rPair) { return (rPair.first == 5); }); CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size()); // remov
[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/plugins solenv/clang-format
jvmfwk/inc/elements.hxx | 69 +++ jvmfwk/inc/fwkbase.hxx | 13 +--- jvmfwk/inc/libxmlutil.hxx| 40 ++--- jvmfwk/inc/vendorbase.hxx| 40 + jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx | 13 +--- jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx |8 +- jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx |8 +- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 21 +++ jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx |2 solenv/clang-format/excludelist |9 --- 10 files changed, 98 insertions(+), 125 deletions(-) New commits: commit 856bdfb0585cea3c67eedfb535c6477d51e4c352 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:04:38 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:55:23 2020 +0100 tdf#123936 Formatting files in module jvmfwk with clang-format Change-Id: Ie643402fbf10ac837c975d29068b7973e9dd6210 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105685 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx index 58ad6044f300..3fde096c44a4 100644 --- a/jvmfwk/inc/elements.hxx +++ b/jvmfwk/inc/elements.hxx @@ -36,7 +36,6 @@ struct JavaInfo; namespace jfw { - /** gets the value of the updated element from the javavendors.xml. */ OString getElementUpdated(); @@ -47,9 +46,7 @@ OString getElementUpdated(); [out]If true then the respective structure of elements was added and the document needs to be saved. */ -void createSettingsStructure( -xmlDoc * document, bool * bNeedsSave); - +void createSettingsStructure(xmlDoc* document, bool* bNeedsSave); /** represents the settings saved in the /java/javaInfo element. It is used within class NodeJava which determines the settings @@ -91,12 +88,12 @@ public: If javaInfo@xsi:nil = true then member bNil is set to true and no further elements are read. */ -void loadFromNode(xmlDoc * pDoc,xmlNode * pJavaInfo); +void loadFromNode(xmlDoc* pDoc, xmlNode* pJavaInfo); /** The attribute nil will be set to false. The function gets the value javaSettings/updated from the javavendors.xml and writes it to javaInfo@vendorUpdate in javasettings.xml */ -void writeToNode(xmlDoc * pDoc, xmlNode * pJavaInfo) const; +void writeToNode(xmlDoc* pDoc, xmlNode* pJavaInfo) const; /** returns NULL if javaInfo is nil. */ @@ -116,9 +113,13 @@ public: class NodeJava { public: -enum Layer { USER, SHARED }; -private: +enum Layer +{ +USER, +SHARED +}; +private: /** creates settings file and fills it with default values. When this function is called then it creates the @@ -147,7 +148,7 @@ private: /** Verifies if the respective settings file exist. */ -static jfw::FileStatus checkSettingsFileStatus(OUString const & sURL); +static jfw::FileStatus checkSettingsFileStatus(OUString const& sURL); /** Determines the layer for which the instance the loads and writes the data. @@ -164,7 +165,7 @@ private: If /java/userClassPath@xsi:nil == true then the value is uninitialized after a call to load(). */ -std::optional< OUString> m_userClassPath; +std::optional m_userClassPath; /** User configurable option. /java/javaInfo If /java/javaInfo@xsi:nil == true then the value is uninitialized after a call to load. @@ -174,15 +175,14 @@ private: If /java/vmParameters@xsi:nil == true then the value is uninitialized after a call to load. */ -std::optional< ::std::vector< OUString> > m_vmParameters; +std::optional<::std::vector> m_vmParameters; /** User configurable option. /java/jreLocations If /java/jreLocations@xsi:nil == true then the value is uninitialized after a call to load. */ -std::optional< ::std::vector< OUString> > m_JRELocations; +std::optional<::std::vector> m_JRELocations; public: - explicit NodeJava(Layer theLayer); /** sets m_enabled. @@ -192,14 +192,14 @@ public: /** sets m_sUserClassPath. See setEnabled. */ -void setUserClassPath(const OUString & sClassPath); +void setUserClassPath(const OUString& sClassPath); /** sets m_aInfo. See setEnabled. @param bAutoSelect true- called by jfw_setSelectedJRE false called by jfw_findAndSelectJRE */ -void setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect); +void setJavaInfo(const JavaInfo* pInfo, bool bAutoSelect); /** sets the /java/vmParameters/param elements. When this method all previous values are removed and replaced @@ -207,12 +207,12 @@ public: /java/vmParameters@xsi:nil will be set to true when write() is called.
[Libreoffice-commits] core.git: solenv/clang-format unotest/source
solenv/clang-format/excludelist |5 - unotest/source/cpp/bootstrapfixturebase.cxx | 13 +++-- unotest/source/cpp/directories.cxx | 22 -- unotest/source/cpp/getargument.cxx |8 unotest/source/cpp/gettestargument.cxx |8 unotest/source/cpp/macros_test.cxx | 14 +- 6 files changed, 32 insertions(+), 38 deletions(-) New commits: commit afb92ffc62ba140ee1366ac5ecd526706e3d8a74 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:24:41 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:30:50 2020 +0100 tdf#123936 Formatting files in module unotest with clang-format Change-Id: Ic67aedc492e3382eeea92f5bda0b4e7ab7e2857c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105725 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d826e9d6eb13..aec80462806b 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15623,13 +15623,8 @@ unoidl/source/unoidl-write.cxx unoidl/source/unoidl.cxx unoidl/source/unoidlprovider.cxx unoidl/source/unoidlprovider.hxx -unotest/source/cpp/bootstrapfixturebase.cxx -unotest/source/cpp/directories.cxx unotest/source/cpp/filters-test.cxx -unotest/source/cpp/getargument.cxx unotest/source/cpp/getargument.hxx -unotest/source/cpp/gettestargument.cxx -unotest/source/cpp/macros_test.cxx unotest/source/cpp/officeconnection.cxx unotest/source/cpp/toabsolutefileurl.cxx unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 4b93b1d6de94..5c5b3bcc3a9c 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -19,13 +19,9 @@ using namespace ::com::sun::star; // test function in a rather non-intuitive way. This is why all the 'real' // heavy lifting is deferred until setUp. setUp and tearDown are interleaved // between the tests as you might expect. -test::BootstrapFixtureBase::BootstrapFixtureBase() -{ -} +test::BootstrapFixtureBase::BootstrapFixtureBase() {} -test::BootstrapFixtureBase::~BootstrapFixtureBase() -{ -} +test::BootstrapFixtureBase::~BootstrapFixtureBase() {} void test::BootstrapFixtureBase::setUp() { @@ -34,9 +30,6 @@ void test::BootstrapFixtureBase::setUp() m_xSFactory.set(m_xFactory, uno::UNO_QUERY_THROW); } -void test::BootstrapFixtureBase::tearDown() -{ -StarBASIC::DetachAllDocBasicItems(); -} +void test::BootstrapFixtureBase::tearDown() { StarBASIC::DetachAllDocBasicItems(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotest/source/cpp/directories.cxx b/unotest/source/cpp/directories.cxx index 6635fafa030f..54f106b212d6 100644 --- a/unotest/source/cpp/directories.cxx +++ b/unotest/source/cpp/directories.cxx @@ -13,31 +13,33 @@ #include #include -namespace { - -OUString getFileURLFromSystemPath(OUString const & path) { +namespace +{ +OUString getFileURLFromSystemPath(OUString const& path) +{ OUString url; osl::FileBase::RC e = osl::FileBase::getFileURLFromSystemPath(path, url); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e); -if (!url.endsWith("/")) { +if (!url.endsWith("/")) +{ url += "/"; } return url; } - } -test::Directories::Directories() { -const char* pSrcRoot = getenv( "SRC_ROOT" ); +test::Directories::Directories() +{ +const char* pSrcRoot = getenv("SRC_ROOT"); CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != nullptr); CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot[0] != 0); -const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" ); +const char* pWorkdirRoot = getenv("WORKDIR_FOR_BUILD"); CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != nullptr); CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot[0] != 0); -m_aSrcRootPath = OUString::createFromAscii( pSrcRoot ); +m_aSrcRootPath = OUString::createFromAscii(pSrcRoot); m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath); -m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot ); +m_aWorkdirRootPath = OUString::createFromAscii(pWorkdirRoot); m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath); } diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx index 007cc775b7d7..cb1df427758e 100644 --- a/unotest/source/cpp/getargument.cxx +++ b/unotest/source/cpp/getargument.cxx @@ -25,13 +25,13 @@ #include "getargument.hxx" -namespace test::detail { - -bool getArgument(OUString const & name, OUString * value) { +namespace test::detail +{ +bool getArgument(OUString const& name, OUString* value) +{ OSL_ASSERT(value != nullptr); return rt
[Libreoffice-commits] core.git: solenv/clang-format toolkit/inc toolkit/source
solenv/clang-format/excludelist|7 toolkit/inc/controls/geometrycontrolmodel_impl.hxx | 25 ++- toolkit/inc/helper/tkresmgr.hxx|3 - toolkit/source/awt/vclxwindow1.cxx | 35 ++--- toolkit/source/awt/vclxwindows_internal.hxx|4 +- toolkit/source/controls/svmedit.cxx| 11 +++--- toolkit/source/controls/tree/treecontrol.hxx | 17 +- toolkit/source/helper/tkresmgr.cxx | 17 +- 8 files changed, 54 insertions(+), 65 deletions(-) New commits: commit 0ce86801128b0955dd46aca5e5b5add4b719df0a Author: Philipp Hofer AuthorDate: Thu Nov 12 13:22:46 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:30:04 2020 +0100 tdf#123936 Formatting files in module toolkit with clang-format Change-Id: Ib4ee991a05335247d65343dfd3c3bcaf214a9e06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105720 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 0f2d277460db..d826e9d6eb13 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15153,7 +15153,6 @@ toolkit/inc/controls/eventcontainer.hxx toolkit/inc/controls/filectrl.hxx toolkit/inc/controls/formattedcontrol.hxx toolkit/inc/controls/geometrycontrolmodel.hxx -toolkit/inc/controls/geometrycontrolmodel_impl.hxx toolkit/inc/controls/roadmapcontrol.hxx toolkit/inc/controls/roadmapentry.hxx toolkit/inc/controls/stdtabcontroller.hxx @@ -15169,7 +15168,6 @@ toolkit/inc/helper/accessibilityclient.hxx toolkit/inc/helper/btndlg.hxx toolkit/inc/helper/imagealign.hxx toolkit/inc/helper/scrollabledialog.hxx -toolkit/inc/helper/tkresmgr.hxx toolkit/inc/helper/unopropertyarrayhelper.hxx toolkit/inc/helper/unowrapper.hxx toolkit/source/awt/animatedimagespeer.cxx @@ -15193,9 +15191,7 @@ toolkit/source/awt/vclxtabpagecontainer.cxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxtopwindow.cxx toolkit/source/awt/vclxwindow.cxx -toolkit/source/awt/vclxwindow1.cxx toolkit/source/awt/vclxwindows.cxx -toolkit/source/awt/vclxwindows_internal.hxx toolkit/source/controls/accessiblecontrolcontext.cxx toolkit/source/controls/animatedimages.cxx toolkit/source/controls/controlmodelcontainerbase.cxx @@ -15218,13 +15214,11 @@ toolkit/source/controls/roadmapentry.cxx toolkit/source/controls/spinningprogress.cxx toolkit/source/controls/stdtabcontroller.cxx toolkit/source/controls/stdtabcontrollermodel.cxx -toolkit/source/controls/svmedit.cxx toolkit/source/controls/tabpagecontainer.cxx toolkit/source/controls/tabpagemodel.cxx toolkit/source/controls/tkscrollbar.cxx toolkit/source/controls/tkspinbutton.cxx toolkit/source/controls/tree/treecontrol.cxx -toolkit/source/controls/tree/treecontrol.hxx toolkit/source/controls/tree/treecontrolpeer.cxx toolkit/source/controls/tree/treedatamodel.cxx toolkit/source/controls/unocontrol.cxx @@ -15239,7 +15233,6 @@ toolkit/source/helper/formpdfexport.cxx toolkit/source/helper/imagealign.cxx toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/property.cxx -toolkit/source/helper/tkresmgr.cxx toolkit/source/helper/unopropertyarrayhelper.cxx toolkit/source/helper/unowrapper.cxx toolkit/source/helper/vclunohelper.cxx diff --git a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx index f19e84327c22..37a3983f6888 100644 --- a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx +++ b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx @@ -19,33 +19,32 @@ // no include protection. This is included from within geometrycontrolmodel.hxx only - //= OGeometryControlModel - template -OGeometryControlModel::OGeometryControlModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) -:OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) ) +OGeometryControlModel::OGeometryControlModel( +const css::uno::Reference& i_factory) +: OGeometryControlModel_Base(new CONTROLMODEL(i_factory)) { } - template -OGeometryControlModel::OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) -:OGeometryControlModel_Base(_rxAggregateInstance) +OGeometryControlModel::OGeometryControlModel( +css::uno::Reference& _rxAggregateInstance) +: OGeometryControlModel_Base(_rxAggregateInstance) { } - template ::cppu::IPropertyArrayHelper& SAL_CALL OGeometryControlModel::getInfoHelper() { return *this->getArrayHelper(); } - template -void OGeometryControlModel::fillProperties(css::uno::Sequence< css::beans::Property >& _rProps, css::uno::Sequence< css::beans::Property >& _rAggregateProps) const +void OGeometryControlModel::fillProperties( +css::uno::Sequence& _rProps, +css::uno::Sequence& _rAggregateProps) const { // our own properties OPrope
[Libreoffice-commits] core.git: solenv/clang-format unoidl/source
solenv/clang-format/excludelist |2 -- unoidl/source/sourcefileprovider.hxx | 17 - unoidl/source/sourcetreeprovider.hxx | 18 +- 3 files changed, 17 insertions(+), 20 deletions(-) New commits: commit 49fbda99b4e563be54ee7c85560a5929f0627654 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:24:18 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:29:42 2020 +0100 tdf#123936 Formatting files in module unoidl with clang-format Change-Id: If315a05bcb237dc2922981c0d041b0c0b5d152d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d120c0cf86db..0f2d277460db 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15621,11 +15621,9 @@ unodevtools/source/unodevtools/options.cxx unoidl/source/legacyprovider.cxx unoidl/source/legacyprovider.hxx unoidl/source/sourcefileprovider.cxx -unoidl/source/sourcefileprovider.hxx unoidl/source/sourceprovider-parser-requires.hxx unoidl/source/sourceprovider-scanner.hxx unoidl/source/sourcetreeprovider.cxx -unoidl/source/sourcetreeprovider.hxx unoidl/source/unoidl-check.cxx unoidl/source/unoidl-read.cxx unoidl/source/unoidl-write.cxx diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx index 4229301ded50..2d986cc1f39d 100644 --- a/unoidl/source/sourcefileprovider.hxx +++ b/unoidl/source/sourcefileprovider.hxx @@ -16,26 +16,25 @@ #include #include -namespace unoidl::detail { - -class SourceFileProvider: public Provider { +namespace unoidl::detail +{ +class SourceFileProvider : public Provider +{ public: // throws FileFormatException, NoSuchFileException: -SourceFileProvider( -rtl::Reference const & manager, OUString const & uri); +SourceFileProvider(rtl::Reference const& manager, OUString const& uri); // throws FileFormatException: virtual rtl::Reference createRootCursor() const override; // throws FileFormatException: -virtual rtl::Reference findEntity(OUString const & name) const override; +virtual rtl::Reference findEntity(OUString const& name) const override; private: -virtual ~SourceFileProvider() throw () override; +virtual ~SourceFileProvider() throw() override; -std::map< OUString, rtl::Reference > rootMap_; +std::map> rootMap_; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx index ece737f5256e..e98ee7383fad 100644 --- a/unoidl/source/sourcetreeprovider.hxx +++ b/unoidl/source/sourcetreeprovider.hxx @@ -17,27 +17,27 @@ #include #include -namespace unoidl::detail { - -class SourceTreeProvider: public Provider { +namespace unoidl::detail +{ +class SourceTreeProvider : public Provider +{ public: // throws FileFormatException, NoSuchFileException: -SourceTreeProvider(Manager & manager, OUString const & uri); +SourceTreeProvider(Manager& manager, OUString const& uri); // throws FileFormatException: virtual rtl::Reference createRootCursor() const override; // throws FileFormatException: -virtual rtl::Reference findEntity(OUString const & name) const override; +virtual rtl::Reference findEntity(OUString const& name) const override; private: -virtual ~SourceTreeProvider() throw () override; +virtual ~SourceTreeProvider() throw() override; -Manager & manager_; +Manager& manager_; OUString uri_; -mutable std::map< OUString, rtl::Reference > cache_; //TODO: at manager +mutable std::map> cache_; //TODO: at manager }; - } #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/clang-format winaccessibility/inc winaccessibility/source
solenv/clang-format/excludelist | 29 winaccessibility/inc/AccComponentEventListener.hxx | 17 +- winaccessibility/inc/AccDialogEventListener.hxx |9 - winaccessibility/inc/AccEventListener.hxx | 15 +- winaccessibility/inc/AccFrameEventListener.hxx | 10 - winaccessibility/inc/AccListEventListener.hxx | 12 - winaccessibility/inc/AccMenuEventListener.hxx |9 - winaccessibility/inc/AccParagraphEventListener.hxx |9 - winaccessibility/inc/AccTableEventListener.hxx | 10 - winaccessibility/inc/AccTextComponentEventListener.hxx |7 - winaccessibility/inc/AccTopWindowListener.hxx | 27 ++- winaccessibility/inc/AccTreeEventListener.hxx |9 - winaccessibility/inc/AccWindowEventListener.hxx | 10 - winaccessibility/inc/ResIDGenerator.hxx | 12 - winaccessibility/inc/accHelper.hxx | 12 - winaccessibility/inc/unomsaaevent.hxx | 60 winaccessibility/source/UAccCOM/AccActionBase.h | 22 +-- winaccessibility/source/UAccCOM/AccComponent.cxx| 13 - winaccessibility/source/UAccCOM/AccComponentBase.cxx| 42 ++ winaccessibility/source/UAccCOM/AccComponentBase.h | 16 -- winaccessibility/source/UAccCOM/AccImage.cxx| 22 +-- winaccessibility/source/UAccCOM/AccTextBase.h | 44 +++--- winaccessibility/source/UAccCOM/AccValue.cxx| 60 winaccessibility/source/UAccCOM/AccessibleKeyStroke.h | 11 - winaccessibility/source/UAccCOM/UAccCOM.cxx | 22 +-- winaccessibility/source/UAccCOM/UNOXWrapper.cxx |8 - winaccessibility/source/UAccCOM/UNOXWrapper.h | 10 - winaccessibility/source/service/AccEventListener.cxx| 69 -- winaccessibility/source/service/AccObjectContainerEventListener.cxx | 11 - winaccessibility/source/service/ResIDGenerator.cxx |4 30 files changed, 267 insertions(+), 344 deletions(-) New commits: commit 65717f77c43ca7cbf91e4c158d643a02a181e439 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:27:36 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:29:18 2020 +0100 tdf#123936 Formatting files in module winaccessibility with clang-format Change-Id: I9d5b9697cb241b306d0614fb563feb5594c19887 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105729 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 3bebbdf749d8..d120c0cf86db 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -16953,42 +16953,22 @@ vcl/workben/ww6fuzzer.cxx vcl/workben/ww8fuzzer.cxx vcl/workben/xbmfuzzer.cxx vcl/workben/xpmfuzzer.cxx -winaccessibility/inc/AccComponentEventListener.hxx winaccessibility/inc/AccContainerEventListener.hxx winaccessibility/inc/AccDescendantManagerEventListener.hxx -winaccessibility/inc/AccDialogEventListener.hxx -winaccessibility/inc/AccEventListener.hxx -winaccessibility/inc/AccFrameEventListener.hxx -winaccessibility/inc/AccListEventListener.hxx -winaccessibility/inc/AccMenuEventListener.hxx winaccessibility/inc/AccObject.hxx winaccessibility/inc/AccObjectContainerEventListener.hxx winaccessibility/inc/AccObjectManagerAgent.hxx winaccessibility/inc/AccObjectWinManager.hxx -winaccessibility/inc/AccParagraphEventListener.hxx -winaccessibility/inc/AccTableEventListener.hxx -winaccessibility/inc/AccTextComponentEventListener.hxx -winaccessibility/inc/AccTopWindowListener.hxx -winaccessibility/inc/AccTreeEventListener.hxx -winaccessibility/inc/AccWindowEventListener.hxx -winaccessibility/inc/ResIDGenerator.hxx -winaccessibility/inc/accHelper.hxx -winaccessibility/inc/unomsaaevent.hxx winaccessibility/source/UAccCOM/AccAction.cxx winaccessibility/source/UAccCOM/AccAction.h winaccessibility/source/UAccCOM/AccActionBase.cxx -winaccessibility/source/UAccCOM/AccActionBase.h -winaccessibility/source/UAccCOM/AccComponent.cxx winaccessibility/source/UAccCOM/AccComponent.h -winaccessibility/source/UAccCOM/AccComponentBase.cxx -winaccessibility/source/UAccCOM/AccComponentBase.h winaccessibility/source/UAccCOM/AccEditableText.cxx winaccessibility/source/UAccCOM/AccEditableText.h winaccessibility/source/UAccCOM/AccHyperLink.cxx winaccessibility/source/UAccCOM/AccHyperLink.h winaccessibility/source/UAccCOM/AccHypertext.cxx winaccessibility/source/UAccCOM/AccHypertext.h -winaccessibility/source/UAccCOM/AccImage.cxx winaccess
[Libreoffice-commits] core.git: solenv/clang-format vbahelper/source
solenv/clang-format/excludelist |3 --- vbahelper/source/msforms/vbanewfont.hxx | 25 +++-- vbahelper/source/vbahelper/vbadialogbase.cxx | 12 ++-- vbahelper/source/vbahelper/vbadialogsbase.cxx |6 ++ 4 files changed, 19 insertions(+), 27 deletions(-) New commits: commit b9e9ac51a731a1b9515d935fd543218b2ee107c1 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:25:31 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:28:54 2020 +0100 tdf#123936 Formatting files in module vbahelper with clang-format Change-Id: Id058e96d2d3c78fa6efce41b0dbc39c69921ea99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105727 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index fa01006ff459..3bebbdf749d8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15831,7 +15831,6 @@ vbahelper/source/msforms/vbalistcontrolhelper.hxx vbahelper/source/msforms/vbamultipage.cxx vbahelper/source/msforms/vbamultipage.hxx vbahelper/source/msforms/vbanewfont.cxx -vbahelper/source/msforms/vbanewfont.hxx vbahelper/source/msforms/vbapages.cxx vbahelper/source/msforms/vbapages.hxx vbahelper/source/msforms/vbaprogressbar.cxx @@ -15863,8 +15862,6 @@ vbahelper/source/vbahelper/vbacommandbarhelper.cxx vbahelper/source/vbahelper/vbacommandbarhelper.hxx vbahelper/source/vbahelper/vbacommandbars.cxx vbahelper/source/vbahelper/vbacommandbars.hxx -vbahelper/source/vbahelper/vbadialogbase.cxx -vbahelper/source/vbahelper/vbadialogsbase.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbaeventshelperbase.cxx diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx index 6f00a2724bf6..fb928f9e0c50 100644 --- a/vbahelper/source/msforms/vbanewfont.hxx +++ b/vbahelper/source/msforms/vbanewfont.hxx @@ -24,37 +24,34 @@ #include #include - -class VbaNewFont : public cppu::WeakImplHelper< ov::msforms::XNewFont > +class VbaNewFont : public cppu::WeakImplHelper { public: /// @throws css::uno::RuntimeException -explicit VbaNewFont( -const css::uno::Reference< css::beans::XPropertySet >& rxModelProps ); +explicit VbaNewFont(const css::uno::Reference& rxModelProps); // XNewFont attributes virtual OUString SAL_CALL getName() override; -virtual void SAL_CALL setName( const OUString& rName ) override; +virtual void SAL_CALL setName(const OUString& rName) override; virtual double SAL_CALL getSize() override; -virtual void SAL_CALL setSize( double fSize ) override; +virtual void SAL_CALL setSize(double fSize) override; virtual sal_Int16 SAL_CALL getCharset() override; -virtual void SAL_CALL setCharset( sal_Int16 nCharset ) override; +virtual void SAL_CALL setCharset(sal_Int16 nCharset) override; virtual sal_Int16 SAL_CALL getWeight() override; -virtual void SAL_CALL setWeight( sal_Int16 nWeight ) override; +virtual void SAL_CALL setWeight(sal_Int16 nWeight) override; virtual sal_Bool SAL_CALL getBold() override; -virtual void SAL_CALL setBold( sal_Bool bBold ) override; +virtual void SAL_CALL setBold(sal_Bool bBold) override; virtual sal_Bool SAL_CALL getItalic() override; -virtual void SAL_CALL setItalic( sal_Bool bItalic ) override; +virtual void SAL_CALL setItalic(sal_Bool bItalic) override; virtual sal_Bool SAL_CALL getUnderline() override; -virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) override; +virtual void SAL_CALL setUnderline(sal_Bool bUnderline) override; virtual sal_Bool SAL_CALL getStrikethrough() override; -virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) override; +virtual void SAL_CALL setStrikethrough(sal_Bool bStrikethrough) override; private: -css::uno::Reference< css::beans::XPropertySet > mxProps; +css::uno::Reference mxProps; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index 6e5ae97857b1..a1aa0b053436 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -25,14 +25,14 @@ using namespace ::com::sun::star; void SAL_CALL VbaDialogBase::Show() { -if ( m_xModel.is() ) +if (m_xModel.is()) { -OUString aURL = mapIndexToName( mnIndex ); -if( aURL.isEmpty() ) -throw uno::RuntimeException( "Unable to open the specified dialog" ); +OUString aURL = mapIndexToName(mnIndex); +if (aURL.isEmpty()) +throw uno::RuntimeException("Unable to open the specified dialog"); -uno::Sequence< beans::PropertyValue > dispatchProps(0); -dispatchRequests( m_xModel, aURL, dis
[Libreoffice-commits] core.git: solenv/clang-format xmlscript/source
solenv/clang-format/excludelist |2 -- xmlscript/source/inc/xml_import.hxx | 10 ++ xmlscript/source/xmldlg_imexp/common.hxx | 14 ++ 3 files changed, 8 insertions(+), 18 deletions(-) New commits: commit 25e14502fdeac6c03dfed125d789b2822f488cfe Author: Philipp Hofer AuthorDate: Thu Nov 12 13:29:33 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:28:35 2020 +0100 tdf#123936 Formatting files in module xmlscript with clang-format Change-Id: Icf80c9d282d31c5513daf38c81802988e4fe300b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105733 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index b1ed3d35e339..fa01006ff459 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -17782,11 +17782,9 @@ xmlreader/source/pad.cxx xmlreader/source/span.cxx xmlreader/source/xmlreader.cxx xmlscript/source/inc/misc.hxx -xmlscript/source/inc/xml_import.hxx xmlscript/source/xml_helper/xml_byteseq.cxx xmlscript/source/xml_helper/xml_element.cxx xmlscript/source/xml_helper/xml_impctx.cxx -xmlscript/source/xmldlg_imexp/common.hxx xmlscript/source/xmldlg_imexp/exp_share.hxx xmlscript/source/xmldlg_imexp/imp_share.hxx xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index d4a2a4839890..913634738a47 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -23,8 +23,6 @@ namespace xmlscript { - - // IMPORTING /** Creates a document handler to be used for SAX1 parser that can handle @@ -39,12 +37,8 @@ namespace xmlscript @return document handler for parser */ -css::uno::Reference< css::xml::sax::XDocumentHandler > -createDocumentHandler( -css::uno::Reference< -css::xml::input::XRoot > const & xRoot ); - +css::uno::Reference +createDocumentHandler(css::uno::Reference const& xRoot); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx index ef2358f3c402..88b32b0a4889 100644 --- a/xmlscript/source/xmldlg_imexp/common.hxx +++ b/xmlscript/source/xmldlg_imexp/common.hxx @@ -21,8 +21,8 @@ #include -namespace xmlscript { - +namespace xmlscript +{ const sal_Int16 BORDER_NONE = 0; const sal_Int16 BORDER_3D = 1; const sal_Int16 BORDER_SIMPLE = 2; @@ -30,14 +30,12 @@ const sal_Int16 BORDER_SIMPLE_COLOR = 3; struct StringTriple { -char const * first; -char const * second; -char const * third; +char const* first; +char const* second; +char const* third; }; -extern StringTriple const * const g_pEventTranslations; - +extern StringTriple const* const g_pEventTranslations; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/clang-format xmlhelp/source
solenv/clang-format/excludelist |1 - xmlhelp/source/cxxhelp/test/abidebug.hxx |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit c4286f91f2d8dce8d42bad2dda85c13658d5e0b9 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:28:35 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:28:12 2020 +0100 tdf#123936 Formatting files in module xmlhelp with clang-format Change-Id: Iea20b06c8268ac67c1ae2a99fa27f5aab7ee95e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105731 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 671f9ebf6eed..b1ed3d35e339 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -17152,7 +17152,6 @@ xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx xmlhelp/source/cxxhelp/provider/urlparameter.cxx xmlhelp/source/cxxhelp/provider/urlparameter.hxx -xmlhelp/source/cxxhelp/test/abidebug.hxx xmlhelp/source/cxxhelp/test/searchdemo.cxx xmlhelp/source/treeview/tvfactory.cxx xmlhelp/source/treeview/tvread.cxx diff --git a/xmlhelp/source/cxxhelp/test/abidebug.hxx b/xmlhelp/source/cxxhelp/test/abidebug.hxx index e1a661c1032c..df42d7a3d32b 100644 --- a/xmlhelp/source/cxxhelp/test/abidebug.hxx +++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx @@ -23,7 +23,7 @@ #include #include -ostream& operator<<( ostream& out,const OUString& bla ); +ostream& operator<<(ostream& out, const OUString& bla); #endif // INCLUDED_XMLHELP_SOURCE_CXXHELP_TEST_ABIDEBUG_HXX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/clang-format ucb/source
solenv/clang-format/excludelist | 10 ucb/source/core/identify.cxx | 26 +++ ucb/source/core/identify.hxx |6 + ucb/source/ucp/ftp/ftpcfunc.hxx |7 +- ucb/source/ucp/ftp/ftpintreq.cxx | 26 ++- ucb/source/ucp/gio/gio_provider.hxx | 25 -- ucb/source/ucp/gio/gio_seekable.hxx | 16 ++ ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx | 18 +++ ucb/source/ucp/webdav-neon/LockEntrySequence.hxx |6 + ucb/source/ucp/webdav/DAVSessionFactory.hxx | 19 +++- ucb/source/ucp/webdav/webdavresponseparser.hxx | 11 + 11 files changed, 61 insertions(+), 109 deletions(-) New commits: commit b58f43e13902517dae5343913e584b7232cc2155 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:23:36 2020 +0100 Commit: Christian Lohmaier CommitDate: Wed Nov 18 12:27:52 2020 +0100 tdf#123936 Formatting files in module ucb with clang-format Change-Id: I645c81c1454d3eeea6083387f1d343985b4b6d96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105722 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 04317cf9cd4a..671f9ebf6eed 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15299,8 +15299,6 @@ ucb/source/cacher/dynamicresultsetwrapper.hxx ucb/source/core/FileAccess.cxx ucb/source/core/cmdenv.cxx ucb/source/core/cmdenv.hxx -ucb/source/core/identify.cxx -ucb/source/core/identify.hxx ucb/source/core/providermap.hxx ucb/source/core/provprox.cxx ucb/source/core/provprox.hxx @@ -15381,7 +15379,6 @@ ucb/source/ucp/file/filtask.hxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/prov.hxx ucb/source/ucp/ftp/ftpcfunc.cxx -ucb/source/ucp/ftp/ftpcfunc.hxx ucb/source/ucp/ftp/ftpcontainer.hxx ucb/source/ucp/ftp/ftpcontent.cxx ucb/source/ucp/ftp/ftpcontent.hxx @@ -15394,7 +15391,6 @@ ucb/source/ucp/ftp/ftpdirp.cxx ucb/source/ucp/ftp/ftpdirp.hxx ucb/source/ucp/ftp/ftpdynresultset.cxx ucb/source/ucp/ftp/ftpdynresultset.hxx -ucb/source/ucp/ftp/ftpintreq.cxx ucb/source/ucp/ftp/ftpintreq.hxx ucb/source/ucp/ftp/ftploaderthread.cxx ucb/source/ucp/ftp/ftploaderthread.hxx @@ -15416,11 +15412,9 @@ ucb/source/ucp/gio/gio_mount.hxx ucb/source/ucp/gio/gio_outputstream.cxx ucb/source/ucp/gio/gio_outputstream.hxx ucb/source/ucp/gio/gio_provider.cxx -ucb/source/ucp/gio/gio_provider.hxx ucb/source/ucp/gio/gio_resultset.cxx ucb/source/ucp/gio/gio_resultset.hxx ucb/source/ucp/gio/gio_seekable.cxx -ucb/source/ucp/gio/gio_seekable.hxx ucb/source/ucp/hierarchy/dynamicresultset.cxx ucb/source/ucp/hierarchy/dynamicresultset.hxx ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -15459,7 +15453,6 @@ ucb/source/ucp/tdoc/tdoc_docmgr.hxx ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx -ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx ucb/source/ucp/tdoc/tdoc_provider.cxx ucb/source/ucp/tdoc/tdoc_provider.hxx ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -15491,7 +15484,6 @@ ucb/source/ucp/webdav-neon/DateTimeHelper.hxx ucb/source/ucp/webdav-neon/LinkSequence.cxx ucb/source/ucp/webdav-neon/LinkSequence.hxx ucb/source/ucp/webdav-neon/LockEntrySequence.cxx -ucb/source/ucp/webdav-neon/LockEntrySequence.hxx ucb/source/ucp/webdav-neon/LockSequence.cxx ucb/source/ucp/webdav-neon/LockSequence.hxx ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -15536,7 +15528,6 @@ ucb/source/ucp/webdav/DAVResourceAccess.cxx ucb/source/ucp/webdav/DAVResourceAccess.hxx ucb/source/ucp/webdav/DAVSession.hxx ucb/source/ucp/webdav/DAVSessionFactory.cxx -ucb/source/ucp/webdav/DAVSessionFactory.hxx ucb/source/ucp/webdav/DAVTypes.hxx ucb/source/ucp/webdav/DateTimeHelper.cxx ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -15589,7 +15580,6 @@ ucb/source/ucp/webdav/webdavdatasupplier.hxx ucb/source/ucp/webdav/webdavprovider.cxx ucb/source/ucp/webdav/webdavprovider.hxx ucb/source/ucp/webdav/webdavresponseparser.cxx -ucb/source/ucp/webdav/webdavresponseparser.hxx ucb/source/ucp/webdav/webdavresultset.cxx ucb/source/ucp/webdav/webdavresultset.hxx ucb/source/ucp/webdav/webdavservices.cxx diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index 912163080154..41f5db735afa 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** TODO ** @@ -30,39 +29,30 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using name
[Libreoffice-commits] core.git: solenv/clang-format ucbhelper/source
solenv/clang-format/excludelist|3 --- ucbhelper/source/client/activedatasink.cxx |9 ++--- ucbhelper/source/client/activedatastreamer.cxx |8 ++-- ucbhelper/source/client/activedatastreamer.hxx | 11 --- 4 files changed, 8 insertions(+), 23 deletions(-) New commits: commit 8e7f1188899023de3be07c99f146196b39dfd584 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:23:57 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed Nov 18 12:14:56 2020 +0100 tdf#123936 Formatting files in module ucbhelper with clang-format Change-Id: Ic18cb095646f060046f83663f7b369533ffb481a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105723 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ce665e06989d..04317cf9cd4a 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15593,9 +15593,6 @@ ucb/source/ucp/webdav/webdavresponseparser.hxx ucb/source/ucp/webdav/webdavresultset.cxx ucb/source/ucp/webdav/webdavresultset.hxx ucb/source/ucp/webdav/webdavservices.cxx -ucbhelper/source/client/activedatasink.cxx -ucbhelper/source/client/activedatastreamer.cxx -ucbhelper/source/client/activedatastreamer.hxx ucbhelper/source/client/commandenvironment.cxx ucbhelper/source/client/content.cxx ucbhelper/source/client/interceptedinteraction.cxx diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx index bf92699de69b..fdbcbdccb977 100644 --- a/ucbhelper/source/client/activedatasink.cxx +++ b/ucbhelper/source/client/activedatasink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** TODO ** @@ -33,17 +32,13 @@ namespace ucbhelper // XActiveDataSink methods. // virtual -void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream ) +void SAL_CALL ActiveDataSink::setInputStream(const uno::Reference& aStream) { m_xStream = aStream; } - // virtual -uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() -{ -return m_xStream; -} +uno::Reference SAL_CALL ActiveDataSink::getInputStream() { return m_xStream; } } // namespace ucbhelper diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index aab9cef0df29..8438cae49f53 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** TODO ** @@ -34,16 +33,13 @@ namespace ucbhelper // XActiveDataStreamer methods. // virtual -void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >& xStream ) +void SAL_CALL ActiveDataStreamer::setStream(const uno::Reference& xStream) { m_xStream = xStream; } // virtual -uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream() -{ -return m_xStream; -} +uno::Reference SAL_CALL ActiveDataStreamer::getStream() { return m_xStream; } } // namespace ucbhelper diff --git a/ucbhelper/source/client/activedatastreamer.hxx b/ucbhelper/source/client/activedatastreamer.hxx index ae4f53736913..84ee10ac96df 100644 --- a/ucbhelper/source/client/activedatastreamer.hxx +++ b/ucbhelper/source/client/activedatastreamer.hxx @@ -25,23 +25,20 @@ namespace ucbhelper { - - /** * This class implements the interface css::io::XActiveDataStreamer. * Instances of this class can be passed with the parameters of an * "open" command. */ -class ActiveDataStreamer final : -public cppu::WeakImplHelper< css::io::XActiveDataStreamer > +class ActiveDataStreamer final : public cppu::WeakImplHelper { -css::uno::Reference< css::io::XStream > m_xStream; +css::uno::Reference m_xStream; public: // XActiveDataStreamer methods. -virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream ) override; -virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream() override; +virtual void SAL_CALL setStream(const css::uno::Reference& xStream) override; +virtual css::uno::Reference SAL_CALL getStream() override; }; } /* namespace ucbhelper */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/clang-format tools/qa tools/source
solenv/clang-format/excludelist|7 -- tools/qa/cppunit/test_date.cxx | 72 ++--- tools/qa/cppunit/test_pathutils.cxx| 25 +++ tools/qa/cppunit/test_rectangle.cxx|9 -- tools/source/generic/svborder.cxx | 14 ++-- tools/source/misc/cpuid.cxx| 31 - tools/source/misc/extendapplicationenvironment.cxx | 24 --- tools/source/ref/ref.cxx |6 - 8 files changed, 89 insertions(+), 99 deletions(-) New commits: commit 1582d9a2c5ef9f28bc97a74e25c3948a7611fac1 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:23:10 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed Nov 18 12:04:58 2020 +0100 tdf#123936 Formatting files in module tools with clang-format Change-Id: I0f66d02e67388cc4d21c5e96bf84b6848e8de63a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105721 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 872142284d0e..ce665e06989d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15245,11 +15245,8 @@ toolkit/source/helper/unowrapper.cxx toolkit/source/helper/vclunohelper.cxx tools/inc/poly.h tools/qa/cppunit/test_color.cxx -tools/qa/cppunit/test_date.cxx tools/qa/cppunit/test_fract.cxx tools/qa/cppunit/test_inetmime.cxx -tools/qa/cppunit/test_pathutils.cxx -tools/qa/cppunit/test_rectangle.cxx tools/qa/cppunit/test_reversemap.cxx tools/qa/cppunit/test_stream.cxx tools/qa/cppunit/test_urlobj.cxx @@ -15270,16 +15267,12 @@ tools/source/generic/line.cxx tools/source/generic/point.cxx tools/source/generic/poly.cxx tools/source/generic/poly2.cxx -tools/source/generic/svborder.cxx tools/source/inet/inetmime.cxx tools/source/inet/inetmsg.cxx tools/source/inet/inetstrm.cxx tools/source/memtools/multisel.cxx -tools/source/misc/cpuid.cxx -tools/source/misc/extendapplicationenvironment.cxx tools/source/misc/pathutils.cxx tools/source/ref/globname.cxx -tools/source/ref/ref.cxx tools/source/reversemap/bestreversemap.cxx tools/source/stream/stream.cxx tools/source/stream/strmunx.cxx diff --git a/tools/qa/cppunit/test_date.cxx b/tools/qa/cppunit/test_date.cxx index ca6c39d84109..9a243cce504c 100644 --- a/tools/qa/cppunit/test_date.cxx +++ b/tools/qa/cppunit/test_date.cxx @@ -14,7 +14,6 @@ namespace tools { - class DateTest : public CppUnit::TestFixture { public: @@ -43,45 +42,45 @@ public: void DateTest::testDate() { -const Date aCE(1,1,1); // first day CE -const Date aBCE(31,12,-1); // last day BCE -const Date aMin(1,1,-32768);// minimum date -const Date aMax(31,12,32767); // maximum date +const Date aCE(1, 1, 1); // first day CE +const Date aBCE(31, 12, -1); // last day BCE +const Date aMin(1, 1, -32768); // minimum date +const Date aMax(31, 12, 32767); // maximum date Date aDate(Date::EMPTY); const sal_Int32 kMinDays = -11968265; -const sal_Int32 kMaxDays = 11967900; +const sal_Int32 kMaxDays = 11967900; // Last day BCE to first day CE is 1 day difference. -CPPUNIT_ASSERT_EQUAL( static_cast(1), aCE - aBCE); -CPPUNIT_ASSERT_EQUAL( static_cast(-1), aBCE - aCE); +CPPUNIT_ASSERT_EQUAL(static_cast(1), aCE - aBCE); +CPPUNIT_ASSERT_EQUAL(static_cast(-1), aBCE - aCE); aDate = aBCE; aDate.AddDays(1); -CPPUNIT_ASSERT_EQUAL( aCE.GetDate(), aDate.GetDate()); +CPPUNIT_ASSERT_EQUAL(aCE.GetDate(), aDate.GetDate()); aDate = aCE; aDate.AddDays(-1); -CPPUNIT_ASSERT_EQUAL( aBCE.GetDate(), aDate.GetDate()); +CPPUNIT_ASSERT_EQUAL(aBCE.GetDate(), aDate.GetDate()); // The entire BCE and CE ranges cover that many days. Day 0 is -0001-12-31 -CPPUNIT_ASSERT_EQUAL( kMaxDays, aMax - aBCE); -CPPUNIT_ASSERT_EQUAL( kMinDays, aMin - aBCE); +CPPUNIT_ASSERT_EQUAL(kMaxDays, aMax - aBCE); +CPPUNIT_ASSERT_EQUAL(kMinDays, aMin - aBCE); // Truncate at limits, not under-/overflow or wrap. aDate = aMin; aDate.AddDays(-1); -CPPUNIT_ASSERT_EQUAL( aMin.GetDate(), aDate.GetDate()); +CPPUNIT_ASSERT_EQUAL(aMin.GetDate(), aDate.GetDate()); aDate = aMax; aDate.AddDays(1); -CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDate.GetDate()); +CPPUNIT_ASSERT_EQUAL(aMax.GetDate(), aDate.GetDate()); aDate = aBCE; -aDate.AddDays(kMinDays-10); -CPPUNIT_ASSERT_EQUAL( aMin.GetDate(), aDate.GetDate()); +aDate.AddDays(kMinDays - 10); +CPPUNIT_ASSERT_EQUAL(aMin.GetDate(), aDate.GetDate()); aDate = aBCE; -aDate.AddDays(kMaxDays+10); -CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDate.GetDate()); +aDate.AddDays(kMaxDays + 10); +CPPUNIT_ASSERT_EQUAL(aMax.GetDate(), aDate.GetDate()); aDate = aMax; aDate.SetDay(32); aDate.Normalize(); -CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDat
[Libreoffice-commits] core.git: solenv/clang-format test/source
solenv/clang-format/excludelist| 20 test/source/container/xnamed.cxx |8 +-- test/source/setupvcl.hxx |5 -- test/source/sheet/cellproperties.cxx |9 +-- test/source/sheet/databaserange.cxx| 45 +- test/source/sheet/datapilotitem.cxx| 10 +--- test/source/sheet/xcelladdressable.cxx |7 +- test/source/sheet/xcellrangereferrer.cxx | 10 ++-- test/source/sheet/xdatabaserange.cxx | 71 + test/source/sheet/xdatapilottable.cxx | 18 ++- test/source/sheet/xgoalseek.cxx| 13 ++--- test/source/sheet/xsheetoperation.cxx | 15 ++ test/source/sheet/xspreadsheetdocument.cxx | 13 ++--- test/source/sheet/xsubtotaldescriptor.cxx | 11 ++-- test/source/sheet/xviewfreezable.cxx |9 +-- test/source/sheet/xviewpane.cxx| 11 ++-- test/source/text/xtext.cxx |5 -- test/source/text/xtextcontent.cxx | 15 ++ test/source/unoapi_test.cxx|9 ++- test/source/util/xreplaceable.cxx | 25 +- test/source/util/xsearchable.cxx | 29 +-- 21 files changed, 158 insertions(+), 200 deletions(-) New commits: commit f5e3b2e83ab463064f100a9cd93f09cadaae2292 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:22:23 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed Nov 18 12:04:26 2020 +0100 tdf#123936 Formatting files in module test with clang-format Change-Id: I8b2cc4917564626432ce0219e24f253a534ce8e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105719 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 540f8de33912..872142284d0e 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15092,30 +15092,20 @@ sw/source/uibase/wrtsh/wrtsh4.cxx sw/source/uibase/wrtsh/wrtundo.cxx test/source/bootstrapfixture.cxx test/source/calc_unoapi_test.cxx -test/source/container/xnamed.cxx test/source/diff/diff.cxx test/source/htmltesttools.cxx test/source/isheadless.hxx test/source/screenshot_test.cxx test/source/setupvcl.cxx -test/source/setupvcl.hxx -test/source/sheet/cellproperties.cxx -test/source/sheet/databaserange.cxx test/source/sheet/datapilotfield.cxx -test/source/sheet/datapilotitem.cxx test/source/sheet/xarealink.cxx test/source/sheet/xarealinks.cxx -test/source/sheet/xcelladdressable.cxx test/source/sheet/xcellrangedata.cxx -test/source/sheet/xcellrangereferrer.cxx test/source/sheet/xcellrangesquery.cxx test/source/sheet/xcellseries.cxx -test/source/sheet/xdatabaserange.cxx test/source/sheet/xdatapilotdescriptor.cxx test/source/sheet/xdatapilotfieldgrouping.cxx -test/source/sheet/xdatapilottable.cxx test/source/sheet/xdatapilottable2.cxx -test/source/sheet/xgoalseek.cxx test/source/sheet/xnamedrange.cxx test/source/sheet/xprintareas.cxx test/source/sheet/xsheetannotation.cxx @@ -15123,26 +15113,16 @@ test/source/sheet/xsheetannotations.cxx test/source/sheet/xsheetannotationshapesupplier.cxx test/source/sheet/xsheetfilterable.cxx test/source/sheet/xsheetlinkable.cxx -test/source/sheet/xsheetoperation.cxx test/source/sheet/xsheetoutline.cxx test/source/sheet/xsheetpagebreak.cxx test/source/sheet/xspreadsheet.cxx -test/source/sheet/xspreadsheetdocument.cxx test/source/sheet/xspreadsheets.cxx test/source/sheet/xspreadsheets2.cxx test/source/sheet/xsubtotalcalculatable.cxx -test/source/sheet/xsubtotaldescriptor.cxx test/source/sheet/xsubtotalfield.cxx test/source/sheet/xuniquecellformatrangessupplier.cxx test/source/sheet/xusedareacursor.cxx -test/source/sheet/xviewfreezable.cxx -test/source/sheet/xviewpane.cxx test/source/sheet/xviewsplitable.cxx -test/source/text/xtext.cxx -test/source/text/xtextcontent.cxx -test/source/unoapi_test.cxx -test/source/util/xreplaceable.cxx -test/source/util/xsearchable.cxx test/source/vclbootstrapprotector.cxx test/source/xmltesttools.cxx testtools/source/bridgetest/bridgetest.cxx diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx index 799011f41ebd..000a9f62e094 100644 --- a/test/source/container/xnamed.cxx +++ b/test/source/container/xnamed.cxx @@ -20,17 +20,17 @@ using namespace css; using namespace css::uno; -namespace apitest { - +namespace apitest +{ void XNamed::testGetName() { -uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); +uno::Reference xNamed(init(), UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName()); } void XNamed::testSetName() { -uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); +uno::Reference xNamed(init(), UNO_QUERY_THROW); OUString aTestName("NewName"); xNamed->setName(aTestName); diff --git a/test/source/setupvcl.hxx b/test/source/setupvcl.hxx index 78d4683e50ce..5da3b19
[Libreoffice-commits] core.git: apple_remote/source solenv/clang-format
apple_remote/source/AppleRemote.h |3 +- apple_remote/source/GlobalKeyboardDevice.h | 16 ++-- apple_remote/source/HIDRemoteControlDevice.h | 21 apple_remote/source/KeyspanFrontRowControl.h |4 +-- apple_remote/source/MultiClickRemoteBehavior.h | 32 + apple_remote/source/RemoteControlContainer.h |7 +++-- solenv/clang-format/excludelist|6 7 files changed, 44 insertions(+), 45 deletions(-) New commits: commit 03e79e8ab515e061fbfc435e6660e1f57b4f460d Author: Philipp Hofer AuthorDate: Mon Nov 9 18:55:36 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 16 12:29:44 2020 +0100 tdf#123936 Formatting files in module apple_remote with clang-format Change-Id: Ifd469bf8348c3f35222a2cfae13c66bc444ec1b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105489 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/apple_remote/source/AppleRemote.h b/apple_remote/source/AppleRemote.h index f80431bfacbf..a4d6337a641b 100644 --- a/apple_remote/source/AppleRemote.h +++ b/apple_remote/source/AppleRemote.h @@ -36,7 +36,8 @@ /* Interacts with the Apple Remote Control HID device The class is not thread safe */ -@interface AppleRemote : HIDRemoteControlDevice { +@interface AppleRemote : HIDRemoteControlDevice +{ } @end diff --git a/apple_remote/source/GlobalKeyboardDevice.h b/apple_remote/source/GlobalKeyboardDevice.h index 752b1eecf8c2..97f3eec7ebcb 100644 --- a/apple_remote/source/GlobalKeyboardDevice.h +++ b/apple_remote/source/GlobalKeyboardDevice.h @@ -33,23 +33,23 @@ #import - /* This class registers for a number of global keyboard shortcuts to simulate a remote control */ -@interface GlobalKeyboardDevice : RemoteControl { - +@interface GlobalKeyboardDevice : RemoteControl +{ NSMutableDictionary* hotKeyRemoteEventMapping; EventHandlerRef eventHandlerRef; - } -- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers; - -- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier; - +- (void)mapRemoteButton:(RemoteControlEventIdentifier)remoteButtonIdentifier + defaultKeycode:(unsigned int)defaultKeycode + defaultModifiers:(unsigned int)defaultModifiers; +- (BOOL)registerHotKeyCode:(unsigned int)keycode + modifiers:(unsigned int)modifiers + remoteEventIdentifier:(RemoteControlEventIdentifier)identifier; @end diff --git a/apple_remote/source/HIDRemoteControlDevice.h b/apple_remote/source/HIDRemoteControlDevice.h index 3f56870579c7..cf81fac85612 100644 --- a/apple_remote/source/HIDRemoteControlDevice.h +++ b/apple_remote/source/HIDRemoteControlDevice.h @@ -36,12 +36,13 @@ /* Base class for HID based remote control devices */ -@interface HIDRemoteControlDevice : RemoteControl { +@interface HIDRemoteControlDevice : RemoteControl +{ IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h -IOHIDQueueInterface** queue; // IOKit/hid/IOHIDLib.h -NSMutableArray*allCookies; -NSMutableDictionary* cookieToButtonMapping; -CFRunLoopSourceRef eventSource; +IOHIDQueueInterface** queue; // IOKit/hid/IOHIDLib.h +NSMutableArray* allCookies; +NSMutableDictionary* cookieToButtonMapping; +CFRunLoopSourceRef eventSource; BOOL fixSecureEventInputBug; BOOL openInExclusiveMode; @@ -54,15 +55,15 @@ // may already be received which are put on a backlog. As soon as your main thread // has some spare time this backlog is processed and may flood your delegate with calls. // Backlog processing is turned off by default. -- (BOOL) processesBacklog; -- (void) setProcessesBacklog: (BOOL) value; +- (BOOL)processesBacklog; +- (void)setProcessesBacklog:(BOOL)value; // methods that should be overwritten by subclasses -- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping; +- (void)setCookieMappingInDictionary:(NSMutableDictionary*)cookieToButtonMapping; -- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown; +- (void)sendRemoteButtonEvent:(RemoteControlEventIdentifier)event pressedDown:(BOOL)pressedDown; -+ (BOOL) isRemoteAvailable; ++ (BOOL)isRemoteAvailable; @end diff --git a/apple_remote/source/KeyspanFrontRowControl.h b/apple_remote/source/KeyspanFrontRowControl.h index c75e86b08629..e7f8971fb47d 100644 --- a/apple_remote/source/KeyspanFrontRowControl.h +++ b/apple_remote/source/KeyspanFrontRowControl.h @@ -36,8 +36,8 @@ /* Interacts with the Keyspan FrontRow Remote Control HID device The class is not thread safe */ -@interface KeyspanFrontRowControl : HIDRemoteControlDevice { - +@interface KeyspanFrontRo
[Libreoffice-commits] core.git: solenv/clang-format svtools/qa svtools/source
solenv/clang-format/excludelist |6 -- svtools/qa/unit/GraphicObjectTest.cxx|9 +++-- svtools/qa/unit/svtools-dialogs-test.cxx |4 +--- svtools/qa/unit/testHtmlWriter.cxx |4 +--- svtools/source/control/collatorres.cxx |3 +-- svtools/source/inc/unoiface.hxx |7 +++ svtools/source/misc/svtresid.cxx | 10 ++ 7 files changed, 11 insertions(+), 32 deletions(-) New commits: commit cb0630df7f32232bb3c51c464c28dcc66cdf7729 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:19:10 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 16 12:25:56 2020 +0100 tdf#123936 Formatting files in module svtools with clang-format Change-Id: I56a49c7fec128eb47818ee664acf01434d24f88d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105715 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d4ff0c061160..a8d77900a676 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12520,9 +12520,6 @@ svtools/inc/table/tablerenderer.hxx svtools/inc/table/tablesort.hxx svtools/inc/table/tabletypes.hxx svtools/langsupport/langsupport.cxx -svtools/qa/unit/GraphicObjectTest.cxx -svtools/qa/unit/svtools-dialogs-test.cxx -svtools/qa/unit/testHtmlWriter.cxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/brwbox3.cxx @@ -12552,7 +12549,6 @@ svtools/source/config/test/test.cxx svtools/source/control/accessibleruler.cxx svtools/source/control/accessibleruler.hxx svtools/source/control/asynclink.cxx -svtools/source/control/collatorres.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/indexentryres.cxx @@ -12584,7 +12580,6 @@ svtools/source/hatchwindow/hatchwindowfactory.cxx svtools/source/hatchwindow/ipwin.cxx svtools/source/hatchwindow/ipwin.hxx svtools/source/inc/hatchwindow.hxx -svtools/source/inc/unoiface.hxx svtools/source/java/javacontext.cxx svtools/source/java/javainteractionhandler.cxx svtools/source/misc/acceleratorexecute.cxx @@ -12602,7 +12597,6 @@ svtools/source/misc/langtab.cxx svtools/source/misc/openfiledroptargetlistener.cxx svtools/source/misc/sampletext.cxx svtools/source/misc/stringtransfer.cxx -svtools/source/misc/svtresid.cxx svtools/source/misc/templatefoldercache.cxx svtools/source/misc/unitconv.cxx svtools/source/svhtml/HtmlWriter.cxx diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 849dea550606..766baea6b1cb 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -21,10 +21,8 @@ using namespace css; namespace { - -class GraphicObjectTest: public test::BootstrapFixture, public unotest::MacrosTest +class GraphicObjectTest : public test::BootstrapFixture, public unotest::MacrosTest { - public: void testTdf88836(); @@ -32,7 +30,8 @@ public: { test::BootstrapFixture::setUp(); - mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(; +mxDesktop.set( + css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(; } private: @@ -41,7 +40,6 @@ private: CPPUNIT_TEST_SUITE_END(); }; - void GraphicObjectTest::testTdf88836() { // Construction with empty bitmap -> type should be GraphicType::NONE @@ -52,7 +50,6 @@ void GraphicObjectTest::testTdf88836() } CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx b/svtools/qa/unit/svtools-dialogs-test.cxx index be79168bb051..2dc921a7bb8e 100644 --- a/svtools/qa/unit/svtools-dialogs-test.cxx +++ b/svtools/qa/unit/svtools-dialogs-test.cxx @@ -39,9 +39,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -SvtoolsDialogsTest::SvtoolsDialogsTest() -{ -} +SvtoolsDialogsTest::SvtoolsDialogsTest() {} void SvtoolsDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx index 773da64c4891..a041c24b8567 100644 --- a/svtools/qa/unit/testHtmlWriter.cxx +++ b/svtools/qa/unit/testHtmlWriter.cxx @@ -17,7 +17,6 @@ namespace { - OString extractFromStream(SvMemoryStream& rStream) { rStream.WriteChar('\0'); @@ -25,10 +24,9 @@ OString extractFromStream(SvMemoryStream& rStream) rStream.Seek(STREAM_SEEK_TO_BEGIN); return static_cast(rStream.GetData()); } - } -class Test: public CppUnit::TestFixture +class Test : public CppUnit::TestFixture { }; diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index c2db6b4e9570..d88113998d7d 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -38,8 +38,7 @@ CollatorResource::Collator
[Libreoffice-commits] core.git: solenv/clang-format store/source
solenv/clang-format/excludelist |2 -- store/source/object.cxx |6 +- store/source/object.hxx | 12 +--- 3 files changed, 6 insertions(+), 14 deletions(-) New commits: commit 9d561c5440dd68285aa84fb3dac20a8d1df4870f Author: Philipp Hofer AuthorDate: Thu Nov 12 13:18:21 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 16 12:25:33 2020 +0100 tdf#123936 Formatting files in module store with clang-format Change-Id: I3bf0ea654f046172cab2566f357bc9c3354b8e6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105713 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 1d1d3e918f8d..d4ff0c061160 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12333,8 +12333,6 @@ stoc/test/testsmgr_cpnt.cxx stoc/test/uriproc/test_uriproc.cxx store/source/lockbyte.cxx store/source/lockbyte.hxx -store/source/object.cxx -store/source/object.hxx store/source/storbase.cxx store/source/storbase.hxx store/source/storbios.cxx diff --git a/store/source/object.cxx b/store/source/object.cxx index 04427e64c933..b961bd67fecc 100644 --- a/store/source/object.cxx +++ b/store/source/object.cxx @@ -23,7 +23,6 @@ namespace store { - /* * * OStoreObject implementation. @@ -34,10 +33,7 @@ const sal_uInt32 OStoreObject::m_nTypeId = sal_uInt32(0x58190322); /* * isKindOf. */ -bool OStoreObject::isKindOf (sal_uInt32 nTypeId) -{ -return (nTypeId == m_nTypeId); -} +bool OStoreObject::isKindOf(sal_uInt32 nTypeId) { return (nTypeId == m_nTypeId); } } // namespace store diff --git a/store/source/object.hxx b/store/source/object.hxx index f19936558ccb..c3e217a7a14b 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -25,7 +25,6 @@ namespace store { - class OStoreObject : public virtual salhelper::SimpleReferenceObject { public: @@ -35,7 +34,7 @@ public: /** Replaces dynamic_cast type checking. */ -virtual bool isKindOf (sal_uInt32 nTypeId); +virtual bool isKindOf(sal_uInt32 nTypeId); protected: /** Destruction. @@ -46,15 +45,14 @@ private: /** The IStoreHandle TypeId. */ static const sal_uInt32 m_nTypeId; -OStoreObject (const OStoreObject&) = delete; -OStoreObject& operator= (const OStoreObject&) = delete; +OStoreObject(const OStoreObject&) = delete; +OStoreObject& operator=(const OStoreObject&) = delete; }; /** Template helper function as dynamic_cast replacement. */ -template -store_handle_type * SAL_CALL query ( -OStoreObject * pHandle, store_handle_type *); +template +store_handle_type* SAL_CALL query(OStoreObject* pHandle, store_handle_type*); } // namespace store ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/clang-format uui/qa uui/source
solenv/clang-format/excludelist |9 uui/qa/unit/uui-dialogs-test.cxx |9 uui/source/alreadyopen.hxx |4 + uui/source/authfallbackdlg.cxx | 23 -- uui/source/fltdlg.cxx| 84 +++ uui/source/masterpassworddlg.hxx |5 +- uui/source/openlocked.hxx|6 +- uui/source/sslwarndlg.hxx| 11 ++--- uui/source/trylater.hxx |4 + uui/source/unknownauthdlg.cxx| 14 ++ 10 files changed, 76 insertions(+), 93 deletions(-) New commits: commit f05246dc2ae1145f54e1b6e53b47fd53382add96 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:25:07 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 16 11:46:15 2020 +0100 tdf#123936 Formatting files in module uui with clang-format Change-Id: I0de0afa5dca5e5193d25927e76e42cbf29682d96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105726 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index e5f6204fcf2d..1d1d3e918f8d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15828,12 +15828,8 @@ unoxml/source/xpath/xpathapi.hxx unoxml/source/xpath/xpathobject.cxx unoxml/source/xpath/xpathobject.hxx uui/inc/ids.hxx -uui/qa/unit/uui-dialogs-test.cxx uui/source/alreadyopen.cxx -uui/source/alreadyopen.hxx -uui/source/authfallbackdlg.cxx uui/source/filechanged.cxx -uui/source/fltdlg.cxx uui/source/fltdlg.hxx uui/source/getcontinuations.hxx uui/source/iahndl-authentication.cxx @@ -15852,11 +15848,9 @@ uui/source/logindlg.hxx uui/source/loginerr.hxx uui/source/masterpasscrtdlg.cxx uui/source/masterpassworddlg.cxx -uui/source/masterpassworddlg.hxx uui/source/nameclashdlg.cxx uui/source/nameclashdlg.hxx uui/source/openlocked.cxx -uui/source/openlocked.hxx uui/source/passwordcontainer.cxx uui/source/passwordcontainer.hxx uui/source/passworddlg.cxx @@ -15866,10 +15860,7 @@ uui/source/requeststringresolver.hxx uui/source/secmacrowarnings.cxx uui/source/secmacrowarnings.hxx uui/source/sslwarndlg.cxx -uui/source/sslwarndlg.hxx uui/source/trylater.cxx -uui/source/trylater.hxx -uui/source/unknownauthdlg.cxx uui/source/unknownauthdlg.hxx vbahelper/source/msforms/vbabutton.cxx vbahelper/source/msforms/vbabutton.hxx diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx index 3ad47fd79f1c..8a6f6d16 100644 --- a/uui/qa/unit/uui-dialogs-test.cxx +++ b/uui/qa/unit/uui-dialogs-test.cxx @@ -36,19 +36,14 @@ public: CPPUNIT_TEST_SUITE_END(); }; -UuiDialogsTest::UuiDialogsTest() -{ -} +UuiDialogsTest::UuiDialogsTest() {} void UuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { // fill map of known dialogs } -VclPtr UuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/) -{ -return nullptr; -} +VclPtr UuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/) { return nullptr; } void UuiDialogsTest::openAnyDialog() { diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index 3d6e5a8fab80..685214fb1a5e 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -25,8 +25,10 @@ class AlreadyOpenQueryBox { private: std::unique_ptr m_xQueryBox; + public: -AlreadyOpenQueryBox(weld::Window* pParent, const std::locale& rResLocale, const OUString& aMessage, bool bIsStoring); +AlreadyOpenQueryBox(weld::Window* pParent, const std::locale& rResLocale, +const OUString& aMessage, bool bIsStoring); short run() { return m_xQueryBox->run(); } }; diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index 3fa4fc1655a9..daad28b77feb 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -12,7 +12,7 @@ AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instructions, const OUString& url) : GenericDialogController(pParent, "uui/ui/authfallback.ui", "AuthFallbackDlg") -, m_bGoogleMode( false ) +, m_bGoogleMode(false) , m_xTVInstructions(m_xBuilder->weld_label("instructions")) , m_xEDUrl(m_xBuilder->weld_entry("url")) , m_xEDCode(m_xBuilder->weld_entry("code")) @@ -22,12 +22,12 @@ AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instruct , m_xGoogleBox(m_xBuilder->weld_widget("GDrive")) , m_xOneDriveBox(m_xBuilder->weld_widget("OneDrive")) { -m_xBTOk->connect_clicked( LINK( this, AuthFallbackDlg, OKHdl) ); -m_xBTCancel->connect_clicked( LINK( this, AuthFallbackDlg, CancelHdl) ); +m_xBTOk->connect_clicked(LINK(this, AuthFallbackDlg, OKHdl)); +m_xBTCancel->connect_clicked(LINK(this, AuthFallbackDlg, CancelHdl)); m_xBTOk->set_sensitive(true); m_xTVInstructions->set_label(instructions); -if( url.isEmpty() ) +if (url.isEmpty()) { // Google 2FA m_bGoogleMod
[Libreoffice-commits] core.git: solenv/clang-format svl/qa svl/source
solenv/clang-format/excludelist| 12 --- svl/qa/unit/notify/test_SfxBroadcaster.cxx | 32 +++-- svl/qa/unit/test_lngmisc.cxx | 61 +- svl/source/inc/stringio.hxx|5 - svl/source/items/itemiter.cxx | 20 ++ svl/source/items/poolitem.cxx | 96 + svl/source/items/stringio.cxx |3 svl/source/misc/getstringresource.cxx |5 - svl/source/misc/sharedstringpool.cxx | 34 -- svl/source/notify/SfxBroadcaster.cxx | 51 +-- svl/source/notify/hint.cxx |7 -- svl/source/notify/isethint.cxx | 11 --- svl/source/svsql/converter.cxx |5 - 13 files changed, 129 insertions(+), 213 deletions(-) New commits: commit 580b4c5f945df4e98bc2bacdf3620da688b2dbdf Author: Philipp Hofer AuthorDate: Thu Nov 12 13:18:48 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Nov 16 11:44:30 2020 +0100 tdf#123936 Formatting files in module svl with clang-format Change-Id: Iaaac34428ef0e5b8f09f6cbcad16ea5bab145321 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105714 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index cda2ce74d579..e5f6204fcf2d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12419,11 +12419,9 @@ svgio/source/svgreader/svgusenode.cxx svgio/source/svguno/xsvgparser.cxx svl/qa/unit/items/test_IndexedStyleSheets.cxx svl/qa/unit/items/test_itempool.cxx -svl/qa/unit/notify/test_SfxBroadcaster.cxx svl/qa/unit/svl.cxx svl/qa/unit/test_INetContentType.cxx svl/qa/unit/test_URIHelper.cxx -svl/qa/unit/test_lngmisc.cxx svl/source/config/asiancfg.cxx svl/source/config/cjkoptions.cxx svl/source/config/ctloptions.cxx @@ -12441,7 +12439,6 @@ svl/source/fsstor/ostreamcontainer.cxx svl/source/fsstor/ostreamcontainer.hxx svl/source/inc/fsfactory.hxx svl/source/inc/poolio.hxx -svl/source/inc/stringio.hxx svl/source/items/IndexedStyleSheets.cxx svl/source/items/aeitem.cxx svl/source/items/cenumitm.cxx @@ -12453,7 +12450,6 @@ svl/source/items/ilstitem.cxx svl/source/items/imageitm.cxx svl/source/items/int64item.cxx svl/source/items/intitem.cxx -svl/source/items/itemiter.cxx svl/source/items/itempool.cxx svl/source/items/itemprop.cxx svl/source/items/itemset.cxx @@ -12462,14 +12458,12 @@ svl/source/items/legacyitem.cxx svl/source/items/macitem.cxx svl/source/items/poolcach.cxx svl/source/items/poolio.cxx -svl/source/items/poolitem.cxx svl/source/items/ptitem.cxx svl/source/items/rectitem.cxx svl/source/items/rngitem.cxx svl/source/items/sitem.cxx svl/source/items/slstitm.cxx svl/source/items/srchitem.cxx -svl/source/items/stringio.cxx svl/source/items/stritem.cxx svl/source/items/style.cxx svl/source/items/stylepool.cxx @@ -12480,7 +12474,6 @@ svl/source/misc/adrparse.cxx svl/source/misc/documentlockfile.cxx svl/source/misc/filenotation.cxx svl/source/misc/fstathelper.cxx -svl/source/misc/getstringresource.cxx svl/source/misc/gridprinter.cxx svl/source/misc/inethist.cxx svl/source/misc/inettype.cxx @@ -12489,13 +12482,9 @@ svl/source/misc/lockfilecommon.cxx svl/source/misc/ownlist.cxx svl/source/misc/sharecontrolfile.cxx svl/source/misc/sharedstring.cxx -svl/source/misc/sharedstringpool.cxx svl/source/misc/strmadpt.cxx svl/source/misc/urihelper.cxx -svl/source/notify/SfxBroadcaster.cxx svl/source/notify/broadcast.cxx -svl/source/notify/hint.cxx -svl/source/notify/isethint.cxx svl/source/notify/listener.cxx svl/source/notify/lstner.cxx svl/source/numbers/currencytable.cxx @@ -12519,7 +12508,6 @@ svl/source/svdde/ddedata.cxx svl/source/svdde/ddeimp.hxx svl/source/svdde/ddestrg.cxx svl/source/svdde/ddesvr.cxx -svl/source/svsql/converter.cxx svl/source/undo/undo.cxx svl/source/uno/pathservice.cxx svl/unx/source/svdde/ddedummy.cxx diff --git a/svl/qa/unit/notify/test_SfxBroadcaster.cxx b/svl/qa/unit/notify/test_SfxBroadcaster.cxx index 79b6543ad681..ffed864ff631 100644 --- a/svl/qa/unit/notify/test_SfxBroadcaster.cxx +++ b/svl/qa/unit/notify/test_SfxBroadcaster.cxx @@ -36,30 +36,26 @@ class SfxBroadcasterTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); }; -namespace { - +namespace +{ class MockedSfxListener : public SfxListener { public: MockedSfxListener() -: mNotifyWasCalled(false) {} - -void Notify(SfxBroadcaster&, const SfxHint&) override { -mNotifyWasCalled = true; +: mNotifyWasCalled(false) +{ } -bool NotifyWasCalled() const { -return mNotifyWasCalled; -} +void Notify(SfxBroadcaster&, const SfxHint&) override { mNotifyWasCalled = true; } + +bool NotifyWasCalled() const { return mNotifyWasCalled; } private: bool mNotifyWasCalled; }; - } -void -SfxBroadcasterTest::AddingListenersIncreasesCount()
[Libreoffice-commits] core.git: solenv/clang-format svx/inc svx/qa svx/source
solenv/clang-format/excludelist| 71 svx/inc/AffineMatrixItem.hxx |8 svx/inc/DescriptionGenerator.hxx | 41 +- svx/inc/GalleryControl.hxx |7 svx/inc/dbcharsethelper.hxx|6 svx/inc/extrusiondepthdialog.hxx |5 svx/inc/polygn3d.hxx |6 svx/inc/sdr/contact/viewcontactofe3d.hxx | 37 +- svx/inc/sdr/contact/viewcontactofpageobj.hxx | 18 - svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx| 20 - svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx| 13 svx/inc/sdr/contact/viewcontactoftextobj.hxx |5 svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx | 10 svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx |8 svx/inc/sdr/primitive2d/sdrprimitivetools.hxx | 14 svx/inc/sxcaitm.hxx|8 svx/inc/sxmoitm.hxx|8 svx/inc/sxmsitm.hxx|8 svx/inc/sxroaitm.hxx |8 svx/inc/sxsaitm.hxx|8 svx/inc/textchain.hxx | 41 +- svx/inc/textchainflow.hxx | 35 -- svx/inc/uiobject.hxx | 11 svx/inc/unomlstr.hxx |9 svx/qa/unit/svdraw/test_SdrTextObject.cxx | 17 svx/qa/unit/svx-dialogs-test.cxx |9 svx/source/accessibility/DescriptionGenerator.cxx | 85 +--- svx/source/accessibility/lookupcolorname.cxx | 40 +- svx/source/accessibility/lookupcolorname.hxx |5 svx/source/dialog/SvxNumOptionsTabPageHelper.cxx | 18 - svx/source/dialog/dialmgr.cxx | 10 svx/source/dialog/dlgunit.hxx | 15 svx/source/dialog/measctrl.cxx | 24 - svx/source/dialog/rubydialog.cxx | 174 -- svx/source/dialog/srchctrl.hxx |7 svx/source/dialog/strarray.cxx | 16 svx/source/dialog/svxdlg.cxx |7 svx/source/engine3d/camera3d.cxx | 26 - svx/source/engine3d/deflt3d.cxx|6 svx/source/engine3d/helperminimaldepth3d.hxx |3 svx/source/engine3d/polygn3d.cxx | 59 +-- svx/source/engine3d/svx3ditems.cxx | 121 +++--- svx/source/gallery2/codec.hxx | 11 svx/source/inc/celltypes.hxx | 36 -- svx/source/inc/fmslotinvalidator.hxx |3 svx/source/inc/tbxform.hxx | 35 -- svx/source/items/numfmtsh.cxx | 152 +--- svx/source/sdr/contact/viewcontact.cxx | 91 ++--- svx/source/sdr/contact/viewcontactofpageobj.cxx| 24 - svx/source/sdr/contact/viewcontactoftextobj.cxx| 11 svx/source/sdr/contact/viewobjectcontactredirector.cxx | 19 - svx/source/sidebar/EmptyPanel.cxx | 11 svx/source/sidebar/EmptyPanel.hxx |7 svx/source/sidebar/SelectionAnalyzer.cxx | 88 ++--- svx/source/sidebar/line/LineWidthPopup.cxx | 62 +-- svx/source/sidebar/nbdtmgfact.cxx | 11 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 17 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 19 - svx/source/sidebar/text/TextUnderlinePopup.cxx | 19 - svx/source/svdraw/sdrundomanager.cxx | 34 - svx/source/svdraw/svdoattr.cxx | 21 - svx/source/svdraw/svdviter.cx
[Libreoffice-commits] core.git: 2 commits - hwpfilter/source idlc/inc idlc/source idl/source solenv/clang-format
hwpfilter/source/datecode.h |5 - hwpfilter/source/hfont.cxx | 18 ++- hwpfilter/source/hstream.cxx| 12 +--- hwpfilter/source/hstyle.cxx | 35 + hwpfilter/source/htags.h| 12 ++-- hwpfilter/source/precompile.h |6 +- hwpfilter/source/solver.h | 20 +++ idl/source/objects/module.cxx | 13 + idlc/inc/astconstants.hxx |3 - idlc/inc/astenum.hxx|8 +-- idlc/inc/astexception.hxx |5 + idlc/inc/astmodule.hxx |9 +-- idlc/inc/astneeds.hxx |7 +- idlc/inc/astobserves.hxx|9 +-- idlc/inc/astscope.hxx | 21 +++- idlc/inc/astsequence.hxx| 17 +++--- idlc/inc/aststack.hxx |4 - idlc/inc/asttype.hxx|3 - idlc/source/astexpression.cxx | 92 +++- idlc/source/aststack.cxx| 12 +--- idlc/source/attributeexceptions.hxx | 10 ++- solenv/clang-format/excludelist | 21 22 files changed, 150 insertions(+), 192 deletions(-) New commits: commit 9c9a8229201bd134df923420c97db84688a7813c Author: Philipp Hofer AuthorDate: Thu Nov 12 13:00:40 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:19:47 2020 +0100 tdf#123936 Formatting files in module idl with clang-format Change-Id: I0a2681218773288c14b6faf98dd0bb8a7dbac56d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105679 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index fe64287ae8e2..17c483a3243e 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -22,17 +22,14 @@ #include #include +SvMetaModule::SvMetaModule() {} -SvMetaModule::SvMetaModule() +void SvMetaModule::WriteSfx(SvIdlDataBase& rBase, SvStream& rOutStm) { -} - -void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) -{ -for( sal_uLong n = 0; n < aClassList.size(); n++ ) +for (sal_uLong n = 0; n < aClassList.size(); n++) { -SvMetaClass * pClass = aClassList[n]; -pClass->WriteSfx( rBase, rOutStm ); +SvMetaClass* pClass = aClassList[n]; +pClass->WriteSfx(rBase, rOutStm); } } diff --git a/idlc/inc/astconstants.hxx b/idlc/inc/astconstants.hxx index cf97e2cc6971..6add23a45359 100644 --- a/idlc/inc/astconstants.hxx +++ b/idlc/inc/astconstants.hxx @@ -26,7 +26,8 @@ class AstConstants final : public AstModule public: AstConstants(const OString& name, AstScope* pScope) : AstModule(NT_constants, name, pScope) -{} +{ +} }; #endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX diff --git a/idlc/inc/astenum.hxx b/idlc/inc/astenum.hxx index 085a397b0f22..dc89d430adb2 100644 --- a/idlc/inc/astenum.hxx +++ b/idlc/inc/astenum.hxx @@ -23,23 +23,21 @@ #include "astscope.hxx" #include "astconstant.hxx" -class AstEnum final : public AstType - , public AstScope +class AstEnum final : public AstType, public AstScope { public: AstEnum(const OString& name, AstScope* pScope); virtual ~AstEnum() override; -sal_Int32 getEnumValueCount() -{ return m_enumValueCount++; } +sal_Int32 getEnumValueCount() { return m_enumValueCount++; } AstConstant* checkValue(AstExpression* pExpr); virtual bool dump(RegistryKey& rKey) override; private: -sal_Int32 m_enumValueCount; +sal_Int32 m_enumValueCount; }; #endif // INCLUDED_IDLC_INC_ASTENUM_HXX diff --git a/idlc/inc/astexception.hxx b/idlc/inc/astexception.hxx index 70c1ffc9c706..6c2d549bc9a2 100644 --- a/idlc/inc/astexception.hxx +++ b/idlc/inc/astexception.hxx @@ -24,9 +24,10 @@ class AstException final : public AstStruct { public: -AstException(const OString& name, AstException const * pBaseType, AstScope* pScope) +AstException(const OString& name, AstException const* pBaseType, AstScope* pScope) : AstStruct(NT_exception, name, pBaseType, pScope) -{} +{ +} }; #endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX diff --git a/idlc/inc/astmodule.hxx b/idlc/inc/astmodule.hxx index df50ac95df5f..6178cfbb63da 100644 --- a/idlc/inc/astmodule.hxx +++ b/idlc/inc/astmodule.hxx @@ -22,18 +22,19 @@ #include "astdeclaration.hxx" #include "astscope.hxx" -class AstModule : public AstDeclaration -, public AstScope +class AstModule : public AstDeclaration, public AstScope { public: AstModule(const OString& name, AstScope* pScope) : AstDeclaration(NT_module, name, pScope) , AstScope(NT_module) -{} +{ +} AstModule(NodeType type, const OString& name, AstScope* pScope) : AstDeclaration(type, name, pScope) , AstScope(type) -{} +{ +} virtual bool dump(RegistryKey& rKey) override; }; diff --git a/idlc/inc/astneeds.
[Libreoffice-commits] core.git: 2 commits - fpicker/inc fpicker/source helpcompiler/source solenv/clang-format
fpicker/inc/fpsofficeResMgr.hxx |5 + fpicker/source/aqua/CFStringUtilities.hxx |5 +++-- fpicker/source/aqua/NSString_OOoAdditions.hxx |4 ++-- fpicker/source/aqua/SalAquaPicker.hxx | 26 ++ fpicker/source/office/QueryFolderName.hxx |6 +++--- fpicker/source/office/autocmpledit.hxx| 13 - fpicker/source/office/breadcrumb.hxx | 14 +++--- fpicker/source/win32/WinImplHelper.hxx|7 +++ fpicker/source/win32/resourceprovider.hxx |3 +-- fpicker/source/win32/shared.hxx |6 +++--- helpcompiler/source/HelpLinker_main.cxx | 10 +- helpcompiler/source/LuceneHelper.cxx |6 +++--- helpcompiler/source/LuceneHelper.hxx |8 solenv/clang-format/excludelist | 13 - 14 files changed, 53 insertions(+), 73 deletions(-) New commits: commit 11aa7dc7a6009c02e681f41f7255902fe578ab7e Author: Philipp Hofer AuthorDate: Thu Nov 12 12:59:08 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:18:57 2020 +0100 tdf#123936 Formatting files in module helpcompiler with clang-format Change-Id: Ibf7baa3de0a8cd7952044909c00c55e7c5b008a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105675 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx index 36826b49209c..5c8fe8807336 100644 --- a/helpcompiler/source/HelpLinker_main.cxx +++ b/helpcompiler/source/HelpLinker_main.cxx @@ -23,25 +23,25 @@ #include #include -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) +{ std::vector args; for (int i = 1; i < argc; ++i) args.push_back(std::string(argv[i])); try { std::unique_ptr pHelpLinker(new HelpLinker()); -pHelpLinker->main( args ); +pHelpLinker->main(args); } -catch( const HelpProcessingException& e ) +catch (const HelpProcessingException& e) { std::cerr << e.m_aErrorMsg; exit(1); } -catch (const std::exception &e) +catch (const std::exception& e) { std::cerr << e.what(); exit(1); } return 0; } - diff --git a/helpcompiler/source/LuceneHelper.cxx b/helpcompiler/source/LuceneHelper.cxx index 7002162a7862..d6a2de2523e8 100644 --- a/helpcompiler/source/LuceneHelper.cxx +++ b/helpcompiler/source/LuceneHelper.cxx @@ -9,7 +9,7 @@ #include "LuceneHelper.hxx" -std::vector OUStringToTCHARVec(OUString const &rStr) +std::vector OUStringToTCHARVec(OUString const& rStr) { //UTF-16 if (sizeof(TCHAR) == sizeof(sal_Unicode)) @@ -17,7 +17,7 @@ std::vector OUStringToTCHARVec(OUString const &rStr) //UTF-32 std::vector aRet; -for (sal_Int32 nStrIndex = 0; nStrIndex < rStr.getLength(); ) +for (sal_Int32 nStrIndex = 0; nStrIndex < rStr.getLength();) { const sal_uInt32 nCode = rStr.iterateCodePoints(&nStrIndex); aRet.push_back(nCode); @@ -26,7 +26,7 @@ std::vector OUStringToTCHARVec(OUString const &rStr) return aRet; } -OUString TCHARArrayToOUString(TCHAR const *str) +OUString TCHARArrayToOUString(TCHAR const* str) { // UTF-16 if (sizeof(TCHAR) == sizeof(sal_Unicode)) diff --git a/helpcompiler/source/LuceneHelper.hxx b/helpcompiler/source/LuceneHelper.hxx index a84346e25faf..781f30bba416 100644 --- a/helpcompiler/source/LuceneHelper.hxx +++ b/helpcompiler/source/LuceneHelper.hxx @@ -11,20 +11,20 @@ #define INCLUDED_HELPCOMPILER_SOURCE_LUCENEHELPER_HXX #if defined(__GNUC__) -# pragma GCC visibility push (default) +#pragma GCC visibility push(default) #endif #include #if defined(__GNUC__) -# pragma GCC visibility pop +#pragma GCC visibility pop #endif #include #include -std::vector OUStringToTCHARVec(OUString const &rStr); -OUString TCHARArrayToOUString(TCHAR const *str); +std::vector OUStringToTCHARVec(OUString const& rStr); +OUString TCHARArrayToOUString(TCHAR const* str); #endif diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 28f484cfb5f9..b4bc8c6fa988 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -4809,10 +4809,7 @@ helpcompiler/source/HelpCompiler.cxx helpcompiler/source/HelpIndexer.cxx helpcompiler/source/HelpIndexer_main.cxx helpcompiler/source/HelpLinker.cxx -helpcompiler/source/HelpLinker_main.cxx helpcompiler/source/HelpSearch.cxx -helpcompiler/source/LuceneHelper.cxx -helpcompiler/source/LuceneHelper.hxx hwpfilter/qa/cppunit/test_hwpfilter.cxx hwpfilter/source/attributes.cxx hwpfilter/source/attributes.hxx commit 4d9e9f2125867adde3558b9866d08f7bafb4386b Author: Philipp Hofer AuthorDate: Thu Nov 12 12:58:22 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:18:38 2020 +0100 tdf#123936 Format
[Libreoffice-commits] core.git: formula/source solenv/clang-format
formula/source/core/resource/core_resource.cxx |5 - formula/source/ui/dlg/funcpage.cxx | 70 - solenv/clang-format/excludelist|2 3 files changed, 26 insertions(+), 51 deletions(-) New commits: commit 36074893c87f80daf889287c736d604f590c0ae5 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:58:00 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:19:14 2020 +0100 tdf#123936 Formatting files in module formula with clang-format Change-Id: Id70a78e38749c6b402d6f709525a8c6b9a8701a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105671 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index e89a1ce367aa..b9e1347f0b5a 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -19,9 +19,6 @@ #include #include -OUString ForResId(const char *pId) -{ -return Translate::get(pId, Translate::Create("for")); -} +OUString ForResId(const char* pId) { return Translate::get(pId, Translate::Create("for")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index e8370d54938d..338f37bd2dd7 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -27,7 +27,6 @@ namespace formula { - IMPL_LINK(FuncPage, KeyInputHdl, const KeyEvent&, rKEvt, bool) { if (rKEvt.GetCharCode() == ' ') @@ -52,7 +51,7 @@ FuncPage::FuncPage(weld::Container* pParent, const IFunctionManager* _pFunctionM m_pFunctionManager->fillLastRecentlyUsedFunctions(aLRUList); const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount(); -for(sal_uInt32 j= 0; j < nCategoryCount; ++j) +for (sal_uInt32 j = 0; j < nCategoryCount; ++j) { const IFunctionCategory* pCategory = m_pFunctionManager->getCategory(j); OUString sId(OUString::number(reinterpret_cast(pCategory))); @@ -65,23 +64,21 @@ FuncPage::FuncPage(weld::Container* pParent, const IFunctionManager* _pFunctionM // lock to its initial size m_xLbFunction->set_size_request(m_xLbFunction->get_preferred_size().Width(), m_xLbFunction->get_height_rows(15)); -m_xLbCategory->connect_changed( LINK( this, FuncPage, SelComboBoxHdl ) ); -m_xLbFunction->connect_changed( LINK( this, FuncPage, SelTreeViewHdl ) ); -m_xLbFunction->connect_row_activated( LINK( this, FuncPage, DblClkHdl ) ); -m_xLbFunction->connect_key_press( LINK( this, FuncPage, KeyInputHdl ) ); -m_xLbFunctionSearchString->connect_changed( LINK( this, FuncPage, ModifyHdl ) ); +m_xLbCategory->connect_changed(LINK(this, FuncPage, SelComboBoxHdl)); +m_xLbFunction->connect_changed(LINK(this, FuncPage, SelTreeViewHdl)); +m_xLbFunction->connect_row_activated(LINK(this, FuncPage, DblClkHdl)); +m_xLbFunction->connect_key_press(LINK(this, FuncPage, KeyInputHdl)); +m_xLbFunctionSearchString->connect_changed(LINK(this, FuncPage, ModifyHdl)); m_xLbFunctionSearchString->grab_focus(); } -FuncPage::~FuncPage() -{ -} +FuncPage::~FuncPage() {} void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory) { const sal_uInt32 nCount = _pCategory->getCount(); -for(sal_uInt32 i = 0 ; i < nCount; ++i) +for (sal_uInt32 i = 0; i < nCount; ++i) { TFunctionDesc pDesc(_pCategory->getFunction(i)); if (!pDesc->isHidden()) @@ -102,14 +99,15 @@ void FuncPage::UpdateFunctionList(const OUString& aStr) if (aStr.isEmpty() || nSelPos == 0) { -const IFunctionCategory* pCategory = reinterpret_cast(m_xLbCategory->get_id(nSelPos).toInt64()); +const IFunctionCategory* pCategory += reinterpret_cast(m_xLbCategory->get_id(nSelPos).toInt64()); -if ( nSelPos > 0 ) +if (nSelPos > 0) { -if ( pCategory == nullptr ) +if (pCategory == nullptr) { const sal_uInt32 nCount = m_pFunctionManager->getCount(); -for(sal_uInt32 i = 0 ; i < nCount; ++i) +for (sal_uInt32 i = 0; i < nCount; ++i) { impl_addFunctions(m_pFunctionManager->getCategory(i)); } @@ -123,7 +121,7 @@ void FuncPage::UpdateFunctionList(const OUString& aStr) { for (auto const& elem : aLRUList) { -if (elem) // may be null if a function is no longer available +if (elem) // may be null if a function is no longer available { OUString sId(OUString::number(reinterpret_cast(elem))); m_xLbFunction->append(sId, elem->getFunctionName()); @@ -135,7 +133,7 @@ void FuncPage::UpdateFunctionList(const OUString&
[Libreoffice-commits] core.git: framework/inc framework/source solenv/clang-format
framework/inc/helper/wakeupthread.hxx | 15 +-- framework/inc/jobs/jobconst.hxx | 12 +- framework/inc/services/uriabbreviation.hxx| 18 ++-- framework/source/classes/framecontainer.cxx | 60 +++--- framework/source/dispatch/isstartmoduledispatch.hxx |8 - framework/source/fwe/classes/fwkresid.cxx |5 - framework/source/fwe/xml/toolboxconfiguration.cxx | 44 -- framework/source/fwi/helper/shareablemutex.cxx| 16 --- framework/source/helper/statusindicator.cxx | 27 ++ framework/source/jobs/jobresult.cxx | 27 +++--- framework/source/uiconfiguration/CommandImageResolver.hxx |8 - framework/source/xml/imagesconfiguration.cxx | 41 - solenv/clang-format/excludelist | 12 -- 13 files changed, 132 insertions(+), 161 deletions(-) New commits: commit 49494bb703107835f83671d9272a0326feec8bb4 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:58:48 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:18:12 2020 +0100 tdf#123936 Formatting files in module framework with clang-format Change-Id: I8210a1d4bb51519f59265f370f5e8bab8a3c4179 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105674 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 51cf859f0462..49f268a821e8 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -28,13 +28,15 @@ #include #include -namespace com::sun::star::util { -class XUpdatable; +namespace com::sun::star::util +{ +class XUpdatable; } -namespace framework{ - -class WakeUpThread final : public salhelper::Thread { +namespace framework +{ +class WakeUpThread final : public salhelper::Thread +{ css::uno::WeakReference updatable_; osl::Condition condition_; @@ -44,11 +46,10 @@ class WakeUpThread final : public salhelper::Thread { void execute() override; public: -WakeUpThread(css::uno::Reference const & updatable); +WakeUpThread(css::uno::Reference const& updatable); void stop(); }; - } #endif diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index b2efb749e3a9..31a504a9d360 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -22,8 +22,8 @@ #include -namespace framework{ - +namespace framework +{ /** @short defines all constant values used within a job environment. @@ -34,10 +34,10 @@ namespace framework{ */ class JobConst { -public: -static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate"; -static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments"; -static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult"; +public: +static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate"; +static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments"; +static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult"; }; } // namespace framework diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 200296da2df9..f4e3ef10dc4b 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -28,23 +28,25 @@ namespace framework { - -class UriAbbreviation final : public ::cppu::WeakImplHelper< css::util::XStringAbbreviation, css::lang::XServiceInfo> +class UriAbbreviation final +: public ::cppu::WeakImplHelper { public: -explicit UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context); +explicit UriAbbreviation(css::uno::Reference const& context); /* interface XServiceInfo */ virtual OUString SAL_CALL getImplementationName() override; -virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; -virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; +virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; +virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // css::util::XStringAbbreviation: -virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) override; +virtual OUString SAL_CALL +abbreviateString(const css::uno::Reference& xStringWidth, + ::sal_Int32 nWidth, const OUString& aString) override; private: -UriAbbreviation(UriAbbreviation const &) = delete; -UriAbbreviation& operator =(UriAbbreviation const &) = delete; +UriAbbreviation(UriAbbreviation const&) = delet
[Libreoffice-commits] core.git: forms/source solenv/clang-format
forms/source/component/BaseListBox.hxx |9 forms/source/component/findpos.hxx | 10 +--- forms/source/xforms/boolexpression.cxx | 17 ++-- forms/source/xforms/enumeration.cxx | 18 +++- forms/source/xforms/mip.hxx | 21 -- forms/source/xforms/pathexpression.hxx | 21 -- forms/source/xforms/submission/serialization.hxx|9 +--- forms/source/xforms/submission/serialization_app_xml.hxx|6 +- forms/source/xforms/submission/serialization_urlencoded.hxx |6 +- forms/source/xforms/submission/submission_get.hxx |7 +-- forms/source/xforms/submission/submission_put.hxx |7 +-- forms/source/xforms/unohelper.cxx | 25 forms/source/xforms/xpathlib/extension.hxx | 19 - solenv/clang-format/excludelist | 13 -- 14 files changed, 75 insertions(+), 113 deletions(-) New commits: commit 951764106e2d82fc59dcf39e14bc17838856a00c Author: Philipp Hofer AuthorDate: Thu Nov 12 12:57:37 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:17:55 2020 +0100 tdf#123936 Formatting files in module forms with clang-format Change-Id: I230375bd002147642db37728fa0287b6a554e330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105670 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx index ec3b11510307..1e3ee87a1136 100644 --- a/forms/source/component/BaseListBox.hxx +++ b/forms/source/component/BaseListBox.hxx @@ -22,17 +22,12 @@ #include - namespace frm { - -const sal_uInt16 ENTRY_NOT_FOUND = 0x; -const sal_uInt16 BOUNDCOLUMN = 0x0001; - - +const sal_uInt16 ENTRY_NOT_FOUND = 0x; +const sal_uInt16 BOUNDCOLUMN = 0x0001; } - #endif // INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx index 3c108ba1d425..b279558fdab0 100644 --- a/forms/source/component/findpos.hxx +++ b/forms/source/component/findpos.hxx @@ -24,13 +24,9 @@ #include #include - -namespace detail { - -sal_Int32 findPos( -const OUString& aStr, -const css::uno::Sequence< OUString >& rList); - +namespace detail +{ +sal_Int32 findPos(const OUString& aStr, const css::uno::Sequence& rList); } #endif diff --git a/forms/source/xforms/boolexpression.cxx b/forms/source/xforms/boolexpression.cxx index 01fd522d7170..6b3f57564d66 100644 --- a/forms/source/xforms/boolexpression.cxx +++ b/forms/source/xforms/boolexpression.cxx @@ -17,34 +17,29 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "boolexpression.hxx" - namespace xforms { - /** BoolExpression represents a computed XPath expression that returns * a bool value and caches the results. * * As this class has no virtual methods, it should never be used * polymorphically. */ -BoolExpression::BoolExpression() : ComputedExpression() +BoolExpression::BoolExpression() +: ComputedExpression() { } -BoolExpression::~BoolExpression() -{ -} +BoolExpression::~BoolExpression() {} -void BoolExpression::setExpression( const OUString& rExpression ) +void BoolExpression::setExpression(const OUString& rExpression) { -ComputedExpression::setExpression( rExpression ); -mbIsSimple = _checkExpression( " *(true)|(false) *\\( *\\) *" ); +ComputedExpression::setExpression(rExpression); +mbIsSimple = _checkExpression(" *(true)|(false) *\\( *\\) *"); } - } // namespace xforms /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index 103803f69ac7..e02881fbbfce 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "enumeration.hxx" #include @@ -32,17 +31,16 @@ using com::sun::star::container::XIndexAccess; using com::sun::star::uno::Any; using com::sun::star::uno::RuntimeException; - -Enumeration::Enumeration( XIndexAccess* pContainer ) -: mxContainer( pContainer ), - mnIndex( 0 ) +Enumeration::Enumeration(XIndexAccess* pContainer) +: mxContainer(pContainer) +, mnIndex(0) { -OSL_ENSURE( mxContainer.is(), "no container?" ); +OSL_ENSURE(mxContainer.is(), "no container?"); } sal_Bool Enumeration::hasMoreElements() { -if( ! mxContainer.is() ) +if (!mxContainer.is()) throw RuntimeException(); return mnIndex < mxContainer->getCount(); @@ -50,12 +48,12 @@ sal_Bool Enumeration::hasMoreElements() Any Enumeration::nextElement() { -i
[Libreoffice-commits] core.git: 2 commits - desktop/inc desktop/source desktop/test embedserv/source solenv/clang-format
desktop/inc/migration.hxx |4 - desktop/source/app/cmdlinehelp.hxx |4 - desktop/source/app/desktopcontext.cxx | 17 ++--- desktop/source/app/langselect.hxx |5 - desktop/source/app/main.c |6 +- desktop/source/app/userinstall.hxx |8 +- desktop/source/deployment/gui/dp_gui_dependencydialog.cxx |8 -- desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 17 +++-- desktop/source/deployment/gui/license_dialog.hxx | 15 ++--- desktop/source/deployment/inc/dp_persmap.h | 17 ++--- desktop/source/deployment/inc/dp_platform.hxx | 10 +-- desktop/source/deployment/inc/dp_resource.h |7 +- desktop/source/deployment/manager/dp_properties.hxx | 30 -- desktop/source/deployment/misc/dp_resource.cxx | 24 +++- desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 25 desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx | 20 +++--- desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 27 - desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 26 desktop/source/migration/services/jvmfwk.hxx |4 - desktop/source/pkgchk/unopkg/unopkg_main.c |4 - desktop/test/deployment/executable_content/build/hello.c |6 -- embedserv/source/embed/ed_iinplace.cxx | 30 +++--- embedserv/source/embed/esdll.cxx |7 -- embedserv/source/embed/guid.hxx |6 +- embedserv/source/inc/embservconst.h |6 +- embedserv/source/inprocserv/advisesink.hxx | 29 + solenv/clang-format/excludelist | 26 27 files changed, 159 insertions(+), 229 deletions(-) New commits: commit 5035f265cd6e19ef3589db55ca0b780944812365 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:55:42 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:15:46 2020 +0100 tdf#123936 Formatting files in module embedserv with clang-format Change-Id: I475628cbec4c22a4b5ec535991d4f68154e3919e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105665 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx index 0c6e869e633c..eb33bf5ac4d0 100644 --- a/embedserv/source/embed/ed_iinplace.cxx +++ b/embedserv/source/embed/ed_iinplace.cxx @@ -20,30 +20,26 @@ #include #include - -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd) +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND* hWnd) { -OSL_ENSURE(m_pDocHolder,"no document for inplace activation"); +OSL_ENSURE(m_pDocHolder, "no document for inplace activation"); *hWnd = m_pDocHolder->GetTopMostWinHandle(); -if(*hWnd != nullptr) +if (*hWnd != nullptr) return NOERROR; else return ERROR; } -COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL) -{ -return NOERROR; -} +COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL) { return NOERROR; } COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate() { // no locking is used since the OLE must use the same thread always -if ( m_bIsInVerbHandling ) +if (m_bIsInVerbHandling) return E_UNEXPECTED; -BooleanGuard_Impl aGuard( m_bIsInVerbHandling ); +BooleanGuard_Impl aGuard(m_bIsInVerbHandling); m_pDocHolder->InPlaceDeactivate(); @@ -57,11 +53,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate() COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::UIDeactivate() { // no locking is used since the OLE must use the same thread always -if ( m_bIsInVerbHandling ) +if (m_bIsInVerbHandling) return E_UNEXPECTED; -BooleanGuard_Impl aGuard( m_bIsInVerbHandling ); - +BooleanGuard_Impl aGuard(m_bIsInVerbHandling); m_pDocHolder->UIDeactivate(); @@ -74,14 +69,11 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::UIDeactivate() COM_DECLSPEC_NOTHROW STDMETHODIMP Embed
[Libreoffice-commits] core.git: editeng/inc editeng/source solenv/clang-format
editeng/inc/editeng.hxx | 10 +++ editeng/inc/editxml.hxx |5 +-- editeng/inc/unopracc.hxx | 17 +--- editeng/source/items/svdfield.cxx|5 --- editeng/source/misc/edtdlg.cxx |7 + editeng/source/misc/forbiddencharacterstable.cxx | 32 --- solenv/clang-format/excludelist |6 7 files changed, 36 insertions(+), 46 deletions(-) New commits: commit 32b57a159ea6ab3b0cdef7ca9d746639d42aa192 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:55:03 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:15:59 2020 +0100 tdf#123936 Formatting files in module editeng with clang-format Change-Id: I745057f4a6dc0d8103ed7fa29d0f662226a5cee5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105663 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/editeng/inc/editeng.hxx b/editeng/inc/editeng.hxx index cce3d79d4e10..5b831efa3b5e 100644 --- a/editeng/inc/editeng.hxx +++ b/editeng/inc/editeng.hxx @@ -19,10 +19,10 @@ #pragma once -#define MN_WORDLANGUAGE 998 -#define MN_PARALANGUAGE 999 -#define MN_ALTSTART 1000 -#define MN_AUTOSTART2000 -#define MN_DICTSTART3000 +#define MN_WORDLANGUAGE 998 +#define MN_PARALANGUAGE 999 +#define MN_ALTSTART 1000 +#define MN_AUTOSTART 2000 +#define MN_DICTSTART 3000 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editxml.hxx b/editeng/inc/editxml.hxx index 51ded36f684e..650b7dfdef48 100644 --- a/editeng/inc/editxml.hxx +++ b/editeng/inc/editxml.hxx @@ -25,10 +25,9 @@ struct ESelection; class EditPaM; /** this function exports the selected content of an edit engine into a xml stream*/ -extern void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& rSel ); +extern void SvxWriteXML(EditEngine& rEditEngine, SvStream& rStream, const ESelection& rSel); /** this function imports xml from the stream into the selected of an edit engine */ -extern EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& rSel ); - +extern EditPaM SvxReadXML(EditEngine& rEditEngine, SvStream& rStream, const ESelection& rSel); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/unopracc.hxx b/editeng/inc/unopracc.hxx index 7617bed0a86e..d6b8b8235762 100644 --- a/editeng/inc/unopracc.hxx +++ b/editeng/inc/unopracc.hxx @@ -21,7 +21,6 @@ #include - class SvxEditSource; /** Wraps SvxUnoTextRangeBase and provides us with the text properties @@ -31,27 +30,27 @@ class SvxEditSource; required text range and return a reference to a XPropertySet. */ class SvxAccessibleTextPropertySet final : public SvxUnoTextRangeBase, - public css::lang::XTypeProvider, - public ::cppu::OWeakObject + public css::lang::XTypeProvider, + public ::cppu::OWeakObject { public: -SvxAccessibleTextPropertySet( const SvxEditSource*, const SvxItemPropertySet* ); +SvxAccessibleTextPropertySet(const SvxEditSource*, const SvxItemPropertySet*); virtual ~SvxAccessibleTextPropertySet() throw() override; // XTextRange -virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; +virtual css::uno::Reference SAL_CALL getText() override; -virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; +virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() override; -virtual sal_Bool SAL_CALL supportsService( const OUString& ) override; +virtual sal_Bool SAL_CALL supportsService(const OUString&) override; // lang::XTypeProvider -virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; -virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; +virtual css::uno::Sequence SAL_CALL getTypes() override; +virtual css::uno::Sequence SAL_CALL getImplementationId() override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx index 288826406551..a9b78148c003 100644 --- a/editeng/source/items/svdfield.cxx +++ b/editeng/source/items/svdfield.cxx @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include -SdrMeasureField::~SdrMeasureField() -{ -} +SdrMeasureField::~SdrMeasureField() {} std::unique_ptr SdrMeasureField::Clone() const { diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx i
[Libreoffice-commits] core.git: 2 commits - cli_ure/source cppuhelper/source cppu/source solenv/clang-format
cli_ure/source/native/assembly.cxx |8 +++ cli_ure/source/uno_bridge/cli_environment.h | 29 cppu/source/uno/IdentityMapping.hxx |7 -- cppu/source/uno/loadmodule.hxx | 12 ++- cppuhelper/source/paths.hxx | 14 +++-- cppuhelper/source/supportsservice.cxx |6 + solenv/clang-format/excludelist |6 - 7 files changed, 39 insertions(+), 43 deletions(-) New commits: commit fddcbd5d28bb58993ee3d210f1d11e57c70a8894 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:52:55 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:14:36 2020 +0100 tdf#123936 Formatting files in module cppu with clang-format Change-Id: I98281fce06c2a8c094db9e80c1f6bdf35ce70ccd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105657 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx index 4a6db6d81bc1..8ba081b0099f 100644 --- a/cppu/source/uno/IdentityMapping.hxx +++ b/cppu/source/uno/IdentityMapping.hxx @@ -21,8 +21,11 @@ #include -namespace com::sun::star::uno { class Environment; } +namespace com::sun::star::uno +{ +class Environment; +} -uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv); +uno_Mapping* createIdentityMapping(const css::uno::Environment& rEnv); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index 4d6c322c1078..694b1402492e 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -22,10 +22,13 @@ #include #include -namespace osl { class Module; } - -namespace cppu::detail { +namespace osl +{ +class Module; +} +namespace cppu::detail +{ #ifndef DISABLE_DYNLOADING /** Load a module. @@ -36,10 +39,9 @@ namespace cppu::detail { @return false if the module could not be loaded, otherwise true */ -bool loadModule(osl::Module & rModule, OUString const & name); +bool loadModule(osl::Module& rModule, OUString const& name); #endif - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/paths.hxx b/cppuhelper/source/paths.hxx index 9ce486fa772a..c1e3724c0aa1 100644 --- a/cppuhelper/source/paths.hxx +++ b/cppuhelper/source/paths.hxx @@ -22,16 +22,18 @@ #include #include -namespace osl { class Directory; } - -namespace cppu { +namespace osl +{ +class Directory; +} +namespace cppu +{ OUString getUnoIniUri(); -bool nextDirectoryItem(osl::Directory & directory, OUString * url); - -void decodeRdbUri(OUString * uri, bool * optional, bool * directory); +bool nextDirectoryItem(osl::Directory& directory, OUString* url); +void decodeRdbUri(OUString* uri, bool* optional, bool* directory); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx index f7f267ea0fd5..40dca8c0c269 100644 --- a/cppuhelper/source/supportsservice.cxx +++ b/cppuhelper/source/supportsservice.cxx @@ -17,12 +17,10 @@ #include #include -bool cppu::supportsService( -css::lang::XServiceInfo * implementation, OUString const & name) +bool cppu::supportsService(css::lang::XServiceInfo* implementation, OUString const& name) { assert(implementation != nullptr); -const css::uno::Sequence< OUString > s( -implementation->getSupportedServiceNames()); +const css::uno::Sequence s(implementation->getSupportedServiceNames()); return std::find(s.begin(), s.end(), name) != s.end(); } diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index b002207f44ff..a5c4affa2c16 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -2457,7 +2457,6 @@ cppu/source/typelib/typelib.hxx cppu/source/uno/EnvDcp.cxx cppu/source/uno/EnvStack.cxx cppu/source/uno/IdentityMapping.cxx -cppu/source/uno/IdentityMapping.hxx cppu/source/uno/any.cxx cppu/source/uno/assign.hxx cppu/source/uno/cascade_mapping.cxx @@ -2471,7 +2470,6 @@ cppu/source/uno/eq.hxx cppu/source/uno/lbenv.cxx cppu/source/uno/lbmap.cxx cppu/source/uno/loadmodule.cxx -cppu/source/uno/loadmodule.hxx cppu/source/uno/prim.hxx cppu/source/uno/sequence.cxx cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -2496,13 +2494,11 @@ cppuhelper/source/loadsharedlibcomponentfactory.hxx cppuhelper/source/macro_expander.cxx cppuhelper/source/macro_expander.hxx cppuhelper/source/paths.cxx -cppuhelper/source/paths.hxx cppuhelper/source/propertysetmixin.cxx cppuhelper/source/propshlp.cxx cppuhelper/source/servicemanager.cxx cppuhelper/source/servicemanager.hxx cppuhelper/source/shlib.cxx -cppuhelper/source/supportsservice.cxx cppuhelper/source/tdmgr.cxx cppuhelper/source/typemanager.cxx cppuhelper/source/typemanager.hxx commit 7ebd82e885b60552464e060236e86
[Libreoffice-commits] core.git: 2 commits - binaryurp/source codemaker/source solenv/clang-format
binaryurp/source/currentcontext.hxx| 12 +++- binaryurp/source/outgoingrequests.hxx | 26 -- binaryurp/source/reader.hxx| 25 + binaryurp/source/readerstate.hxx |9 + binaryurp/source/specialfunctionids.hxx|8 codemaker/source/codemaker/options.cxx | 15 --- codemaker/source/cppumaker/cppuoptions.hxx | 10 ++ codemaker/source/cppumaker/dumputils.hxx | 18 +- codemaker/source/javamaker/javaoptions.hxx | 10 ++ solenv/clang-format/excludelist|9 - 10 files changed, 70 insertions(+), 72 deletions(-) New commits: commit a079d78439cd371dd270fb5a1de125d5de9cf472 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:51:06 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:13:38 2020 +0100 tdf#123936 Formatting files in module codemaker with clang-format Change-Id: Icd006d12942489a10fc2b3b801233c9527284721 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105652 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 9b8dbf61f6bf..2d85b35a9823 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -17,18 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include -Options::Options() -{ -} - -Options::~Options() -{ - -} +Options::Options() {} +Options::~Options() {} bool Options::isValid(const OString& option) const { @@ -38,11 +31,11 @@ bool Options::isValid(const OString& option) const const OString& Options::getOption(const OString& option) const { OptionMap::const_iterator i(m_options.find(option)); -if (i == m_options.end()) { +if (i == m_options.end()) +{ throw IllegalArgument("Option is not valid or currently not set."); } return i->second; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index 76dba06b1210..f3d65e4fa8ed 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -25,13 +25,15 @@ class CppuOptions : public Options { public: CppuOptions() -: Options() {} +: Options() +{ +} -bool initOptions(int ac, char* av[], bool bCmdFile=false) override; +bool initOptions(int ac, char* av[], bool bCmdFile = false) override; -OString prepareHelp() override; +OString prepareHelp() override; -OString prepareVersion() const; +OString prepareVersion() const; protected: }; diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx index 965b64eda93f..58ccdc93fac5 100644 --- a/codemaker/source/cppumaker/dumputils.hxx +++ b/codemaker/source/cppumaker/dumputils.hxx @@ -21,19 +21,19 @@ #include -namespace rtl { class OUString; } +namespace rtl +{ +class OUString; +} class FileStream; -namespace codemaker::cppumaker { - -bool dumpNamespaceOpen( -FileStream & out, rtl::OUString const & entityName, bool fullModuleType); - -bool dumpNamespaceClose( -FileStream & out, rtl::OUString const & entityName, bool fullModuleType); +namespace codemaker::cppumaker +{ +bool dumpNamespaceOpen(FileStream& out, rtl::OUString const& entityName, bool fullModuleType); -void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName); +bool dumpNamespaceClose(FileStream& out, rtl::OUString const& entityName, bool fullModuleType); +void dumpTypeIdentifier(FileStream& out, rtl::OUString const& entityName); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index 956f24ccc8c9..5e6161c0470e 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -25,13 +25,15 @@ class JavaOptions : public Options { public: JavaOptions() -: Options() {} +: Options() +{ +} -bool initOptions(int ac, char* av[], bool bCmdFile=false) override; +bool initOptions(int ac, char* av[], bool bCmdFile = false) override; -OString prepareHelp() override; +OString prepareHelp() override; -OString prepareVersion() const; +OString prepareVersion() const; protected: }; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d9346c570ffc..01e90e8b7c1f 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -1429,27 +1429,23 @@ cli_ure/source/uno_bridge/cli_uno.cxx codemaker/source/codemaker/codemaker.cxx codemaker/source/codemaker/exceptiontree.cxx codemaker/source/codemaker/global.cxx -codemaker/source/codemaker/options.cx
[Libreoffice-commits] core.git: connectivity/source solenv/clang-format
connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx | 135 -- connectivity/source/drivers/calc/CCatalog.cxx | 22 - connectivity/source/drivers/component/CStatement.cxx |5 connectivity/source/drivers/dbase/DCatalog.cxx | 22 - connectivity/source/drivers/dbase/DIndexIter.cxx | 88 ++ connectivity/source/drivers/dbase/DPreparedStatement.cxx |5 connectivity/source/drivers/file/FDateFunctions.cxx| 62 ++-- connectivity/source/drivers/file/FStringFunctions.cxx | 93 +++--- connectivity/source/drivers/firebird/Indexes.cxx |4 connectivity/source/drivers/flat/ECatalog.cxx | 22 - connectivity/source/drivers/flat/EPreparedStatement.cxx|6 connectivity/source/drivers/hsqldb/HTerminateListener.cxx | 21 - connectivity/source/drivers/jdbc/Boolean.cxx | 11 connectivity/source/drivers/jdbc/Class.cxx | 20 - connectivity/source/drivers/jdbc/Date.cxx |7 connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx|8 connectivity/source/drivers/jdbc/Exception.cxx |6 connectivity/source/drivers/jdbc/Ref.cxx | 16 - connectivity/source/drivers/jdbc/SQLWarning.cxx|6 connectivity/source/drivers/jdbc/String.cxx| 14 - connectivity/source/drivers/jdbc/Throwable.cxx | 19 - connectivity/source/drivers/mork/MTables.cxx | 22 - connectivity/source/inc/RowFunctionParser.hxx | 16 - solenv/clang-format/excludelist| 23 - 24 files changed, 274 insertions(+), 379 deletions(-) New commits: commit 71b69ac75b623fc2f36c5c1a0ba632152aa101b8 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:52:36 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:13:58 2020 +0100 tdf#123936 Formatting files in module connectivity with clang-format Change-Id: I2c2f170c19663002637c702e9168c19c067ebbc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105656 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 9a4365abfcce..94dbfddb34f9 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -21,7 +21,6 @@ #include #include - using namespace connectivity; using namespace connectivity::ado; using namespace com::sun::star::uno; @@ -29,194 +28,184 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; - ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() { -if(m_pRecordSet) +if (m_pRecordSet) m_pRecordSet->Release(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize(sal_Int32 column) { sal_Int32 nSize = 0; -if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) nSize = (*m_mColumnsIter).second.getColumnDisplaySize(); -else if(m_pRecordSet) +else if (m_pRecordSet) { -WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); -if(aField.IsValid()) +WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]); +if (aField.IsValid()) nSize = aField.GetActualSize(); } return nSize; } - -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType(sal_Int32 column) { -sal_Int32 nType = 0; -if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +sal_Int32 nType = 0; +if (m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) nType = (*m_mColumnsIter).second.getColumnType(); -else if(m_pRecordSet) +else if (m_pRecordSet) { -WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); +WpADOField aField = ADOS::getField(m_pRecordSet, m_vMapping[column]); nType = ADOS::MapADOType2Jdbc(aField.GetADOType()); } return nType; } - -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( )
[Libreoffice-commits] core.git: cui/inc cui/qa cui/source solenv/clang-format
cui/inc/strings.hxx|2 - cui/qa/unit/cui-dialogs-test.cxx | 12 ++ cui/qa/unit/cui-dialogs-test_2.cxx |9 +--- cui/qa/unit/cui-dialogs-test_3.cxx |9 +--- cui/qa/unit/cui-dialogs-test_4.cxx |9 +--- cui/source/dialogs/cuiimapwnd.cxx | 12 ++ cui/source/dialogs/cuitbxform.cxx |6 +-- cui/source/dialogs/dlgname.cxx |5 +- cui/source/dialogs/newtabledlg.cxx |4 +- cui/source/dialogs/showcols.cxx| 25 ++--- cui/source/factory/cuiexp.cxx | 18 +++-- cui/source/factory/cuiresmgr.cxx |5 -- cui/source/inc/cuifmsearch.hxx | 55 - cui/source/inc/dlgname.hxx | 17 +++- cui/source/inc/headertablistbox.hxx|6 +-- cui/source/inc/hlmarkwn_def.hxx|6 +-- cui/source/inc/linkdlg.hxx | 32 cui/source/inc/optasian.hxx| 12 +++--- cui/source/inc/screenshotannotationdlg.hxx |6 +-- cui/source/options/tsaurls.cxx | 26 +++-- solenv/clang-format/excludelist| 20 -- 21 files changed, 128 insertions(+), 168 deletions(-) New commits: commit ec35fc62993111e4e7dd917e7dbc91ef82b02f74 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:53:37 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:12:03 2020 +0100 tdf#123936 Formatting files in module cui with clang-format Change-Id: I473e2950bb9bd53043feeae31a27ae0c2fc7801d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105659 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/cui/inc/strings.hxx b/cui/inc/strings.hxx index 616a5daa6bcb..5b72f3873df4 100644 --- a/cui/inc/strings.hxx +++ b/cui/inc/strings.hxx @@ -9,6 +9,6 @@ #pragma once -#define RID_SVXSTR_KEY_BASIC_PATH "BASIC" +#define RID_SVXSTR_KEY_BASIC_PATH "BASIC" /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx index f580644e37c9..85f6b5f55bbf 100644 --- a/cui/qa/unit/cui-dialogs-test.cxx +++ b/cui/qa/unit/cui-dialogs-test.cxx @@ -44,9 +44,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -CuiDialogsTest::CuiDialogsTest() -{ -} +CuiDialogsTest::CuiDialogsTest() {} void CuiDialogsTest::initialize() { @@ -67,19 +65,17 @@ VclPtr CuiDialogsTest::createDialogByID(sal_uInt32 nID) { VclPtr pReturnDialog; -switch ( nID ) +switch (nID) { case 0: // "cui/ui/formatcellsdialog.ui" { -pReturnDialog = mpFact->CreateSvxFormatCellsDialog( -nullptr, mxAttr.get(), *mxModel); +pReturnDialog = mpFact->CreateSvxFormatCellsDialog(nullptr, mxAttr.get(), *mxModel); break; } case 1: // "cui/ui/textdialog.ui" { -pReturnDialog = mpFact->CreateTextTabDialog( -nullptr, mxAttr.get(), nullptr); +pReturnDialog = mpFact->CreateTextTabDialog(nullptr, mxAttr.get(), nullptr); break; } diff --git a/cui/qa/unit/cui-dialogs-test_2.cxx b/cui/qa/unit/cui-dialogs-test_2.cxx index af1b27fc5b78..2f9b07f7d465 100644 --- a/cui/qa/unit/cui-dialogs-test_2.cxx +++ b/cui/qa/unit/cui-dialogs-test_2.cxx @@ -36,19 +36,14 @@ public: CPPUNIT_TEST_SUITE_END(); }; -CuiDialogsTest2::CuiDialogsTest2() -{ -} +CuiDialogsTest2::CuiDialogsTest2() {} void CuiDialogsTest2::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { // leave empty should be in CuiDialogTest if any } -VclPtr CuiDialogsTest2::createDialogByID(sal_uInt32 /*nID*/) -{ -return nullptr; -} +VclPtr CuiDialogsTest2::createDialogByID(sal_uInt32 /*nID*/) { return nullptr; } void CuiDialogsTest2::openAnyDialog() { diff --git a/cui/qa/unit/cui-dialogs-test_3.cxx b/cui/qa/unit/cui-dialogs-test_3.cxx index e369fd11fd39..9c3a09a8d240 100644 --- a/cui/qa/unit/cui-dialogs-test_3.cxx +++ b/cui/qa/unit/cui-dialogs-test_3.cxx @@ -36,19 +36,14 @@ public: CPPUNIT_TEST_SUITE_END(); }; -CuiDialogsTest3::CuiDialogsTest3() -{ -} +CuiDialogsTest3::CuiDialogsTest3() {} void CuiDialogsTest3::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { // leave empty should be in CuiDialogTest if any } -VclPtr CuiDialogsTest3::createDialogByID(sal_uInt32 /*nID*/) -{ -return nullptr; -} +VclPtr CuiDialogsTest3::createDialogByID(sal_uInt32 /*nID*/) { return nullptr; } void CuiDialogsTest3::openAnyDialog() { diff --git a/cui/qa/unit/cui-dialogs-test_4.cxx b/cui/qa/unit/cui-dialogs-test_4.cxx index 7183811b98f1..11820389968c 100644 --- a/cui/qa/unit/cui-dialogs-test_4.cxx +++ b/cui/qa/unit/cui-dialogs-test_4.cxx @@ -36,19 +36,14 @@ public: CPPUNIT_TEST_SUITE_END(); }; -CuiDialogsTest4::CuiDialogsTest4() -{ -} +CuiDialogsTest4::Cu
[Libreoffice-commits] core.git: comphelper/qa comphelper/source solenv/clang-format
comphelper/qa/unit/base64_test.cxx | 15 +++--- comphelper/qa/weakbag/test_weakbag.cxx | 19 comphelper/source/misc/fileurl.cxx |4 - comphelper/source/misc/random.cxx | 20 - comphelper/source/misc/simplefileaccessinteraction.cxx | 25 +-- comphelper/source/misc/types.cxx | 37 + solenv/clang-format/excludelist|6 -- 7 files changed, 52 insertions(+), 74 deletions(-) New commits: commit d66683f86a719b9961a076237aba07d6b4fea359 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:51:27 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:11:37 2020 +0100 tdf#123936 Formatting files in module comphelper with clang-format Change-Id: I01cf258f8fedb4d98f64d2a18735764463f1b2af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105653 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/comphelper/qa/unit/base64_test.cxx b/comphelper/qa/unit/base64_test.cxx index 97f7b78aae7a..dd89951e6430 100644 --- a/comphelper/qa/unit/base64_test.cxx +++ b/comphelper/qa/unit/base64_test.cxx @@ -30,12 +30,11 @@ using namespace css; -namespace { - +namespace +{ class Base64Test : public CppUnit::TestFixture { public: - void testBase64Encode(); void testBase64Decode(); void testBase64EncodeForOStringBuffer(); @@ -73,15 +72,18 @@ void Base64Test::testBase64Decode() uno::Sequence expectedSequence = { 0, 0, 0, 0, 0, 1, 2, 3 }; comphelper::Base64::decode(decodedSequence, "AAABAgM="); -CPPUNIT_ASSERT(std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); +CPPUNIT_ASSERT( +std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); expectedSequence = { 5, 2, 3, 0, 0, 1, 2, 3 }; comphelper::Base64::decode(decodedSequence, "BQIDAAABAgM="); -CPPUNIT_ASSERT(std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); +CPPUNIT_ASSERT( +std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); expectedSequence = { sal_Int8(sal_uInt8(200)), 31, 77, 111, 0, 1, 2, 3 }; comphelper::Base64::decode(decodedSequence, "yB9NbwABAgM="); -CPPUNIT_ASSERT(std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); +CPPUNIT_ASSERT( +std::equal(expectedSequence.begin(), expectedSequence.end(), decodedSequence.begin())); } void Base64Test::testBase64EncodeForOStringBuffer() @@ -105,7 +107,6 @@ void Base64Test::testBase64EncodeForOStringBuffer() } CPPUNIT_TEST_SUITE_REGISTRATION(Base64Test); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx index d58c12501633..b646ca7aef42 100644 --- a/comphelper/qa/weakbag/test_weakbag.cxx +++ b/comphelper/qa/weakbag/test_weakbag.cxx @@ -26,15 +26,17 @@ #include #include -namespace { - -class Test: public CppUnit::TestFixture { +namespace +{ +class Test : public CppUnit::TestFixture +{ public: -void test() { -css::uno::Reference< css::uno::XInterface > ref1(new cppu::OWeakObject); -css::uno::Reference< css::uno::XInterface > ref2(new cppu::OWeakObject); -css::uno::Reference< css::uno::XInterface > ref3(new cppu::OWeakObject); -comphelper::WeakBag< css::uno::XInterface > bag; +void test() +{ +css::uno::Reference ref1(new cppu::OWeakObject); +css::uno::Reference ref2(new cppu::OWeakObject); +css::uno::Reference ref3(new cppu::OWeakObject); +comphelper::WeakBag bag; bag.add(ref1); bag.add(ref1); bag.add(ref2); @@ -54,7 +56,6 @@ public: }; CPPUNIT_TEST_SUITE_REGISTRATION(Test); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/fileurl.cxx b/comphelper/source/misc/fileurl.cxx index 9abf1a97f62d..4f361ab4ba7a 100644 --- a/comphelper/source/misc/fileurl.cxx +++ b/comphelper/source/misc/fileurl.cxx @@ -22,8 +22,6 @@ #include #include -bool comphelper::isFileUrl(OUString const & url) { -return url.startsWithIgnoreAsciiCase("file:"); -} +bool comphelper::isFileUrl(OUString const& url) { return url.startsWithIgnoreAsciiCase("file:"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/random.cxx b/comphelper/source/misc/random.cxx index 260db3a544ca..ea9e7273756b 100644 --- a/comphelper/source/misc/random.cxx +++ b/comphelper/source/misc/random.cxx @@ -27,17 +27,16 @@ namespace comphelper::rng { - // underlying random number generator // std::mt19937 implements the Mersenne twister algorithm which // is fast and has good statistical properties, it produces integers // in the range of [0, 2^32-1] internally /
[Libreoffice-commits] core.git: 2 commits - basctl/inc basctl/source bridges/inc bridges/source solenv/clang-format
basctl/inc/iderdll.hxx |7 - basctl/source/basicide/basicmod.hxx |6 - basctl/source/basicide/brkdlg.cxx | 54 -- basctl/source/basicide/brkdlg.hxx | 12 -- basctl/source/basicide/linenumberwindow.cxx | 22 +--- basctl/source/basicide/linenumberwindow.hxx | 11 -- basctl/source/basicide/textwindowpeer.hxx | 13 +- basctl/source/dlged/dlgedmod.cxx| 12 -- basctl/source/inc/dlgedfac.hxx | 10 - basctl/source/inc/dlgedfunc.hxx | 44 +++- basctl/source/inc/dlgedlist.hxx | 30 ++--- basctl/source/inc/dlgedmod.hxx |8 - basctl/source/inc/dlgedpage.hxx | 12 -- basctl/source/inc/iderid.hxx|3 basctl/source/inc/layout.hxx| 58 +-- bridges/inc/types.hxx | 11 -- bridges/inc/vtables.hxx | 18 +-- bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx |7 - bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 105 +--- solenv/clang-format/excludelist | 19 --- 20 files changed, 196 insertions(+), 266 deletions(-) New commits: commit 79368f81028a05f1d3685f0052806d3f93cd2da8 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:49:31 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 15:11:21 2020 +0100 tdf#123936 Formatting files in module bridges with clang-format Change-Id: Ice8b5ff4ddde1b0eca19cf29c418e3281389926d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105648 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/bridges/inc/types.hxx b/bridges/inc/types.hxx index d35529342672..597d55909d09 100644 --- a/bridges/inc/types.hxx +++ b/bridges/inc/types.hxx @@ -22,8 +22,8 @@ #include #include -namespace bridges::cpp_uno::shared { - +namespace bridges::cpp_uno::shared +{ /** * Determines whether a type is a "simple" type (VOID, BOOLEAN, BYTE, SHORT, * UNSIGNED SHORT, LONG, UNSIGNED LONG, HYPER, UNSIGNED HYPER, FLOAT, DOUBLE, @@ -42,7 +42,7 @@ bool isSimpleType(typelib_TypeClass typeClass); * @param type a non-null pointer to a type description reference * @return true if the given type is "simple" */ -bool isSimpleType(typelib_TypeDescriptionReference const * type); +bool isSimpleType(typelib_TypeDescriptionReference const* type); /** * Determines whether a type is a "simple" type (VOID, BOOLEAN, BYTE, SHORT, @@ -52,7 +52,7 @@ bool isSimpleType(typelib_TypeDescriptionReference const * type); * @param type a non-null pointer to a type description * @return true if the given type is "simple" */ -bool isSimpleType(typelib_TypeDescription const * type); +bool isSimpleType(typelib_TypeDescription const* type); /** * Determines whether a type relates to an interface type (is itself an @@ -61,8 +61,7 @@ bool isSimpleType(typelib_TypeDescription const * type); * @param type a non-null pointer to a type description * @return true if the given type relates to an interface type */ -bool relatesToInterfaceType(typelib_TypeDescription const * type); - +bool relatesToInterfaceType(typelib_TypeDescription const* type); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/inc/vtables.hxx b/bridges/inc/vtables.hxx index 2dc604f0a64f..57ee58f53a85 100644 --- a/bridges/inc/vtables.hxx +++ b/bridges/inc/vtables.hxx @@ -22,8 +22,8 @@ #include #include -namespace bridges::cpp_uno::shared { - +namespace bridges::cpp_uno::shared +{ /** * Calculate the number of local functions of an interface type. * @@ -37,7 +37,7 @@ namespace bridges::cpp_uno::shared { * executed * @return the number of local functions of the given interface type */ -sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type); +sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const* type); /** * Calculate the number of primary functions of an interface type. @@ -51,12 +51,13 @@ sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type); * @return the number of primary functions of the given interface type, or zero * if the given interface type is null */ -sal_Int32 getPrimaryFunctions(typelib_InterfaceTypeDescription * type); +sal_Int32 getPrimaryFunctions(typelib_InterfaceTypeDescription* type); /** * Represents a vtable slot of a C++ class. */ -struct VtableSlot { +struct VtableSlot +{ /** * The offset of the vtable. * @@ -82,8 +83,7 @@ struct VtableSlot { * description * @return the vtable slot associated with the given interface member */ -VtableSlot getVtableSlot( -typelib_InterfaceAttributeTypeDescription const * ifcMember); +VtableSlot getVtableSlot(typelib_InterfaceAttributeTypeDescription c
[Libreoffice-commits] core.git: basic/inc basic/qa basic/source solenv/clang-format
basic/inc/global.hxx|5 - basic/inc/sb.hxx|4 basic/inc/sbxbase.hxx | 10 +- basic/inc/sbxfac.hxx|6 - basic/qa/cppunit/basictest.hxx | 10 +- basic/qa/cppunit/test_scanner.cxx | 143 basic/source/inc/errobject.hxx | 11 +- basic/source/inc/sbjsmeth.hxx |6 - basic/source/inc/sbjsmod.hxx| 10 +- basic/source/inc/stdobj.hxx | 11 +- basic/source/runtime/comenumwrapper.hxx | 10 +- basic/source/uno/modsizeexceeded.cxx| 19 ++-- solenv/clang-format/excludelist | 12 -- 13 files changed, 123 insertions(+), 134 deletions(-) New commits: commit 16389aae367ebfa8ce19f8ee1c26232fec7ff729 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:48:50 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 14:31:50 2020 +0100 tdf#123936 Formatting files in module basic with clang-format Change-Id: I87736d6f1a1d069c990b4e7b9ca291634ab4fb44 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105646 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/basic/inc/global.hxx b/basic/inc/global.hxx index aa101a562ced..0f380cad3fdd 100644 --- a/basic/inc/global.hxx +++ b/basic/inc/global.hxx @@ -9,8 +9,9 @@ #pragma once -namespace utl { -class TransliterationWrapper; +namespace utl +{ +class TransliterationWrapper; } class SbGlobal diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx index 4f3132fcf569..f94c52a6e045 100644 --- a/basic/inc/sb.hxx +++ b/basic/inc/sb.hxx @@ -22,8 +22,8 @@ #include // create object from user-type (+StringID+StringID) -SbxObject* createUserTypeImpl( const OUString& rClassName ); +SbxObject* createUserTypeImpl(const OUString& rClassName); -SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ); +SbxObject* cloneTypeObjectImpl(const SbxObject& rTypeObj); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx index 40255c485a8f..80552c2fbf08 100644 --- a/basic/inc/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -35,15 +35,15 @@ class SbxBasicFormater; // AppData structure for SBX: struct SbxAppData { -ErrCode eErrCode; // Error code -SbxVariableRef m_aGlobErr; // Global error object +ErrCode eErrCode; // Error code +SbxVariableRef m_aGlobErr; // Global error object std::vector m_Factories; // these are owned by fields in SbiGlobals -tools::SvRef mrImplRepository; +tools::SvRef mrImplRepository; // Pointer to Format()-Command helper class -std::unique_ptr pBasicFormater; +std::unique_ptr pBasicFormater; -LanguageTypeeBasicFormaterLangType; +LanguageType eBasicFormaterLangType; // It might be useful to store this class 'global' because some string resources are saved here SbxAppData(); diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx index 7e92f895adaf..28257b17a6d7 100644 --- a/basic/inc/sbxfac.hxx +++ b/basic/inc/sbxfac.hxx @@ -28,9 +28,9 @@ class SbxFactory { public: virtual ~SbxFactory(); -SbxFactory() {} -virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 ); -virtual SbxObject* CreateObject( const OUString& ); +SbxFactory() {} +virtual SbxBase* Create(sal_uInt16 nSbxId, sal_uInt32); +virtual SbxObject* CreateObject(const OUString&); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index f5fb79f557ba..c0afeb5bd18c 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -29,21 +29,21 @@ private: StarBASICRef mpBasic; void InitSnippet(); -void MakeModule( const OUString& sSource ); +void MakeModule(const OUString& sSource); public: -explicit MacroSnippet( const OUString& sSource ); +explicit MacroSnippet(const OUString& sSource); MacroSnippet(); -void LoadSourceFromFile( const OUString& sMacroFileURL ); +void LoadSourceFromFile(const OUString& sMacroFileURL); -SbxVariableRef Run( const css::uno::Sequence< css::uno::Any >& rArgs ); +SbxVariableRef Run(const css::uno::Sequence& rArgs); SbxVariableRef Run(); bool Compile(); -DECL_LINK( BasicErrorHdl, StarBASIC *, bool ); +DECL_LINK(BasicErrorHdl, StarBASIC*, bool); bool HasError() const; const ErrCode& getError() const; diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index 7515b0d07862..ed340755deba 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -19,22 +19,22 @@ namespace { - struct Symbol - { +struct Symbol +{ sal_uInt16 line; sal_uInt16 col1; OUString text; double number; SbxDataType type; bool ws; - }; +}; - /** +/** * Perform tests on Scanner.
[Libreoffice-commits] core.git: basegfx/test solenv/clang-format
basegfx/test/basegfx3d.cxx | 20 +--- basegfx/test/basegfxtools.cxx | 31 +++ basegfx/test/boxclipper.hxx |7 +++ solenv/clang-format/excludelist |3 --- 4 files changed, 23 insertions(+), 38 deletions(-) New commits: commit 0eaf2092940dc604926d31ef11b6ffb07abedc5a Author: Philipp Hofer AuthorDate: Thu Nov 12 12:48:28 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 14:29:07 2020 +0100 tdf#123936 Formatting files in module basegfx with clang-format Change-Id: I29bfa5de3bfd8ad2989cba0269f48f79edd58fd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105645 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index 279cc9a67756..b03560d6588e 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -22,16 +22,14 @@ namespace basegfx3d { - class b3dhommatrix : public CppUnit::TestFixture { public: - // insert your test code here. // this is only demonstration code void EmptyMethod() { - // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); +// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); } // Change the following lines only, if you add, remove or rename @@ -46,12 +44,11 @@ public: class b3dpoint : public CppUnit::TestFixture { public: - // insert your test code here. // this is only demonstration code void EmptyMethod() { - // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); +// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); } // Change the following lines only, if you add, remove or rename @@ -66,11 +63,8 @@ public: class b3drange : public CppUnit::TestFixture { public: - // insert your test code here. -void EmptyMethod() -{ -} +void EmptyMethod() {} // Change the following lines only, if you add, remove or rename // member functions of the current class, @@ -84,12 +78,11 @@ public: class b3dtuple : public CppUnit::TestFixture { public: - // insert your test code here. // this is only demonstration code void EmptyMethod() { - // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); +// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); } // Change the following lines only, if you add, remove or rename @@ -104,11 +97,8 @@ public: class b3dvector : public CppUnit::TestFixture { public: - // insert your test code here. -void EmptyMethod() -{ -} +void EmptyMethod() {} // Change the following lines only, if you add, remove or rename // member functions of the current class, diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index 7259a9980c70..a768357c13a5 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -28,7 +28,6 @@ using namespace ::basegfx; namespace basegfxtools { - class KeyStopLerpTest : public CppUnit::TestFixture { utils::KeyStopLerp maKeyStops; @@ -43,41 +42,41 @@ class KeyStopLerpTest : public CppUnit::TestFixture } public: -KeyStopLerpTest() : -maKeyStops(getTestVector()) -{} - +KeyStopLerpTest() +: maKeyStops(getTestVector()) +{ +} void test() { double fAlpha; std::ptrdiff_t nIndex; -std::tie(nIndex,fAlpha) = maKeyStops.lerp(-1.0); +std::tie(nIndex, fAlpha) = maKeyStops.lerp(-1.0); CPPUNIT_ASSERT_EQUAL_MESSAGE("-1.0", std::ptrdiff_t(0), nIndex); CPPUNIT_ASSERT_EQUAL_MESSAGE("-1.0", 0.0, fAlpha); -std::tie(nIndex,fAlpha) = maKeyStops.lerp(0.1); +std::tie(nIndex, fAlpha) = maKeyStops.lerp(0.1); CPPUNIT_ASSERT_EQUAL_MESSAGE("0.1", std::ptrdiff_t(0), nIndex); CPPUNIT_ASSERT_EQUAL_MESSAGE("0.1", 0.0, fAlpha); -std::tie(nIndex,fAlpha) = maKeyStops.lerp(0.3); +std::tie(nIndex, fAlpha) = maKeyStops.lerp(0.3); CPPUNIT_ASSERT_EQUAL_MESSAGE("0.3", std::ptrdiff_t(0), nIndex); -CPPUNIT_ASSERT_MESSAGE("0.3", fTools::equal(fAlpha,0.5)); +CPPUNIT_ASSERT_MESSAGE("0.3", fTools::equal(fAlpha, 0.5)); -std::tie(nIndex,fAlpha) = maKeyStops.lerp(0.5); +std::tie(nIndex, fAlpha) = maKeyStops.lerp(0.5); CPPUNIT_ASSERT_EQUAL_MESSAGE("0.5", std::ptrdiff_t(0), nIndex); -CPPUNIT_ASSERT_MESSAGE("0.5", fTools::equal(fAlpha,1.0)); +CPPUNIT_ASSERT_MESSAGE("0.5", fTools::equal(fAlpha, 1.0)); -std::tie(nIndex,fAlpha) = maKeyStops.lerp(0.51); +std::tie(nIndex, fAlpha) = maKeyStops.lerp(0.51); CPPUNIT_ASSERT_EQUAL_MESSAGE("0.51", std::ptrdiff_t(1), nIndex); -CPPUNIT_ASSERT_MESSAGE("0.51", fTools::equal(fAlpha,0.025)); +CPPUNIT_ASSERT_MESSAGE("0.51", fTools::equal(fAlpha, 0.025)); -std::tie(nIndex,fAlpha) = maKeyStops.lerp(0.9); +std::tie(nIndex, fAlpha) = maKeyS
[Libreoffice-commits] core.git: ios/LibreOfficeLight solenv/clang-format
ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h |2 -- solenv/clang-format/excludelist |1 - 2 files changed, 3 deletions(-) New commits: commit 26573395db55ddbd56d4dde39c8d5e5306c7a6ce Author: Philipp Hofer AuthorDate: Thu Nov 12 13:03:37 2020 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 13 14:26:28 2020 +0100 tdf#123936 Formatting files in module ios with clang-format Change-Id: I9ab70d93ce0bbb72683aca30e1122046abffe11b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105682 Tested-by: Christian Lohmaier Reviewed-by: Christian Lohmaier diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h index 67feadb801f3..5a4e07ffdc5e 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h +++ b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h @@ -6,8 +6,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. // - - // LibreOfficeKit is a prelink of all used LO libraries, generated // as its own xCode project. #define LOK_USE_UNSTABLE_API diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 4495c0572f2b..45d28f6d4a38 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7398,7 +7398,6 @@ io/test/stm/testfactreg.cxx io/test/stm/testfactreg.hxx io/test/testcomponent.cxx io/test/testconnection.cxx -ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h ios/source/LibreOfficeKit.c ios/source/LibreOfficeKit.h javaunohelper/source/bootstrap.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source solenv/clang-format
linguistic/source/hhconvdic.hxx | 19 --- solenv/clang-format/excludelist |1 - 2 files changed, 8 insertions(+), 12 deletions(-) New commits: commit 0d3fb848a2995a0869c4c5fa8916214a513865ac Author: Philipp Hofer AuthorDate: Thu Nov 12 13:06:00 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:23:21 2020 +0100 tdf#123936 Formatting files in module linguistic with clang-format Change-Id: I95755043ffb2756dce3e9ceb8f321b0cfa8dd70e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105689 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index ba7e671b5c58..107607be6d57 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -22,27 +22,24 @@ #include "convdic.hxx" - -class HHConvDic : -public ConvDic +class HHConvDic : public ConvDic { -HHConvDic(const HHConvDic &) = delete; -HHConvDic & operator = (const HHConvDic &) = delete; +HHConvDic(const HHConvDic&) = delete; +HHConvDic& operator=(const HHConvDic&) = delete; public: -HHConvDic( const OUString &rName, const OUString &rMainURL ); +HHConvDic(const OUString& rName, const OUString& rMainURL); virtual ~HHConvDic() override; // XConversionDictionary -virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) override; +virtual void SAL_CALL addEntry(const OUString& aLeftText, const OUString& aRightText) override; // XServiceInfo -virtual OUString SAL_CALL getImplementationName( ) override; -virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; -virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; +virtual OUString SAL_CALL getImplementationName() override; +virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; +virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index ab5083590fce..4495c0572f2b 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7526,7 +7526,6 @@ linguistic/source/dlistimp.hxx linguistic/source/gciterator.cxx linguistic/source/gciterator.hxx linguistic/source/hhconvdic.cxx -linguistic/source/hhconvdic.hxx linguistic/source/hyphdsp.cxx linguistic/source/hyphdsp.hxx linguistic/source/hyphdta.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source solenv/clang-format
lingucomponent/source/languageguessing/simpleguesser.hxx |4 ++-- solenv/clang-format/excludelist |1 - 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit f0126ffa6469d6c43f04596cb6f5ca83919ef8fc Author: Philipp Hofer AuthorDate: Thu Nov 12 13:05:40 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:22:27 2020 +0100 tdf#123936 Formatting files in module lingucomponent with clang-format Change-Id: Ia156fe8eb259fda0c23275fcaebc6b37790f11f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105688 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx index 34abf26d4fcf..ac9ef7a3a3a7 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.hxx +++ b/lingucomponent/source/languageguessing/simpleguesser.hxx @@ -29,7 +29,8 @@ using namespace std; -class SimpleGuesser final { +class SimpleGuesser final +{ public: /**inits the object with conf file "./conf.txt"*/ SimpleGuesser(); @@ -96,7 +97,6 @@ public: void SetDBPath(const char* thePathOfConfFile, const char* prefix); private: - //Where typical fingerprints (n-gram tables) are stored void* h; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 01d6908c98b8..ab5083590fce 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7502,7 +7502,6 @@ lingucomponent/source/languageguessing/guess.cxx lingucomponent/source/languageguessing/guess.hxx lingucomponent/source/languageguessing/guesslang.cxx lingucomponent/source/languageguessing/simpleguesser.cxx -lingucomponent/source/languageguessing/simpleguesser.hxx lingucomponent/source/lingutil/lingutil.cxx lingucomponent/source/lingutil/lingutil.hxx lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source solenv/clang-format
l10ntools/inc/cfglex.hxx|6 +++--- l10ntools/source/lngex.cxx | 17 - solenv/clang-format/excludelist |2 -- 3 files changed, 11 insertions(+), 14 deletions(-) New commits: commit 635bc2ea81fd9493a2997e89c2de5aa7d8405578 Author: Philipp Hofer AuthorDate: Thu Nov 12 13:04:58 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:21:52 2020 +0100 tdf#123936 Formatting files in module l10ntools with clang-format Change-Id: I5f8c2aec02e160a22e9ff484170303927f0c9c05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105686 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/l10ntools/inc/cfglex.hxx b/l10ntools/inc/cfglex.hxx index bc474a09bba7..af0324f64220 100644 --- a/l10ntools/inc/cfglex.hxx +++ b/l10ntools/inc/cfglex.hxx @@ -24,10 +24,10 @@ #include -extern "C" void workOnTokenSet( int, char* ); -extern "C" FILE * init(int, char **); +extern "C" void workOnTokenSet(int, char*); +extern "C" FILE* init(int, char**); -void yyerror(char const *); +void yyerror(char const*); #endif diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 0d8bc6b9361f..7435c063ed1c 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -23,21 +23,20 @@ #include -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) +{ common::HandledArgs aArgs; -if ( !common::handleArguments(argc, argv, aArgs) ) +if (!common::handleArguments(argc, argv, aArgs)) { -common::writeUsage("ulfex","*.ulf"); +common::writeUsage("ulfex", "*.ulf"); return 1; } -LngParser aParser( aArgs.m_sInputFile ); -if ( aArgs.m_bMergeMode ) -aParser.Merge( -aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage ); +LngParser aParser(aArgs.m_sInputFile); +if (aArgs.m_bMergeMode) +aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage); else -aParser.CreatePO( aArgs.m_sOutputFile ); +aParser.CreatePO(aArgs.m_sOutputFile); return 0; } diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 78ce6e8527d8..01d6908c98b8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7442,7 +7442,6 @@ jvmfwk/source/framework.hxx jvmfwk/source/fwkbase.cxx jvmfwk/source/fwkutil.cxx jvmfwk/source/libxmlutil.cxx -l10ntools/inc/cfglex.hxx l10ntools/inc/cfgmerge.hxx l10ntools/inc/common.hxx l10ntools/inc/export.hxx @@ -7462,7 +7461,6 @@ l10ntools/source/helper.cxx l10ntools/source/helpex.cxx l10ntools/source/helpmerge.cxx l10ntools/source/idxdict/idxdict.cxx -l10ntools/source/lngex.cxx l10ntools/source/lngmerge.cxx l10ntools/source/localize.cxx l10ntools/source/merge.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/source solenv/clang-format
jurt/source/pipe/staticsalhack.cxx |3 +-- solenv/clang-format/excludelist|1 - 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit dd6e0ab30a120512e39f0d9b2e422243deae7b5f Author: Philipp Hofer AuthorDate: Thu Nov 12 13:03:56 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:20:50 2020 +0100 tdf#123936 Formatting files in module jurt with clang-format Change-Id: I66fdaa39bb6f91fd04f01a39f3af0de6941b0070 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105683 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx index 2bcc53e85e9a..1f77ee9cba6e 100644 --- a/jurt/source/pipe/staticsalhack.cxx +++ b/jurt/source/pipe/staticsalhack.cxx @@ -70,8 +70,7 @@ // defined for ANDROID (in ANDROID-specific sal/textenc/tables.cxx); would even // work to leave it undefined for LINUX due to no '-z defs' under -fsanitize=* // (solenv/gbuild/platform/linux.mk), but not for MACOSX: -extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( -rtl_TextEncoding) +extern "C" ImplTextEncodingData const* sal_getFullTextEncodingData(rtl_TextEncoding) { std::abort(); } diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 881753235abc..78ce6e8527d8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7409,7 +7409,6 @@ javaunohelper/source/preload.cxx javaunohelper/source/vm.cxx javaunohelper/source/vm.hxx jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c -jurt/source/pipe/staticsalhack.cxx jurt/source/pipe/wrapper/wrapper.c jvmaccess/source/classpath.cxx jvmaccess/source/unovirtualmachine.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmaccess/workbench solenv/clang-format
jvmaccess/workbench/exceptiontest1.cxx |2 +- solenv/clang-format/excludelist|1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 6ef7a95285f4684113ee8d4e06eada8794f4daac Author: Philipp Hofer AuthorDate: Thu Nov 12 13:04:14 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:20:01 2020 +0100 tdf#123936 Formatting files in module jvmaccess with clang-format Change-Id: I91b108e4fe11add0edc2c1562080cd022d54d4e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105684 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/jvmaccess/workbench/exceptiontest1.cxx b/jvmaccess/workbench/exceptiontest1.cxx index 981fc1c5d033..adc2db719ff4 100644 --- a/jvmaccess/workbench/exceptiontest1.cxx +++ b/jvmaccess/workbench/exceptiontest1.cxx @@ -31,7 +31,7 @@ int main() { jvmaccess::VirtualMachine::AttachGuard aGuard(0); } -catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) +catch (jvmaccess::VirtualMachine::AttachGuard::CreationException&) { std::cout << "Exception caught" << std::endl; } diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 758f3be78967..881753235abc 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7414,7 +7414,6 @@ jurt/source/pipe/wrapper/wrapper.c jvmaccess/source/classpath.cxx jvmaccess/source/unovirtualmachine.cxx jvmaccess/source/virtualmachine.cxx -jvmaccess/workbench/exceptiontest1.cxx jvmaccess/workbench/javainfo/javainfotest.cxx jvmfwk/inc/elements.hxx jvmfwk/inc/fwkbase.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source solenv/clang-format
i18nlangtag/source/isolang/insys.cxx |3 +-- solenv/clang-format/excludelist |1 - 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit 9b88f814309ddf73f92327d526b1e43c813c1de1 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:59:49 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:18:49 2020 +0100 tdf#123936 Formatting files in module i18nlangtag with clang-format Change-Id: I221f9e46af1bfa729c0d38e6748a74af66fdece7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105677 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/i18nlangtag/source/isolang/insys.cxx b/i18nlangtag/source/isolang/insys.cxx index e6b58b56af8b..1bfe10d68ffc 100644 --- a/i18nlangtag/source/isolang/insys.cxx +++ b/i18nlangtag/source/isolang/insys.cxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if defined(_WIN32) #include "inwnt.cxx" -#elif defined( UNX ) +#elif defined(UNX) #include "inunx.cxx" diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 82f1cb4b4dc2..758f3be78967 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5030,7 +5030,6 @@ hwpfilter/source/precompile.h hwpfilter/source/solver.cxx hwpfilter/source/solver.h i18nlangtag/qa/cppunit/test_languagetag.cxx -i18nlangtag/source/isolang/insys.cxx i18nlangtag/source/isolang/inunx.cxx i18nlangtag/source/isolang/inwnt.cxx i18nlangtag/source/isolang/isolang.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: embeddedobj/source solenv/clang-format
embeddedobj/source/msole/advisesink.hxx | 12 ++-- embeddedobj/source/msole/closepreventer.cxx | 10 +- solenv/clang-format/excludelist |2 -- 3 files changed, 11 insertions(+), 13 deletions(-) New commits: commit 2c771b7b79a206987241b595712b9026fdcb5e89 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:55:22 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:17:42 2020 +0100 tdf#123936 Formatting files in module embeddedobj with clang-format Change-Id: If177567a6e5ac934dec11a4b873005f563d77689 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105664 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx index 1d54c20a14f0..cd1bc3892865 100644 --- a/embeddedobj/source/msole/advisesink.hxx +++ b/embeddedobj/source/msole/advisesink.hxx @@ -32,7 +32,7 @@ protected: OleComponent* m_pOleComp; public: -OleWrapperAdviseSink( OleComponent* pOleComp ); +OleWrapperAdviseSink(OleComponent* pOleComp); OleWrapperAdviseSink(); virtual ~OleWrapperAdviseSink(); @@ -41,11 +41,11 @@ public: STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; -STDMETHODIMP_(void) OnDataChange(FORMATETC *, STGMEDIUM *) override; -STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override; -STDMETHODIMP_(void) OnRename(IMoniker *) override; -STDMETHODIMP_(void) OnSave() override; -STDMETHODIMP_(void) OnClose() override; +STDMETHODIMP_(void) OnDataChange(FORMATETC*, STGMEDIUM*) override; +STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override; +STDMETHODIMP_(void) OnRename(IMoniker*) override; +STDMETHODIMP_(void) OnSave() override; +STDMETHODIMP_(void) OnClose() override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx index 00596030ace9..4669758982f8 100644 --- a/embeddedobj/source/msole/closepreventer.cxx +++ b/embeddedobj/source/msole/closepreventer.cxx @@ -22,21 +22,21 @@ #include #include -void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_Bool ) +void SAL_CALL OClosePreventer::queryClosing(const css::lang::EventObject&, sal_Bool) { throw css::util::CloseVetoException(); } -void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& ) +void SAL_CALL OClosePreventer::notifyClosing(const css::lang::EventObject&) { // just a disaster -OSL_FAIL( "The object can not be prevented from closing!" ); +OSL_FAIL("The object can not be prevented from closing!"); } -void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& ) +void SAL_CALL OClosePreventer::disposing(const css::lang::EventObject&) { // just a disaster -OSL_FAIL( "The object can not be prevented from closing!" ); +OSL_FAIL("The object can not be prevented from closing!"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 18e31bee0169..82f1cb4b4dc2 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3831,8 +3831,6 @@ embeddedobj/source/inc/specialobject.hxx embeddedobj/source/inc/targetstatecontrol.hxx embeddedobj/source/inc/xcreator.hxx embeddedobj/source/msole/advisesink.cxx -embeddedobj/source/msole/advisesink.hxx -embeddedobj/source/msole/closepreventer.cxx embeddedobj/source/msole/graphconvert.cxx embeddedobj/source/msole/graphconvert.hxx embeddedobj/source/msole/mtnotification.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source solenv/clang-format
drawinglayer/source/processor2d/getdigitlanguage.hxx |5 ++--- solenv/clang-format/excludelist |1 - 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit 4391c275df68b409a9bf7295934350bffd1abc00 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:54:44 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:16:46 2020 +0100 tdf#123936 Formatting files in module drawinglayer with clang-format Change-Id: I2dd9c385c89f05026227e82ce85cecbe36e2c51c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105662 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/drawinglayer/source/processor2d/getdigitlanguage.hxx b/drawinglayer/source/processor2d/getdigitlanguage.hxx index 743f1f5e9d83..c22076fa7cd0 100644 --- a/drawinglayer/source/processor2d/getdigitlanguage.hxx +++ b/drawinglayer/source/processor2d/getdigitlanguage.hxx @@ -13,11 +13,10 @@ #include -namespace drawinglayer::detail { - +namespace drawinglayer::detail +{ /// Get digit language derived from SvtCTLOptions LanguageType getDigitLanguage(); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 87223df0077a..18e31bee0169 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3651,7 +3651,6 @@ drawinglayer/source/primitive3d/transformprimitive3d.cxx drawinglayer/source/processor2d/baseprocessor2d.cxx drawinglayer/source/processor2d/contourextractor2d.cxx drawinglayer/source/processor2d/getdigitlanguage.cxx -drawinglayer/source/processor2d/getdigitlanguage.hxx drawinglayer/source/processor2d/hittestprocessor2d.cxx drawinglayer/source/processor2d/linegeometryextractor2d.cxx drawinglayer/source/processor2d/objectinfoextractor2d.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/inc solenv/clang-format
emfio/inc/emfiodllapi.h |4 ++-- solenv/clang-format/excludelist |1 - 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 80139bf7977d2e78e3c619956813893f5933f929 Author: Philipp Hofer AuthorDate: Thu Nov 12 12:55:59 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:16:14 2020 +0100 tdf#123936 Formatting files in module emfio with clang-format Change-Id: I5b0867630741713d08f533dc76c82bfb1cad9cbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105666 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/emfio/inc/emfiodllapi.h b/emfio/inc/emfiodllapi.h index 8a7cac187f25..af672949d434 100644 --- a/emfio/inc/emfiodllapi.h +++ b/emfio/inc/emfiodllapi.h @@ -23,9 +23,9 @@ #include #if defined(EMFIO_DLLIMPLEMENTATION) -#define EMFIO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define EMFIO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define EMFIO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define EMFIO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_EMFIO_INC_EMFIODLLAPI_H diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 40bf78f00e65..87223df0077a 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3889,7 +3889,6 @@ embedserv/source/inprocserv/dllentry.cxx embedserv/source/inprocserv/inprocembobj.cxx embedserv/source/inprocserv/inprocembobj.h embedserv/source/inprocserv/smartpointer.hxx -emfio/inc/emfiodllapi.h emfio/inc/emfreader.hxx emfio/inc/mtftools.hxx emfio/inc/wmfreader.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source solenv/clang-format
avmedia/source/inc/mediamisc.hxx |8 solenv/clang-format/excludelist |1 - 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit e05af8af958c9caa4bb7a4f6d8600ddf0a22c54b Author: Philipp Hofer AuthorDate: Thu Nov 12 12:47:49 2020 +0100 Commit: Mike Kaganski CommitDate: Fri Nov 13 08:10:09 2020 +0100 tdf#123936 Formatting files in module avmedia with clang-format Change-Id: I66738a8bb23bb547249aa74f1f710b76bd7df516 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105643 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 504a136aa5ce..71bce74e3d28 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -23,19 +23,19 @@ #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" #ifdef _WIN32 -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" #else #ifdef MACOSX -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF" #else -#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" +#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer" #endif #endif #define AVMEDIA_OPENGL_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_OpenGL" // Mime types -#define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media" +#define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media" inline OUString AvmResId(const char* pId) { diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index e0379086f6ea..40bf78f00e65 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -156,7 +156,6 @@ avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx -avmedia/source/inc/mediamisc.hxx avmedia/source/macavf/framegrabber.hxx avmedia/source/macavf/macavfcommon.hxx avmedia/source/macavf/manager.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source solenv/clang-format
accessibility/inc/helper/characterattributeshelper.hxx | 17 +-- accessibility/inc/standard/vclxaccessiblecombobox.hxx | 10 -- accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx |8 - accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx |7 - accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx|6 - accessibility/inc/standard/vclxaccessiblefixedtext.hxx |8 - accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 21 ++-- accessibility/inc/standard/vclxaccessiblelistbox.hxx |7 - accessibility/inc/standard/vclxaccessiblemenuseparator.hxx | 11 -- accessibility/inc/standard/vclxaccessiblepopupmenu.hxx | 14 +-- accessibility/source/helper/IComboListBoxHelper.cxx|6 - accessibility/source/helper/accresmgr.cxx |5 - accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx |7 - accessibility/source/standard/vclxaccessiblefixedtext.cxx | 16 +-- accessibility/source/standard/vclxaccessibleheaderbar.cxx | 45 -- accessibility/source/standard/vclxaccessiblemenuseparator.cxx | 21 solenv/clang-format/excludelist| 16 --- 17 files changed, 68 insertions(+), 157 deletions(-) New commits: commit b53fa6344d033f8b8f03b9274dbdd811251c2c1a Author: Philipp Hofer AuthorDate: Fri Nov 6 16:22:34 2020 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Nov 10 12:44:40 2020 +0100 tdf#123936 Formatting file in module accessibility with clang Change-Id: I9ac4df1ecc3ea1d48f3961fa95f34207dab8976e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105411 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index d6bfffc12375..a73ee76c09f2 100644 --- a/accessibility/inc/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -26,24 +26,19 @@ #include #include - - - class CharacterAttributesHelper { private: +typedef std::map AttributeMap; -typedef std::map< OUString, css::uno::Any > AttributeMap; - -AttributeMapm_aAttributeMap; +AttributeMap m_aAttributeMap; public: +CharacterAttributesHelper(const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor); -CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor ); - -std::vector< css::beans::PropertyValue > GetCharacterAttributes(); -css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ); +std::vector GetCharacterAttributes(); +css::uno::Sequence +GetCharacterAttributes(const css::uno::Sequence& aRequestedAttributes); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index af38cdcbae42..67c2ef93b139 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -21,24 +21,21 @@ #include - /** The accessible combobox has two children. The first is the text field represented by an object of the VCLXAccessibleEdit class. The second is the list containing all items and is represented by an object of the VCLXAccessibleList class which does not support selection at the moment. */ -class VCLXAccessibleComboBox final -: public VCLXAccessibleBox +class VCLXAccessibleComboBox final : public VCLXAccessibleBox { public: -VCLXAccessibleComboBox (VCLXWindow* pVCLXindow); +VCLXAccessibleComboBox(VCLXWindow* pVCLXindow); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; // Return combo box specific services. -virtual css::uno::Sequence< OUString > SAL_CALL -getSupportedServiceNames() override; +virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; private: virtual ~VCLXAccessibleComboBox() override = default; @@ -46,5 +43,4 @@ private: virtual bool IsValid() const override; }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 627cc0888d10..76c1c14594e9 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -31,20 +31,18 @@ class VCLXAccessibleDropDownComboBox final : public VCLXAccessibleBox { public: -VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow); +VCLXAccessibleDropDownComboBox(VCLXWindow* pVCLXindow); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override;
[Libreoffice-commits] core.git: solenv/clang-format
solenv/clang-format/excludelist | 149 -- solenv/clang-format/remove_not_existent_files_from_clang_excludelist | 37 ++ 2 files changed, 37 insertions(+), 149 deletions(-) New commits: commit e54c3b962e89689b34f96c717de730c8f1077b0f Author: Philipp Hofer AuthorDate: Fri Nov 6 14:12:05 2020 +0100 Commit: Miklos Vajna CommitDate: Fri Nov 6 21:05:22 2020 +0100 tdf#123936 Remove nonexisting files from excludelist. Many files do not exist, but are (still) referenced in 'solvenv/clang-format/excludelist'. This commit removes every file from this list which does not exist (anymore). Change-Id: I7da27ce0a16b66b5a59c27929fefe96476425cb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105407 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 5e167f6cb01b..696d9da298e8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -4,7 +4,6 @@ UnoControls/inc/multiplexer.hxx UnoControls/source/base/basecontainercontrol.cxx UnoControls/source/base/basecontrol.cxx UnoControls/source/base/multiplexer.cxx -UnoControls/source/base/registercontrols.cxx UnoControls/source/controls/OConnectionPointContainerHelper.cxx UnoControls/source/controls/OConnectionPointHelper.cxx UnoControls/source/controls/framecontrol.cxx @@ -171,7 +170,6 @@ avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx -avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/inc/mediamisc.hxx @@ -198,7 +196,6 @@ avmedia/source/vlc/vlcmanager.cxx avmedia/source/vlc/vlcmanager.hxx avmedia/source/vlc/vlcplayer.cxx avmedia/source/vlc/vlcplayer.hxx -avmedia/source/vlc/vlcuno.cxx avmedia/source/vlc/vlcwindow.cxx avmedia/source/vlc/vlcwindow.hxx avmedia/source/vlc/wrapper/Common.cxx @@ -218,7 +215,6 @@ avmedia/source/win/player.cxx avmedia/source/win/player.hxx avmedia/source/win/window.cxx avmedia/source/win/window.hxx -avmedia/source/win/winuno.cxx basctl/inc/helpids.h basctl/inc/iderdll.hxx basctl/inc/strings.hxx @@ -261,7 +257,6 @@ basctl/source/basicide/macrodlg.hxx basctl/source/basicide/moduldl2.cxx basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.hxx -basctl/source/basicide/register.cxx basctl/source/basicide/sbxitem.cxx basctl/source/basicide/scriptdocument.cxx basctl/source/basicide/textwindowpeer.hxx @@ -691,7 +686,6 @@ canvas/source/cairo/cairo_canvashelper_text.cxx canvas/source/cairo/cairo_devicehelper.cxx canvas/source/cairo/cairo_devicehelper.hxx canvas/source/cairo/cairo_repainttarget.hxx -canvas/source/cairo/cairo_services.cxx canvas/source/cairo/cairo_sprite.hxx canvas/source/cairo/cairo_spritecanvas.cxx canvas/source/cairo/cairo_spritecanvas.hxx @@ -821,7 +815,6 @@ canvas/source/vcl/impltools.cxx canvas/source/vcl/impltools.hxx canvas/source/vcl/outdevprovider.hxx canvas/source/vcl/repainttarget.hxx -canvas/source/vcl/services.cxx canvas/source/vcl/sprite.hxx canvas/source/vcl/spritecanvas.cxx canvas/source/vcl/spritecanvas.hxx @@ -1534,7 +1527,6 @@ comphelper/source/container/enumhelper.cxx comphelper/source/container/interfacecontainer2.cxx comphelper/source/container/namecontainer.cxx comphelper/source/eventattachermgr/eventattachermgr.cxx -comphelper/source/inc/comphelper_module.hxx comphelper/source/misc/SelectionMultiplex.cxx comphelper/source/misc/accessiblecomponenthelper.cxx comphelper/source/misc/accessiblecontexthelper.cxx @@ -1549,8 +1541,6 @@ comphelper/source/misc/anytostring.cxx comphelper/source/misc/asyncnotification.cxx comphelper/source/misc/backupfilehelper.cxx comphelper/source/misc/base64.cxx -comphelper/source/misc/comphelper_module.cxx -comphelper/source/misc/comphelper_services.cxx comphelper/source/misc/componentbase.cxx comphelper/source/misc/configuration.cxx comphelper/source/misc/configurationhelper.cxx @@ -1821,7 +1811,6 @@ configmgr/source/config_map.hxx configmgr/source/configurationprovider.cxx configmgr/source/configurationprovider.hxx configmgr/source/configurationregistry.cxx -configmgr/source/configurationregistry.hxx configmgr/source/data.cxx configmgr/source/data.hxx configmgr/source/dconf.cxx @@ -1850,20 +1839,16 @@ configmgr/source/partial.hxx configmgr/source/propertynode.cxx configmgr/source/propertynode.hxx configmgr/source/readonlyaccess.cxx -configmgr/source/readonlyaccess.hxx configmgr/source/readwriteaccess.cxx -configmgr/source/readwriteaccess.hxx configmgr/source/rootaccess.cxx configmgr/source/rootaccess.hxx configmgr/source/rootnode.cxx configmgr/source/rootnode.hxx -configmgr/source/services.cxx configmgr/source/setnode.cxx configmgr/source/setnode.hxx configmgr/source/type.cxx configmgr/source/type.hxx configmgr/source/upd