[Libreoffice-commits] core.git: chart2/source cui/source include/svx solenv/clang-format svx/Library_svx.mk svx/source

[Andrea Gelmini (via logerrit)]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |    2 +-
 cui/source/tabpages/tpline.cxx                            |    2 +-
 include/svx/svxgraphicitem.hxx                            |    5 +----
 solenv/clang-format/excludelist                           |    4 ++--
 svx/Library_svx.mk                                        |    2 +-
 svx/source/dialog/svxgraphicitem.cxx                      |    2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 48289c37d73e7780ef3ea6a98aa5e214be0fde92
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Aug 28 14:42:56 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 31 10:19:29 2020 +0200

    Fix typo in code
    
    Move "grahic" to "graphic"
    
    It passed "make check" on Linux
    
    + Use "#pragma once" in include/svx/svxgraphicitem.hxx.
    
    Change-Id: Ia8a42afd1a822e19093ecee7b0b8791f96de2867
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101623
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 1add0435b0bc..a356c1ac4185 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -53,7 +53,7 @@
 
 #include <svx/drawitem.hxx>
 #include <svx/ofaitem.hxx>
-#include <svx/svxgrahicitem.hxx>
+#include <svx/svxgraphicitem.hxx>
 
 #include <svx/dialogs.hrc>
 #include <editeng/flstitem.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 522bab7789a4..cec452121a47 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -45,7 +45,7 @@
 #include <cuitabline.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
-#include <svx/svxgrahicitem.hxx>
+#include <svx/svxgraphicitem.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgraphicitem.hxx
similarity index 94%
rename from include/svx/svxgrahicitem.hxx
rename to include/svx/svxgraphicitem.hxx
index 6d9a757c5f29..78592f382445 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgraphicitem.hxx
@@ -16,9 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVX_SVXGRAHICITEM_HXX
-#define INCLUDED_SVX_SVXGRAHICITEM_HXX
 
+#pragma once
 
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
@@ -39,6 +38,4 @@ public:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 61eea12ba9ea..d075bc227e66 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6914,7 +6914,7 @@ include/svx/svx3ditems.hxx
 include/svx/svxdlg.hxx
 include/svx/svxdllapi.h
 include/svx/svxerr.hxx
-include/svx/svxgrahicitem.hxx
+include/svx/svxgraphicitem.hxx
 include/svx/swframeexample.hxx
 include/svx/swframeposstrings.hxx
 include/svx/swframetypes.hxx
@@ -13326,7 +13326,7 @@ svx/source/dialog/srchdlg.cxx
 svx/source/dialog/strarray.cxx
 svx/source/dialog/svxbmpnumvalueset.cxx
 svx/source/dialog/svxdlg.cxx
-svx/source/dialog/svxgrahicitem.cxx
+svx/source/dialog/svxgraphicitem.cxx
 svx/source/dialog/svxruler.cxx
 svx/source/dialog/swframeexample.cxx
 svx/source/dialog/swframeposstrings.cxx
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index bb2dbb43e946..424361233542 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/srchdlg \
     svx/source/dialog/strarray \
     svx/source/dialog/svxbmpnumvalueset \
-    svx/source/dialog/svxgrahicitem \
+    svx/source/dialog/svxgraphicitem \
     svx/source/dialog/svxruler \
     svx/source/dialog/swframeexample \
     svx/source/dialog/swframeposstrings \
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgraphicitem.cxx
similarity index 97%
rename from svx/source/dialog/svxgrahicitem.cxx
rename to svx/source/dialog/svxgraphicitem.cxx
index 6a64afba8517..9550e79e4814 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgraphicitem.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svxgrahicitem.hxx>
+#include <svx/svxgraphicitem.hxx>
 #include <svx/svxids.hrc>
 
 SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic )