summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-01 14:52:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-03 09:21:51 +0200
commit47cd34a60ff9048404075823e519f1abdd4b0e9a (patch)
treee9728dd7c686d23f90b4331f105d6f5f8c1176cd /include/editeng
parentc79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff)
use more compact namespace syntax in /include
excluding the UDK headers of course Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/SpellPortions.hxx4
-rw-r--r--include/editeng/editeng.hxx4
-rw-r--r--include/editeng/edtdlg.hxx4
-rw-r--r--include/editeng/flditem.hxx8
-rw-r--r--include/editeng/numitem.hxx6
-rw-r--r--include/editeng/outliner.hxx6
-rw-r--r--include/editeng/overflowingtxt.hxx7
-rw-r--r--include/editeng/splwrap.hxx4
-rw-r--r--include/editeng/unolingu.hxx4
9 files changed, 20 insertions, 27 deletions
diff --git a/include/editeng/SpellPortions.hxx b/include/editeng/SpellPortions.hxx
index 89b90d87f09e..0681b5dbbfcc 100644
--- a/include/editeng/SpellPortions.hxx
+++ b/include/editeng/SpellPortions.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
#include <vector>
-namespace com{ namespace sun{ namespace star{ namespace linguistic2{
+namespace com::sun::star::linguistic2 {
class XSpellAlternatives;
-}}}}
+}
namespace com::sun::star::linguistic2 { class XProofreader; }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d8e780e736e8..292b620a9b95 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -46,7 +46,7 @@
template <typename Arg, typename Ret> class Link;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace linguistic2 {
class XSpellChecker1;
class XHyphenator;
@@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star {
namespace lang {
struct Locale;
}
-}}}
+}
namespace svx {
struct SpellPortion;
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 7aeff9965a5e..1cadb9978042 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -25,11 +25,11 @@
#include <vcl/abstdlg.hxx>
#include <editeng/hangulhanja.hxx>
-namespace com { namespace sun { namespace star { namespace linguistic2
+namespace com::sun::star::linguistic2
{
class XThesaurus;
class XHyphenator;
-} } } }
+}
template <typename Arg, typename Ret> class Link;
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index c7cd1e02209a..2f44c8e2522b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -27,11 +27,9 @@
#include <com/sun/star/text/textfield/Type.hpp>
-namespace com { namespace sun { namespace star { namespace text {
-
-class XTextContent;
-
-}}}}
+namespace com::sun::star::text {
+ class XTextContent;
+}
class SvNumberFormatter;
class MetaAction;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 1b8c4b130463..fda3169cbfd9 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -37,11 +37,7 @@ class SvxBrushItem;
namespace vcl { class Font; }
class Graphic;
class SvxNodeNum;
-namespace com{namespace sun{ namespace star{
- namespace text{
- class XNumberingFormatter;
- }
-}}}
+namespace com::sun::star::text { class XNumberingFormatter; }
namespace com::sun::star::lang { struct Locale; }
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7037e30da288..a048c4e06ac0 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -77,16 +77,16 @@ enum class PointerStyle;
class SvxNumRule;
enum class TextRotation;
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XSpellChecker1;
class XHyphenator;
-}}}}
+}
namespace svx{
struct SpellPortion;
typedef std::vector<SpellPortion> SpellPortions;
}
namespace basegfx { class B2DPolyPolygon; }
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index 2f5aac938655..ad0a662d1201 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -27,10 +27,9 @@
#include <com/sun/star/uno/Reference.h>
#include <memory>
-namespace com { namespace sun { namespace star {
- namespace datatransfer {
- class XTransferable;
-} } } }
+namespace com::sun::star {
+ namespace datatransfer { class XTransferable; }
+}
namespace rtl {
class OUString;
};
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 69dfbbc6c780..e9c719d45364 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -28,11 +28,11 @@
// forward ---------------------------------------------------------------
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XDictionary;
class XSpellChecker1;
class XHyphenator;
-}}}}
+}
// misc functions ---------------------------------------------------------------
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 2deae37c5a13..3032b7b7dc74 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -83,9 +83,9 @@ public:
};
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XHyphenatedWord;
-}}}}
+}
struct SvxAlternativeSpelling