summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-10 09:18:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-10 12:03:13 +0200
commitc37fe8886d8ce2f6374decc370a09b45e589ee0d (patch)
tree7a92d439f2ef323117bd3391d193f0d53c3a759e /starmath
parent366d08f2f6d4de922f6099c62bb81b49d89e0a68 (diff)
compact namespace in sal..svgio
Change-Id: I7e70614ea5a1cb1a1dc0ef8e9fb6fd48e85c3562 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93904 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/document.hxx2
-rw-r--r--starmath/source/cfgitem.hxx2
-rw-r--r--starmath/source/mathmlexport.hxx4
-rw-r--r--starmath/source/mathmlimport.hxx4
-rw-r--r--starmath/source/ooxmlimport.hxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index cc09c2ea0c9b..3fedfb13db17 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -42,7 +42,7 @@ class SfxPrinter;
class Printer;
class SmCursor;
-namespace oox { namespace formulaimport { class XmlStream; } }
+namespace oox::formulaimport { class XmlStream; }
#define STAROFFICE_XML "StarOffice XML (Math)"
#define MATHML_XML "MathML XML (Math)"
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index e6f968583c1e..8fa101187297 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -31,7 +31,7 @@
#include <types.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
class SmSym;
class SmSymbolManager;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index dda259310b78..376365842640 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -26,12 +26,12 @@
class SfxMedium;
class SmNode;
class SmVerticalBraceNode;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io {
class XOutputStream; }
namespace beans {
class XPropertySet; }
-} } }
+}
class SmXMLExportWrapper
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 84ef80a14b09..d4266842bfdd 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -28,10 +28,10 @@
class SmNode;
class SfxMedium;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
class XPropertySet; }
-} } }
+}
typedef std::deque<std::unique_ptr<SmNode>> SmNodeStack;
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index 026870bfa5cf..5fc7a6a335e8 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -12,7 +12,7 @@
#include <rtl/ustring.hxx>
-namespace oox { namespace formulaimport { class XmlStream; } }
+namespace oox::formulaimport { class XmlStream; }
/**
Class implementing reading of formulas from OOXML. The toplevel element is expected
to be oMath (handle oMathPara outside of this code).