starmath: fix include guards

Change-Id: I4f4bd88e8be1f2745ec8c96793a43d93e3f733b4
Reviewed-on: https://gerrit.libreoffice.org/6389Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

starmath/inc/ElementsDockingWindow.hxx

@@ -16,8 +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 _ELEMENTSDOCKINGWINDOW_HXX_
-#define _ELEMENTSDOCKINGWINDOW_HXX_
+#ifndef INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
+#define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
 
 #include <sfx2/dockwin.hxx>
 #include <svx/dlgctrl.hxx>

starmath/inc/action.hxx

@@ -16,8 +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 ACTION_HXX
-#define ACTION_HXX
+#ifndef INCLUDED_STARMATH_INC_ACTION_HXX
+#define INCLUDED_STARMATH_INC_ACTION_HXX
 
 #include <svl/undo.hxx>
 #include "format.hxx"

starmath/inc/caret.hxx

@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef CARET_H
-#define CARET_H
+#ifndef INCLUDED_STARMATH_INC_CARET_HXX
+#define INCLUDED_STARMATH_INC_CARET_HXX
 
 #include "node.hxx"
 
@@ -456,6 +456,6 @@ private:
  *  - Insert the new subtree where the old was taken
  */
 
-#endif /* CARET_H */
+#endif // INCLUDED_STARMATH_INC_CARET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

starmath/inc/config.hxx

@@ -16,8 +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 CONFIG_HXX
-#define CONFIG_HXX
+#ifndef INCLUDED_STARMATH_INC_CONFIG_HXX
+#define INCLUDED_STARMATH_INC_CONFIG_HXX
 
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>

starmath/inc/cursor.hxx

@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef SMCURSOR_H
-#define SMCURSOR_H
+#ifndef INCLUDED_STARMATH_INC_CURSOR_HXX
+#define INCLUDED_STARMATH_INC_CURSOR_HXX
 
 #include "node.hxx"
 #include "caret.hxx"
@@ -460,6 +460,6 @@ private:
 };
 
 
-#endif /* SMCURSOR_H */
+#endif // INCLUDED_STARMATH_INC_CURSOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

starmath/inc/dialog.hxx

@@ -16,8 +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 DIALOG_HXX
-#define DIALOG_HXX
+#ifndef INCLUDED_STARMATH_INC_DIALOG_HXX
+#define INCLUDED_STARMATH_INC_DIALOG_HXX
 
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>

starmath/inc/document.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOCUMENT_HXX
-#define DOCUMENT_HXX
+#ifndef INCLUDED_STARMATH_INC_DOCUMENT_HXX
+#define INCLUDED_STARMATH_INC_DOCUMENT_HXX
 
 #define SMDLL   1
 

starmath/inc/edit.hxx

@@ -16,8 +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 EDIT_HXX
-#define EDIT_HXX
+#ifndef INCLUDED_STARMATH_INC_EDIT_HXX
+#define INCLUDED_STARMATH_INC_EDIT_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/timer.hxx>

starmath/inc/format.hxx

@@ -16,8 +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 FORMAT_HXX
-#define FORMAT_HXX
+#ifndef INCLUDED_STARMATH_INC_FORMAT_HXX
+#define INCLUDED_STARMATH_INC_FORMAT_HXX
 
 
 #include <svl/smplhint.hxx>

starmath/inc/helpids.h

@@ -16,8 +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 STARMATH_HELPIDS_H
-#define STARMATH_HELPIDS_H
+#ifndef INCLUDED_STARMATH_INC_HELPIDS_H
+#define INCLUDED_STARMATH_INC_HELPIDS_H
 
 #define HID_SMA_FONTDIALOG                                "STARMATH_HID_SMA_FONTDIALOG"
 #define HID_SMA_DISTANCEDIALOG                            "STARMATH_HID_SMA_DISTANCEDIALOG"

starmath/inc/parse.hxx

@@ -16,8 +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 PARSE_HXX
-#define PARSE_HXX
+#ifndef INCLUDED_STARMATH_INC_PARSE_HXX
+#define INCLUDED_STARMATH_INC_PARSE_HXX
 
 #include <vcl/svapp.hxx>
 

starmath/inc/rect.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RECT_HXX
-#define RECT_HXX
+#ifndef INCLUDED_STARMATH_INC_RECT_HXX
+#define INCLUDED_STARMATH_INC_RECT_HXX
 
 #include <new>
 

starmath/inc/smcommands.h

@@ -16,8 +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 SM_SMCOMMANDS_H
-#define SM_SMCOMMANDS_H
+#ifndef INCLUDED_STARMATH_INC_SMCOMMANDS_H
+#define INCLUDED_STARMATH_INC_SMCOMMANDS_H
 
 #define CMD_SID_ADJUST                              ".uno:Adjust"
 #define CMD_SID_ALIGN                               ".uno:ChangeAlignment"

starmath/inc/smdll.hxx

