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 <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:10:28 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
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 <lohmaier+libreoff...@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
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 <sal/types.h>
#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<container::XContainerListener>& xListener)
{
aContainerListeners.addInterface(xListener);
}
-void OReportControlModel::removeContainerListener( const uno::Reference<
container::XContainerListener >& xListener )
+void OReportControlModel::removeContainerListener(
+ const uno::Reference<container::XContainerListener>& 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<report::XFormatCondition> xElement(Element,uno::UNO_QUERY);
- if ( !xElement.is() )
+ uno::Reference<report::XFormatCondition> xElement(Element, uno::UNO_QUERY);
+ if (!xElement.is())
throw lang::IllegalArgumentException();
- uno::Reference< container::XContainer > xBroadcaster;
+ uno::Reference<container::XContainer> xBroadcaster;
{
::osl::MutexGuard aGuard(m_rMutex);
xBroadcaster = m_pOwner;
- if ( Index > static_cast<sal_Int32>(m_aFormatConditions.size()) )
+ if (Index > static_cast<sal_Int32>(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<container::XContainer> xBroadcaster;
{
::osl::MutexGuard aGuard(m_rMutex);
xBroadcaster = m_pOwner;
@@ -76,16 +78,16 @@ void OReportControlModel::removeByIndex( ::sal_Int32 Index )
m_aFormatConditions.erase(m_aFormatConditions.begin() + Index);
}
container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index),
Element, uno::Any());
-
aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
+
aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,
aEvent);
}
// XIndexReplace
-void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any&
Element )
+void OReportControlModel::replaceByIndex(::sal_Int32 Index, const uno::Any&
Element)
{
- uno::Reference<report::XFormatCondition> xElement(Element,uno::UNO_QUERY);
- if ( !xElement.is() )
+ uno::Reference<report::XFormatCondition> xElement(Element, uno::UNO_QUERY);
+ if (!xElement.is())
throw lang::IllegalArgumentException();
- uno::Reference< container::XContainer > xBroadcaster;
+ uno::Reference<container::XContainer> xBroadcaster;
{
::osl::MutexGuard aGuard(m_rMutex);
xBroadcaster = m_pOwner;
@@ -93,17 +95,17 @@ void OReportControlModel::replaceByIndex( ::sal_Int32
Index, const uno::Any& Ele
m_aFormatConditions[Index] = xElement;
}
container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index),
Element, uno::Any());
-
aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
+
aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,
aEvent);
}
// XIndexAccess
-::sal_Int32 OReportControlModel::getCount( )
+::sal_Int32 OReportControlModel::getCount()
{
::osl::MutexGuard aGuard(m_rMutex);
return m_aFormatConditions.size();
}
-uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index )
+uno::Any OReportControlModel::getByIndex(::sal_Int32 Index)
{
uno::Any aElement;
{
@@ -116,13 +118,14 @@ uno::Any OReportControlModel::getByIndex( ::sal_Int32
Index )
void OReportControlModel::checkIndex(sal_Int32 _nIndex)
{
- if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFormatConditions.size()) <=
_nIndex )
+ if (_nIndex < 0 || static_cast<sal_Int32>(m_aFormatConditions.size()) <=
_nIndex)
throw lang::IndexOutOfBoundsException();
}
bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType)
{
- return (_rType == cppu::UnoType<beans::XPropertyState>::get()|| _rType ==
cppu::UnoType<beans::XMultiPropertySet>::get());
+ return (_rType == cppu::UnoType<beans::XPropertyState>::get()
+ || _rType == cppu::UnoType<beans::XMultiPropertySet>::get());
}
} // reportdesign
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx
b/reportdesign/source/core/api/ReportVisitor.cxx
index f8129ed673be..3e62fd69e93c 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -26,66 +26,65 @@ namespace reportdesign
using namespace com::sun::star;
OReportVisitor::OReportVisitor(ITraverseReport* _pTraverseReport)
- :m_pTraverseReport(_pTraverseReport)
+ : m_pTraverseReport(_pTraverseReport)
{
- OSL_ENSURE(m_pTraverseReport,"ReportDefinition must be not NULL!");
+ OSL_ENSURE(m_pTraverseReport, "ReportDefinition must be not NULL!");
}
-void OReportVisitor::start(const uno::Reference< report::XReportDefinition>&
_xReportDefinition)
+void OReportVisitor::start(const uno::Reference<report::XReportDefinition>&
_xReportDefinition)
{
- OSL_ENSURE(_xReportDefinition.is(),"ReportDefinition is NULL!");
- if ( !_xReportDefinition.is() )
+ OSL_ENSURE(_xReportDefinition.is(), "ReportDefinition is NULL!");
+ if (!_xReportDefinition.is())
return;
m_pTraverseReport->traverseReport(_xReportDefinition);
m_pTraverseReport->traverseReportFunctions(_xReportDefinition->getFunctions());
- if ( _xReportDefinition->getPageHeaderOn() )
+ if (_xReportDefinition->getPageHeaderOn())
m_pTraverseReport->traversePageHeader(_xReportDefinition->getPageHeader());
- if ( _xReportDefinition->getReportHeaderOn() )
+ if (_xReportDefinition->getReportHeaderOn())
m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader());
- uno::Reference< report::XGroups > xGroups =
_xReportDefinition->getGroups();
+ uno::Reference<report::XGroups> xGroups = _xReportDefinition->getGroups();
m_pTraverseReport->traverseGroups(xGroups);
const sal_Int32 nCount = xGroups->getCount();
sal_Int32 i = 0;
- for (;i<nCount ; ++i)
+ for (; i < nCount; ++i)
{
- uno::Reference< report::XGroup >
xGroup(xGroups->getByIndex(i),uno::UNO_QUERY);
+ uno::Reference<report::XGroup> xGroup(xGroups->getByIndex(i),
uno::UNO_QUERY);
m_pTraverseReport->traverseGroup(xGroup);
m_pTraverseReport->traverseGroupFunctions(xGroup->getFunctions());
- if ( xGroup->getHeaderOn() )
+ if (xGroup->getHeaderOn())
m_pTraverseReport->traverseGroupHeader(xGroup->getHeader());
}
m_pTraverseReport->traverseDetail(_xReportDefinition->getDetail());
- for (i = 0;i<nCount ; ++i)
+ for (i = 0; i < nCount; ++i)
{
- uno::Reference< report::XGroup >
xGroup(xGroups->getByIndex(i),uno::UNO_QUERY);
- if ( xGroup->getFooterOn() )
+ uno::Reference<report::XGroup> xGroup(xGroups->getByIndex(i),
uno::UNO_QUERY);
+ if (xGroup->getFooterOn())
m_pTraverseReport->traverseGroupFooter(xGroup->getFooter());
}
- if ( _xReportDefinition->getPageFooterOn() )
+ if (_xReportDefinition->getPageFooterOn())
m_pTraverseReport->traversePageFooter(_xReportDefinition->getPageFooter());
- if ( _xReportDefinition->getReportFooterOn() )
+ if (_xReportDefinition->getReportFooterOn())
m_pTraverseReport->traverseReportFooter(_xReportDefinition->getReportFooter());
}
-void OReportVisitor::start(const uno::Reference< report::XGroup>& _xGroup)
+void OReportVisitor::start(const uno::Reference<report::XGroup>& _xGroup)
{
- OSL_ENSURE(_xGroup.is(),"Group is NULL!");
- if ( !_xGroup.is() )
+ OSL_ENSURE(_xGroup.is(), "Group is NULL!");
+ if (!_xGroup.is())
return;
m_pTraverseReport->traverseGroup(_xGroup);
m_pTraverseReport->traverseGroupFunctions(_xGroup->getFunctions());
- if ( _xGroup->getHeaderOn() )
+ if (_xGroup->getHeaderOn())
m_pTraverseReport->traverseGroupHeader(_xGroup->getHeader());
- if ( _xGroup->getFooterOn() )
+ if (_xGroup->getFooterOn())
m_pTraverseReport->traverseGroupFooter(_xGroup->getFooter());
}
} // namespace reportdesign
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/resource/core_resource.cxx
b/reportdesign/source/core/resource/core_resource.cxx
index 193ae41cb559..d809249c9b78 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -19,9 +19,6 @@
#include <core_resource.hxx>
#include <unotools/resmgr.hxx>
-OUString RptResId(const char* pId)
-{
- return Translate::get(pId, Translate::Create("rpt"));
-}
+OUString RptResId(const char* pId) { return Translate::get(pId,
Translate::Create("rpt")); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
index 3c49c39fa674..3279629fa115 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
@@ -20,23 +20,16 @@
#include "xmlPropertyHandler.hxx"
#include <xmloff/txtimp.hxx>
-
namespace rptxml
{
+using namespace ::com::sun::star;
+using namespace xmloff;
+using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
- using namespace xmloff;
- using namespace ::com::sun::star::uno;
-
-OXMLRptPropHdlFactory::OXMLRptPropHdlFactory()
-{
-}
-
-OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory()
-{
-}
+OXMLRptPropHdlFactory::OXMLRptPropHdlFactory() {}
-}// rptxml
+OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory() {}
+} // rptxml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx
b/reportdesign/source/ui/inc/dlgedclip.hxx
index 54a0baab3a3a..0290a0293f94 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -25,7 +25,6 @@
namespace rptui
{
-
// OReportExchange
/** \class OReportExchange
@@ -37,14 +36,14 @@ namespace rptui
class OReportExchange : public TransferableHelper
{
public:
- typedef css::uno::Sequence< css::beans::NamedValue > TSectionElements;
+ typedef css::uno::Sequence<css::beans::NamedValue> TSectionElements;
/** Constructs a new exchange object with section elements
*
* \param _rCopyElements the elements to copy. Each section is one entry.
The value must be a sequence of elements.
* \return
*/
- OReportExchange( const TSectionElements& _rCopyElements);
+ OReportExchange(const TSectionElements& _rCopyElements);
/** checks whether or not a descriptor can be extracted from the data
flavor vector given
*
@@ -52,7 +51,7 @@ public:
available flavors
* \return
*/
- static bool canExtract(const DataFlavorExVector& _rFlavors);
+ static bool canExtract(const DataFlavorExVector& _rFlavors);
/** extract the section elements
*
@@ -69,10 +68,12 @@ public:
protected:
// TransferableHelper overridables
- virtual void AddSupportedFormats() override;
- virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const
OUString& rDestDoc ) override;
+ virtual void AddSupportedFormats() override;
+ virtual bool GetData(const css::datatransfer::DataFlavor& rFlavor,
+ const OUString& rDestDoc) override;
+
private:
- TSectionElements m_aCopyElements;
+ TSectionElements m_aCopyElements;
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx
b/reportdesign/source/ui/inc/dlgedfac.hxx
index f35d657575d6..6a79ef7805af 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -20,13 +20,11 @@
#ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
-
#include <svx/svdobj.hxx>
#include <tools/link.hxx>
namespace rptui
{
-
// DlgEdFactory
class DlgEdFactory
@@ -35,7 +33,7 @@ public:
DlgEdFactory();
~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;
- DECL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams,
SdrObject* );
+ DECL_STATIC_LINK(DlgEdFactory, MakeObject, SdrObjCreatorParams,
SdrObject*);
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx
b/reportdesign/source/ui/inc/dlgpage.hxx
index 5bebf0958945..0e40bd0c64e6 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -32,12 +32,11 @@ class ORptPageDialog : public SfxTabDialogController
{
private:
ORptPageDialog(const ORptPageDialog&) = delete;
- void operator =(const ORptPageDialog&) = delete;
+ void operator=(const ORptPageDialog&) = delete;
public:
-
- ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const
OUString &rDialog);
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const
OUString& rDialog);
+ virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
};
} // namespace rptui
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2b65b34c8e01..34d6c2190f5d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -8031,11 +8031,9 @@ reportdesign/inc/RptPage.hxx
reportdesign/inc/UndoActions.hxx
reportdesign/inc/UndoEnv.hxx
reportdesign/inc/conditionalexpression.hxx
-reportdesign/inc/dllapi.h
reportdesign/inc/helpids.h
reportdesign/inc/reportformula.hxx
reportdesign/inc/strings.hxx
-reportdesign/qa/unit/reportdesign-dialogs-test.cxx
reportdesign/source/core/api/FixedLine.cxx
reportdesign/source/core/api/FixedText.cxx
reportdesign/source/core/api/FormatCondition.cxx
@@ -8046,10 +8044,8 @@ reportdesign/source/core/api/Group.cxx
reportdesign/source/core/api/Groups.cxx
reportdesign/source/core/api/ImageControl.cxx
reportdesign/source/core/api/ReportComponent.cxx
-reportdesign/source/core/api/ReportControlModel.cxx
reportdesign/source/core/api/ReportDefinition.cxx
reportdesign/source/core/api/ReportEngineJFree.cxx
-reportdesign/source/core/api/ReportVisitor.cxx
reportdesign/source/core/api/Section.cxx
reportdesign/source/core/api/Shape.cxx
reportdesign/source/core/api/Tools.cxx
@@ -8076,7 +8072,6 @@ reportdesign/source/core/inc/conditionupdater.hxx
reportdesign/source/core/misc/conditionalexpression.cxx
reportdesign/source/core/misc/conditionupdater.cxx
reportdesign/source/core/misc/reportformula.cxx
-reportdesign/source/core/resource/core_resource.cxx
reportdesign/source/core/sdr/PropertyForward.cxx
reportdesign/source/core/sdr/ReportDrawPage.cxx
reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -8125,7 +8120,6 @@
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
reportdesign/source/filter/xml/xmlMasterFields.cxx
reportdesign/source/filter/xml/xmlMasterFields.hxx
-reportdesign/source/filter/xml/xmlPropertyHandler.cxx
reportdesign/source/filter/xml/xmlPropertyHandler.hxx
reportdesign/source/filter/xml/xmlReport.cxx
reportdesign/source/filter/xml/xmlReport.hxx
@@ -8189,10 +8183,7 @@ reportdesign/source/ui/inc/SectionWindow.hxx
reportdesign/source/ui/inc/StartMarker.hxx
reportdesign/source/ui/inc/UITools.hxx
reportdesign/source/ui/inc/ViewsWindow.hxx
-reportdesign/source/ui/inc/dlgedclip.hxx
-reportdesign/source/ui/inc/dlgedfac.hxx
reportdesign/source/ui/inc/dlgedfunc.hxx
-reportdesign/source/ui/inc/dlgpage.hxx
reportdesign/source/ui/inc/metadata.hxx
reportdesign/source/ui/inc/propbrw.hxx
reportdesign/source/ui/inc/statusbarcontroller.hxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
