summaryrefslogtreecommitdiff
path: root/include/formula
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/formula
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/formula')
-rw-r--r--include/formula/FormulaCompiler.hxx4
-rw-r--r--include/formula/FormulaOpCodeMapperObj.hxx4
-rw-r--r--include/formula/IFunctionDescription.hxx4
-rw-r--r--include/formula/tokenarray.hxx4
4 files changed, 8 insertions, 8 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 185dd7a04ada..ecc9e5dd3f4f 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -42,12 +42,12 @@
#define FORMULA_MAXPARAMSII 8 /* maximum number of parameters for functions that have implicit intersection ranges */
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet {
struct FormulaOpCodeMapEntry;
struct FormulaToken;
}
-}}}
+}
class CharClass;
enum class FormulaError : sal_uInt16;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index 8804e2488d94..bd0595d438d9 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -31,12 +31,12 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaOpCodeMapEntry; }
namespace sheet { struct FormulaToken; }
namespace uno { class XComponentContext; }
namespace uno { class XInterface; }
-} } }
+}
namespace formula
{
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 5d4616b9b9e5..82fd50d9736c 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -29,11 +29,11 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaToken; }
namespace sheet { class XFormulaOpCodeMapper; }
namespace sheet { class XFormulaParser; }
-} } }
+}
namespace com::sun::star::uno { template <class E> class Sequence; }
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 44122686c158..87377cb228e0 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -36,9 +36,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaToken; }
-} } }
+}
namespace com::sun::star::uno { template <typename > class Sequence; }
namespace formula { class FormulaTokenArray; }