mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#123936 Formatting files in module editeng with clang-format

Browse Source 
Change-Id: I745057f4a6dc0d8103ed7fa29d0f662226a5cee5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105663
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer 2020-11-12 12:55:03 +01:00 committed by Christian Lohmaier
parent 5035f265cd
commit 32b57a159e
7 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editeng/inc/editeng.hxx
View File

@ -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: */

5
editeng/inc/editxml.hxx
View File

@ -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: */

17
editeng/inc/unopracc.hxx
View File

@ -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: */

5
editeng/source/items/svdfield.cxx
View File

@ -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
{

7
editeng/source/misc/edtdlg.cxx
View File

@ -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: */

32
editeng/source/misc/forbiddencharacterstable.cxx
View File

@ -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: */

6
solenv/clang-format/excludelist
View File

@ -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