[Libreoffice-commits] core.git: 2 commits - accessibility/inc sw/source

[Arnaud Versini (via logerrit)]

 accessibility/inc/extended/accessiblelistboxentry.hxx |    4 ++--
 accessibility/inc/helper/IComboListBoxHelper.hxx      |    4 ++--
 accessibility/inc/standard/vclxaccessiblelistitem.hxx |    4 ++--
 sw/source/core/access/accfrmobj.cxx                   |    4 ++--
 sw/source/core/access/acchypertextdata.hxx            |    6 +++---
 sw/source/core/access/accpara.cxx                     |    8 +++-----
 sw/source/core/access/acctable.hxx                    |    4 ++--
 sw/source/core/access/textmarkuphelper.hxx            |    6 +++---
 8 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit 151ba014b31c43ae51f14be6f88a16ced1542701
Author:     Arnaud Versini <arnaud.versini at gmail.com>
AuthorDate: Sat Jul 6 10:29:17 2019 +0200
Commit:     Arnaud Versini <arnaud.versini at libreoffice.org>
CommitDate: Mon Sep 16 12:32:28 2019 +0200

    accessibility : namespace cleanup
    
    Change-Id: I6b8c69babba163c74cd90757bad2c9f997b7e66f
    Reviewed-on: https://gerrit.libreoffice.org/75160
    Tested-by: Jenkins
    Reviewed-by: Arnaud Versini <arnaud.versini at libreoffice.org>

diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index d52faf379f69..2d9e4fac97b1 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -41,12 +41,12 @@
 
 // forward ---------------------------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     struct Point;
     struct Rectangle;
     struct Size;
     class XFocusListener;
-} } } }
+}
 
 class SvTreeListBox;
 class SvTreeListEntry;
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index c4b638b70acb..b4f669b929a6 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -24,9 +24,9 @@
 #include <rtl/ustring.hxx>
 #include <tools/wintypes.hxx>
 
-namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
+namespace com::sun::star::datatransfer::clipboard {
     class XClipboard;
-} } } } }
+}
 
 class Point;
 namespace tools { class Rectangle; }
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index d6fdb6f762bc..5e46ba80940d 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -34,12 +34,12 @@
 
 // forward ---------------------------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
     struct Point;
     struct Rectangle;
     struct Size;
     class XFocusListener;
-} } } }
+}
 
 // class VCLXAccessibleListItem ------------------------------------------
 
commit 94552560fe319aa16f219e70c1caa5d63e0e1419
Author:     Arnaud Versini <arnaud.versini at gmail.com>
AuthorDate: Fri Sep 13 10:23:08 2019 +0200
Commit:     Arnaud Versini <arnaud.versini at libreoffice.org>
CommitDate: Mon Sep 16 12:32:15 2019 +0200

    sw access: cleanup namespaces declaration
    
    Change-Id: I2e3db2645c00c4a5d917693b509a1b8e6c446eb8
    Reviewed-on: https://gerrit.libreoffice.org/78863
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index c4bae0b8f0b8..ad0bfa55cc7f 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -35,7 +35,7 @@
 
 #include <vcl/window.hxx>
 
-namespace sw { namespace access {
+namespace sw::access {
 
 SwAccessibleChild::SwAccessibleChild()
     : mpFrame( nullptr )
@@ -403,6 +403,6 @@ const SwFrame* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
     return pParent;
 }
 
-} } // eof of namespace sw::access
+} // eof of namespace sw::access
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index 7a0c5e775c8c..01833885a091 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -24,9 +24,9 @@
 #include <map>
 
 class SwTextAttr;
-namespace com { namespace sun { namespace star {
-    namespace accessibility { class XAccessibleHyperlink; }
-} } }
+namespace com::sun::star::accessibility {
+    class XAccessibleHyperlink;
+}
 
 class SwAccessibleHyperTextData
 {
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 389adb8c5b0b..59587621c3b5 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -104,11 +104,9 @@ using std::max;
 using std::min;
 using std::sort;
 
-namespace com { namespace sun { namespace star {
-    namespace text {
-        class XText;
-    }
-} } }
+namespace com::sun::star::text {
+    class XText;
+}
 
 const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 6d98e5b32daa..39a21f024aa7 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -36,9 +36,9 @@ class SwAccessibleTableData_Impl;
 class SwTableBox;
 class SwSelBoxes;
 
-namespace sw { namespace access {
+namespace sw::access {
     class SwAccessibleChild;
-} }
+}
 
 class SwAccessibleTable :
         public SwAccessibleContext,
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index a359e15a04b1..6db3f9bc0e34 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -22,9 +22,9 @@
 #include <sal/types.h>
 #include <com/sun/star/uno/Sequence.h>
 
-namespace com { namespace sun { namespace star { namespace accessibility {
-struct TextSegment;
-} } } }
+namespace com::sun::star::accessibility {
+    struct TextSegment;
+}
 
 class SwAccessiblePortionData;
 class SwTextFrame;