summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-11-08 11:28:04 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-11-08 15:35:18 +0100
commitb536e10390c171e96b6477c04d66023a1da543c4 (patch)
tree4c04275831cea51f0a343d00e382f519a08bcd90 /include
parent958c09acc1058a4a0eba28ac94f2883fff64d600 (diff)
Retrofit "KeepEmptyLinesAtTheStartOfBlocks: false" into .clang-format
...even if that can cause reformatting of already formatted code. The problem I came across is that without this something like > namespace { > > void f1(); > > void f2(); > > } (which is quite a common style in the current code base) would be changed to > namespace > { > > void f1(); > > void f2(); > } instead of > namespace > { > void f1(); > > void f2(); > } and I found no other clang-format style option that would result in the presence or absence of an empty line be identical at the start and end of the namespace block. vmiklos asked to reformat the existing new (i.e., non-blacklisted) files at the same time, so this commit includes that. Some of those new files had not been formatted at all, so this commit includes their full reformatting changes. Change-Id: I54daf0c11098d07d02c802104cf7f56372e61f7c Reviewed-on: https://gerrit.libreoffice.org/44450 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/ClassificationCommon.hxx48
-rw-r--r--include/test/sheet/xsheetcellrange.hxx1
-rw-r--r--include/test/sheet/xsheetcellrangecontainer.hxx1
-rw-r--r--include/test/sheet/xsheetcellranges.hxx1
-rw-r--r--include/test/sheet/xsheetcondition.hxx1
-rw-r--r--include/test/sheet/xsheetconditionalentries.hxx1
-rw-r--r--include/test/sheet/xsheetconditionalentry.hxx1
-rw-r--r--include/tools/XmlWalker.hxx4
-rw-r--r--include/tools/XmlWriter.hxx6
9 files changed, 32 insertions, 32 deletions
diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx
index 2276c962532d..eb8d864ff21b 100644
--- a/include/svx/ClassificationCommon.hxx
+++ b/include/svx/ClassificationCommon.hxx
@@ -18,27 +18,33 @@
#include <sfx2/classificationhelper.hxx>
#include <com/sun/star/beans/XPropertyContainer.hpp>
-namespace svx {
-namespace classification {
-
-SVX_DLLPUBLIC OUString convertClassificationResultToString(std::vector<svx::ClassificationResult> const & rResults);
-
-SVX_DLLPUBLIC OUString getProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer,
- OUString const & rName);
-
-SVX_DLLPUBLIC bool containsProperty(css::uno::Sequence<css::beans::Property> const & rProperties,
- OUString const & rName);
-
-SVX_DLLPUBLIC void removeAllProperties(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer);
-
-SVX_DLLPUBLIC bool addOrInsertDocumentProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer,
- OUString const & rsKey, OUString const & rsValue);
-
-SVX_DLLPUBLIC void insertFullTextualRepresentationAsDocumentProperty(css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer,
- sfx::ClassificationKeyCreator const & rKeyCreator,
- std::vector<svx::ClassificationResult> const & rResults);
-
-}} // end svx::classification namespace
+namespace svx
+{
+namespace classification
+{
+SVX_DLLPUBLIC OUString
+convertClassificationResultToString(std::vector<svx::ClassificationResult> const& rResults);
+
+SVX_DLLPUBLIC OUString
+getProperty(css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer,
+ OUString const& rName);
+
+SVX_DLLPUBLIC bool containsProperty(css::uno::Sequence<css::beans::Property> const& rProperties,
+ OUString const& rName);
+
+SVX_DLLPUBLIC void
+removeAllProperties(css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer);
+
+SVX_DLLPUBLIC bool addOrInsertDocumentProperty(
+ css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer,
+ OUString const& rsKey, OUString const& rsValue);
+
+SVX_DLLPUBLIC void insertFullTextualRepresentationAsDocumentProperty(
+ css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer,
+ sfx::ClassificationKeyCreator const& rKeyCreator,
+ std::vector<svx::ClassificationResult> const& rResults);
+}
+} // end svx::classification namespace
#endif // INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX
diff --git a/include/test/sheet/xsheetcellrange.hxx b/include/test/sheet/xsheetcellrange.hxx
index 5f44d21dd0dd..42ce2d094c4c 100644
--- a/include/test/sheet/xsheetcellrange.hxx
+++ b/include/test/sheet/xsheetcellrange.hxx
@@ -17,7 +17,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetCellRange
{
public:
diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx
index f87d80a78a47..8164da251975 100644
--- a/include/test/sheet/xsheetcellrangecontainer.hxx
+++ b/include/test/sheet/xsheetcellrangecontainer.hxx
@@ -20,7 +20,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer
{
public:
diff --git a/include/test/sheet/xsheetcellranges.hxx b/include/test/sheet/xsheetcellranges.hxx
index 2024ec5f25e9..4f21f446c21f 100644
--- a/include/test/sheet/xsheetcellranges.hxx
+++ b/include/test/sheet/xsheetcellranges.hxx
@@ -17,7 +17,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetCellRanges
{
public:
diff --git a/include/test/sheet/xsheetcondition.hxx b/include/test/sheet/xsheetcondition.hxx
index c25eae86858c..c69625f445de 100644
--- a/include/test/sheet/xsheetcondition.hxx
+++ b/include/test/sheet/xsheetcondition.hxx
@@ -17,7 +17,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetCondition
{
public:
diff --git a/include/test/sheet/xsheetconditionalentries.hxx b/include/test/sheet/xsheetconditionalentries.hxx
index 25a51325ea87..673e7ceb1784 100644
--- a/include/test/sheet/xsheetconditionalentries.hxx
+++ b/include/test/sheet/xsheetconditionalentries.hxx
@@ -20,7 +20,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetConditionalEntries
{
public:
diff --git a/include/test/sheet/xsheetconditionalentry.hxx b/include/test/sheet/xsheetconditionalentry.hxx
index 775c55b5858b..d143f784342e 100644
--- a/include/test/sheet/xsheetconditionalentry.hxx
+++ b/include/test/sheet/xsheetconditionalentry.hxx
@@ -17,7 +17,6 @@
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XSheetConditionalEntry
{
public:
diff --git a/include/tools/XmlWalker.hxx b/include/tools/XmlWalker.hxx
index 4d4bc88f363c..85507f46583d 100644
--- a/include/tools/XmlWalker.hxx
+++ b/include/tools/XmlWalker.hxx
@@ -14,8 +14,8 @@
#include <tools/stream.hxx>
#include <memory>
-namespace tools {
-
+namespace tools
+{
struct XmlWalkerImpl;
/**
diff --git a/include/tools/XmlWriter.hxx b/include/tools/XmlWriter.hxx
index c454f4139803..15a3a0013912 100644
--- a/include/tools/XmlWriter.hxx
+++ b/include/tools/XmlWriter.hxx
@@ -14,8 +14,8 @@
#include <tools/stream.hxx>
#include <memory>
-namespace tools {
-
+namespace tools
+{
struct XmlWriterImpl;
/**
@@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC XmlWriter final
{
private:
std::unique_ptr<XmlWriterImpl> mpImpl;
-public:
+public:
XmlWriter(SvStream* pStream);
~XmlWriter();