[Libreoffice-commits] core.git: editeng/inc editeng/source solenv/clang-format
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 13 14:17:00 UTC 2020
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 <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:55:03 2020 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
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 <lohmaier+LibreOffice at googlemail.com>
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_AUTOSTART 2000
-#define MN_DICTSTART 3000
+#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 <editeng/unotext.hxx>
-
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<css::text::XText> 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<css::uno::Type> SAL_CALL getTypes() override;
+ virtual css::uno::Sequence<sal_Int8> 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 <editeng/measfld.hxx>
-SdrMeasureField::~SdrMeasureField()
-{
-}
+SdrMeasureField::~SdrMeasureField() {}
std::unique_ptr<SvxFieldData> SdrMeasureField::Clone() const
{
diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx
index 9a871d88f660..a3f4390ab09b 100644
--- a/editeng/source/misc/edtdlg.cxx
+++ b/editeng/source/misc/edtdlg.cxx
@@ -17,16 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editeng/edtdlg.hxx>
EditAbstractDialogFactory* EditAbstractDialogFactory::Create()
{
- return dynamic_cast <EditAbstractDialogFactory*>( VclAbstractDialogFactory::Create() );
+ return dynamic_cast<EditAbstractDialogFactory*>(VclAbstractDialogFactory::Create());
}
-EditAbstractDialogFactory::~EditAbstractDialogFactory()
-{
-}
+EditAbstractDialogFactory::~EditAbstractDialogFactory() {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index dc6f4d8c9d18..942af2f04527 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -17,44 +17,48 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editeng/forbiddencharacterstable.hxx>
#include <unotools/localedatawrapper.hxx>
-SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
+SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
: m_xContext(rxContext)
{
}
-std::shared_ptr<SvxForbiddenCharactersTable> SvxForbiddenCharactersTable::makeForbiddenCharactersTable(const css::uno::Reference< css::uno::XComponentContext>& rxContext)
+std::shared_ptr<SvxForbiddenCharactersTable>
+SvxForbiddenCharactersTable::makeForbiddenCharactersTable(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
{
return std::shared_ptr<SvxForbiddenCharactersTable>(new SvxForbiddenCharactersTable(rxContext));
}
-const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( LanguageType nLanguage, bool bGetDefault )
+const css::i18n::ForbiddenCharacters*
+SvxForbiddenCharactersTable::GetForbiddenCharacters(LanguageType nLanguage, bool bGetDefault)
{
css::i18n::ForbiddenCharacters* pForbiddenCharacters = nullptr;
- Map::iterator it = maMap.find( nLanguage );
- if ( it != maMap.end() )
+ Map::iterator it = maMap.find(nLanguage);
+ if (it != maMap.end())
pForbiddenCharacters = &(it->second);
- else if ( bGetDefault && m_xContext.is() )
+ else if (bGetDefault && m_xContext.is())
{
- LocaleDataWrapper aWrapper( m_xContext, LanguageTag( nLanguage ) );
- maMap[ nLanguage ] = aWrapper.getForbiddenCharacters();
- pForbiddenCharacters = &maMap[ nLanguage ];
+ LocaleDataWrapper aWrapper(m_xContext, LanguageTag(nLanguage));
+ maMap[nLanguage] = aWrapper.getForbiddenCharacters();
+ pForbiddenCharacters = &maMap[nLanguage];
}
return pForbiddenCharacters;
}
-void SvxForbiddenCharactersTable::SetForbiddenCharacters( LanguageType nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars )
+void SvxForbiddenCharactersTable::SetForbiddenCharacters(
+ LanguageType nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars)
{
- maMap[ nLanguage ] = rForbiddenChars;
+ maMap[nLanguage] = rForbiddenChars;
}
-void SvxForbiddenCharactersTable::ClearForbiddenCharacters( LanguageType nLanguage )
+void SvxForbiddenCharactersTable::ClearForbiddenCharacters(LanguageType nLanguage)
{
- maMap.erase( nLanguage );
+ maMap.erase(nLanguage);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3ae634007501..aeb4e8919dba 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3571,13 +3571,10 @@ drawinglayer/source/tools/wmfemfhelper.cxx
editeng/inc/AccessibleStringWrap.hxx
editeng/inc/editattr.hxx
editeng/inc/editdoc.hxx
-editeng/inc/editeng.hxx
-editeng/inc/editxml.hxx
editeng/inc/edtspell.hxx
editeng/inc/eerdll2.hxx
editeng/inc/helpids.h
editeng/inc/unomodel.hxx
-editeng/inc/unopracc.hxx
editeng/qa/items/borderline_test.cxx
editeng/qa/lookuptree/lookuptree_test.cxx
editeng/qa/unit/core-test.cxx
@@ -3636,7 +3633,6 @@ editeng/source/items/numitem.cxx
editeng/source/items/optitems.cxx
editeng/source/items/paperinf.cxx
editeng/source/items/paraitem.cxx
-editeng/source/items/svdfield.cxx
editeng/source/items/svxfont.cxx
editeng/source/items/textitem.cxx
editeng/source/items/writingmodeitem.cxx
@@ -3649,8 +3645,6 @@ editeng/source/misc/SvXMLAutoCorrectImport.hxx
editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
editeng/source/misc/acorrcfg.cxx
-editeng/source/misc/edtdlg.cxx
-editeng/source/misc/forbiddencharacterstable.cxx
editeng/source/misc/hangulhanja.cxx
editeng/source/misc/splwrap.cxx
editeng/source/misc/svxacorr.cxx
More information about the Libreoffice-commits
mailing list