@@ -16,8 +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 SMDLL_HXX
-#define SMDLL_HXX
+#ifndef INCLUDED_STARMATH_INC_SMDLL_HXX
+#define INCLUDED_STARMATH_INC_SMDLL_HXX
 
 namespace SmGlobals
 {

starmath/inc/symbol.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SYMBOL_HXX
-#define SYMBOL_HXX
+#ifndef INCLUDED_STARMATH_INC_SYMBOL_HXX
+#define INCLUDED_STARMATH_INC_SYMBOL_HXX
 
 #include <vcl/font.hxx>
 #include <svl/lstner.hxx>

starmath/inc/toolbox.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLBOX_HXX
-#define TOOLBOX_HXX
+#ifndef INCLUDED_STARMATH_INC_TOOLBOX_HXX
+#define INCLUDED_STARMATH_INC_TOOLBOX_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/childwin.hxx>

starmath/inc/types.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TYPES_HXX
-#define TYPES_HXX
+#ifndef INCLUDED_STARMATH_INC_TYPES_HXX
+#define INCLUDED_STARMATH_INC_TYPES_HXX
 
 #include <sal/types.h>
 #define FONTNAME_MATH   "OpenSymbol"

starmath/inc/unomodel.hxx

@@ -16,8 +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 UNOMODEL_HXX
-#define UNOMODEL_HXX
+#ifndef INCLUDED_STARMATH_INC_UNOMODEL_HXX
+#define INCLUDED_STARMATH_INC_UNOMODEL_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>

starmath/inc/utility.hxx

@@ -16,8 +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 UTILITY_HXX
-#define UTILITY_HXX
+#ifndef INCLUDED_STARMATH_INC_UTILITY_HXX
+#define INCLUDED_STARMATH_INC_UTILITY_HXX
 
 #include <vcl/font.hxx>
 #include <vcl/fixed.hxx>

starmath/inc/view.hxx

@@ -16,8 +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 VIEW_HXX
-#define VIEW_HXX
+#ifndef INCLUDED_STARMATH_INC_VIEW_HXX
+#define INCLUDED_STARMATH_INC_VIEW_HXX
 
 #include <sfx2/dockwin.hxx>
 #include <sfx2/viewsh.hxx>

starmath/inc/visitors.hxx

@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef SMVISITORS_H
-#define SMVISITORS_H
+#ifndef INCLUDED_STARMATH_INC_VISITORS_HXX
+#define INCLUDED_STARMATH_INC_VISITORS_HXX
 
 #include "node.hxx"
 #include "caret.hxx"
@@ -487,6 +487,6 @@ private:
     OUStringBuffer aCmdText;
 };
 
-#endif /* SMVISITORS_H */
+#endif // INCLUDED_STARMATH_INC_VISITORS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

starmath/source/accessibility.hxx

@@ -21,8 +21,8 @@
 #pragma hdrstop
 #endif
 
-#ifndef _ACCESSIBILITY_HXX_
-#define _ACCESSIBILITY_HXX_
+#ifndef INCLUDED_STARMATH_SOURCE_ACCESSIBILITY_HXX
+#define INCLUDED_STARMATH_SOURCE_ACCESSIBILITY_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>

starmath/source/cfgitem.hxx

@@ -21,8 +21,8 @@
 #pragma hdrstop
 #endif
 
-#ifndef _MATH_CFGITEM_HXX_
-#define _MATH_CFGITEM_HXX_
+#ifndef INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
+#define INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
 
 #include <deque>
 #include <vector>

starmath/source/eqnolefilehdr.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __EQNOLEFILEHDR_HXX__
-#define __EQNOLEFILEHDR_HXX__
+#ifndef INCLUDED_STARMATH_SOURCE_EQNOLEFILEHDR_HXX
+#define INCLUDED_STARMATH_SOURCE_EQNOLEFILEHDR_HXX
 
 #include <sal/types.h>
 #include <sot/storage.hxx>

starmath/source/mathmlexport.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MATHMLEXPORT_HXX_
-#define _MATHMLEXPORT_HXX_
+#ifndef INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
+#define INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlexp.hxx>

starmath/source/mathmlimport.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MATHMLIMPORT_HXX_
-#define _MATHMLIMPORT_HXX_
+#ifndef INCLUDED_STARMATH_SOURCE_MATHMLIMPORT_HXX
+#define INCLUDED_STARMATH_SOURCE_MATHMLIMPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlexp.hxx>

starmath/source/mathtype.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef MATHTYPE_HXX
-#define MATHTYPE_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
+#define INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
 
 #include "node.hxx"
 #include "eqnolefilehdr.hxx"

starmath/source/ooxmlexport.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SM_OOXMLEXPORT_HXX
-#define SM_OOXMLEXPORT_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_OOXMLEXPORT_HXX
+#define INCLUDED_STARMATH_SOURCE_OOXMLEXPORT_HXX
 
 #include "wordexportbase.hxx"
 

starmath/source/ooxmlimport.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SM_OOXMLIMPORT_HXX
-#define SM_OOXMLIMPORT_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
+#define INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
 
 #include <oox/mathml/importutils.hxx>
 

starmath/source/rtfexport.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SM_RTFEXPORT_HXX
-#define SM_RTFEXPORT_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_RTFEXPORT_HXX
+#define INCLUDED_STARMATH_SOURCE_RTFEXPORT_HXX
 
 #include "wordexportbase.hxx"
 

starmath/source/smdetect.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SM_TYPEDETECT_HXX
-#define _SM_TYPEDETECT_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_SMDETECT_HXX
+#define INCLUDED_STARMATH_SOURCE_SMDETECT_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>

starmath/source/wordexportbase.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SM_WORDEXPORTBASE_HXX
-#define SM_WORDEXPORTBASE_HXX
+#ifndef INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
+#define INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
 
 #include "node.hxx"