[Libreoffice-commits] core.git: starmath/inc starmath/source
dante (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 1 11:43:48 UTC 2021
starmath/inc/AccessibleSmElement.hxx | 6 ++----
starmath/inc/AccessibleSmElementsControl.hxx | 6 ++----
starmath/inc/ElementsDockingWindow.hxx | 5 +----
starmath/inc/action.hxx | 1 +
starmath/inc/caret.hxx | 6 ++----
starmath/inc/cfgitem.hxx | 5 +----
starmath/inc/cursor.hxx | 6 ++----
starmath/inc/dialog.hxx | 7 ++-----
starmath/inc/document.hxx | 5 +----
starmath/inc/edit.hxx | 6 ++----
starmath/inc/format.hxx | 5 +----
starmath/inc/helpids.h | 6 ++----
starmath/inc/mathml/mathmlMo.hxx | 5 +----
starmath/inc/mathml/mathmlattr.hxx | 5 +----
starmath/inc/mathml/mathmlexport.hxx | 5 +----
starmath/inc/mathml/mathmlimport.hxx | 5 +----
starmath/inc/mathml/starmathdatabase.hxx | 2 ++
starmath/inc/mathml/xparsmlbase.hxx | 5 ++---
starmath/inc/node.hxx | 6 +-----
starmath/inc/parse.hxx | 5 +----
starmath/inc/parse5.hxx | 5 +----
starmath/inc/parsebase.hxx | 5 +----
starmath/inc/rect.hxx | 5 +----
starmath/inc/smdll.hxx | 6 ++----
starmath/inc/smdllapi.hxx | 5 +----
starmath/inc/smmod.hrc | 6 ++----
starmath/inc/smmod.hxx | 5 +----
starmath/inc/starmath.hrc | 5 +----
starmath/inc/strings.hrc | 5 +----
starmath/inc/strings.hxx | 5 +----
starmath/inc/symbol.hxx | 5 +----
starmath/inc/token.hxx | 5 +----
starmath/inc/types.hxx | 5 +----
starmath/inc/unomodel.hxx | 7 ++-----
starmath/inc/utility.hxx | 6 ++----
starmath/inc/view.hxx | 6 ++----
starmath/inc/visitors.hxx | 5 +----
starmath/source/accessibility.hxx | 6 +-----
starmath/source/eqnolefilehdr.hxx | 5 +----
starmath/source/mathtype.hxx | 6 +-----
starmath/source/ooxmlexport.hxx | 5 +----
starmath/source/ooxmlimport.hxx | 5 +----
starmath/source/rtfexport.hxx | 5 +----
starmath/source/smdetect.hxx | 5 +----
starmath/source/tmpdevice.hxx | 5 +----
starmath/source/uiobject.hxx | 5 +----
starmath/source/wordexportbase.hxx | 5 +----
47 files changed, 61 insertions(+), 184 deletions(-)
New commits:
commit 1a9dd0084d2c6057eca57cf069c77a7bad4d9724
Author: dante <dante19031999 at gmail.com>
AuthorDate: Sun Feb 28 11:25:21 2021 +0100
Commit: Roman Kuznetsov <antilibreoffice at gmail.com>
CommitDate: Mon Mar 1 12:43:08 2021 +0100
tdf#124176 on starmath
Change-Id: I816a12d5f47dd258fb01f14b901328d3e3d68e28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111690
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov <antilibreoffice at gmail.com>
diff --git a/starmath/inc/AccessibleSmElement.hxx b/starmath/inc/AccessibleSmElement.hxx
index 2fb130719acf..c1e7e6526872 100644
--- a/starmath/inc/AccessibleSmElement.hxx
+++ b/starmath/inc/AccessibleSmElement.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 INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENT_HXX
-#define INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENT_HXX
+
+#pragma once
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
@@ -98,6 +98,4 @@ public:
SAL_CALL getAccessibleActionKeyBinding(sal_Int32 nIndex) override;
};
-#endif // INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/AccessibleSmElementsControl.hxx b/starmath/inc/AccessibleSmElementsControl.hxx
index 7d7e75b6ff4d..bdb5e25ea724 100644
--- a/starmath/inc/AccessibleSmElementsControl.hxx
+++ b/starmath/inc/AccessibleSmElementsControl.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 INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENTSCONTROL_HXX
-#define INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENTSCONTROL_HXX
+
+#pragma once
#include <comphelper/accessiblecomponenthelper.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -103,6 +103,4 @@ void AccessibleSmElementsControl::AcquireFocus() { UpdateFocus(SAL_MAX_UINT16);
void AccessibleSmElementsControl::ReleaseFocus(sal_uInt16 nPos) { UpdateFocus(nPos); }
-#endif // INCLUDED_STARMATH_INC_ACCESSIBLESMELEMENTSCONTROL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index ebb3541549dc..153518b210ba 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
-#define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
+#pragma once
#include <sfx2/dockwin.hxx>
#include <vcl/customweld.hxx>
@@ -189,6 +188,4 @@ class SmElementsDockingWindowWrapper final : public SfxChildWindow
virtual ~SmElementsDockingWindowWrapper() override;
};
-#endif // INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index d1d61f8b17b2..aaec7854908e 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#pragma once
#include <svl/undo.hxx>
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index 1ae0dc438d34..eff810792c2f 100644
--- a/starmath/inc/caret.hxx
+++ b/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 INCLUDED_STARMATH_INC_CARET_HXX
-#define INCLUDED_STARMATH_INC_CARET_HXX
+
+#pragma once
#include <sal/config.h>
#include "node.hxx"
@@ -421,6 +421,4 @@ private:
* - Insert the new subtree where the old was taken
*/
-#endif // INCLUDED_STARMATH_INC_CARET_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx
index c0a4be4c60be..9e1438b68c38 100644
--- a/starmath/inc/cfgitem.hxx
+++ b/starmath/inc/cfgitem.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
-#define INCLUDED_STARMATH_SOURCE_CFGITEM_HXX
+#pragma once
#include "utility.hxx"
@@ -184,6 +183,4 @@ public:
void ConfigToItemSet(SfxItemSet& rSet) const;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 47d39819c54b..6346017ee5bb 100644
--- a/starmath/inc/cursor.hxx
+++ b/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 INCLUDED_STARMATH_INC_CURSOR_HXX
-#define INCLUDED_STARMATH_INC_CURSOR_HXX
+
+#pragma once
#include "caret.hxx"
@@ -422,6 +422,4 @@ private:
static SmNode* Error();
};
-#endif // INCLUDED_STARMATH_INC_CURSOR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 2d87467de870..53de6278f51d 100644
--- a/starmath/inc/dialog.hxx
+++ b/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 INCLUDED_STARMATH_INC_DIALOG_HXX
-#define INCLUDED_STARMATH_INC_DIALOG_HXX
+
+#pragma once
#include <sfx2/tabdlg.hxx>
#include <vcl/outdev.hxx>
@@ -479,7 +479,4 @@ public:
void SelectChar(sal_Unicode cChar);
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 88d2126ac579..17f0713a63ce 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_DOCUMENT_HXX
-#define INCLUDED_STARMATH_INC_DOCUMENT_HXX
+#pragma once
#include <rtl/strbuf.hxx>
#include <sfx2/docfac.hxx>
@@ -214,6 +213,4 @@ public:
void UpdateEditEngineDefaultFonts(const Color& aTextColor);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 7b5e9285b5b6..78ab94bbd702 100644
--- a/starmath/inc/edit.hxx
+++ b/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 INCLUDED_STARMATH_INC_EDIT_HXX
-#define INCLUDED_STARMATH_INC_EDIT_HXX
+
+#pragma once
#include <vcl/window.hxx>
#include <vcl/idle.hxx>
@@ -135,6 +135,4 @@ public:
using Window::GetAccessible;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 14fbfc2a6edd..d723f5cd6843 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.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_STARMATH_INC_FORMAT_HXX
-#define INCLUDED_STARMATH_INC_FORMAT_HXX
+#pragma once
#include <svl/hint.hxx>
#include <svl/SfxBroadcaster.hxx>
@@ -149,6 +148,4 @@ inline bool SmFormat::operator != (const SmFormat &rFormat) const
return !(*this == rFormat);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 7e13c3ac800b..5674678a409f 100644
--- a/starmath/inc/helpids.h
+++ b/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 INCLUDED_STARMATH_INC_HELPIDS_H
-#define INCLUDED_STARMATH_INC_HELPIDS_H
+
+#pragma once
#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT"
#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT"
@@ -49,6 +49,4 @@
#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST"
#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2"
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/mathml/mathmlMo.hxx b/starmath/inc/mathml/mathmlMo.hxx
index eb7d8630a4e9..10a8b00014f5 100644
--- a/starmath/inc/mathml/mathmlMo.hxx
+++ b/starmath/inc/mathml/mathmlMo.hxx
@@ -24,8 +24,7 @@
may be significant
*/
-#ifndef MATH_MO_HXX
-#define MATH_MO_HXX
+#pragma once
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -107,6 +106,4 @@ constexpr size_t MATHML_MO_COUNT = 1100;
extern std::vector<moOperatorData> moOperatorDataDictionary;
}
-#endif /* MATH_MO_HXX */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/mathml/mathmlattr.hxx b/starmath/inc/mathml/mathmlattr.hxx
index 104495d2c878..f999f28d680a 100644
--- a/starmath/inc/mathml/mathmlattr.hxx
+++ b/starmath/inc/mathml/mathmlattr.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_MATHMLATTR_HXX
-#define INCLUDED_STARMATH_SOURCE_MATHMLATTR_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -74,6 +73,4 @@ enum class MathMLMathvariantValue
bool GetMathMLMathvariantValue(const OUString& rStr, MathMLMathvariantValue& rV);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/mathml/mathmlexport.hxx b/starmath/inc/mathml/mathmlexport.hxx
index 1a6072118991..3a32a6e164f5 100644
--- a/starmath/inc/mathml/mathmlexport.hxx
+++ b/starmath/inc/mathml/mathmlexport.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
-#define INCLUDED_STARMATH_SOURCE_MATHMLEXPORT_HXX
+#pragma once
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
@@ -123,6 +122,4 @@ public:
bool GetSuccess() const { return bSuccess; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/mathml/mathmlimport.hxx b/starmath/inc/mathml/mathmlimport.hxx
index a4c82627047b..9b3fe5c88b0b 100644
--- a/starmath/inc/mathml/mathmlimport.hxx
+++ b/starmath/inc/mathml/mathmlimport.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_MATHMLIMPORT_HXX
-#define INCLUDED_STARMATH_SOURCE_MATHMLIMPORT_HXX
+#pragma once
#include <xmloff/xmlimp.hxx>
#include <vcl/errcode.hxx>
@@ -112,6 +111,4 @@ public:
sal_uInt16 GetSmSyntaxVersion() const { return mnSmSyntaxVersion; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/mathml/starmathdatabase.hxx b/starmath/inc/mathml/starmathdatabase.hxx
index cf8cf8b3b9d1..3a4e939973d9 100644
--- a/starmath/inc/mathml/starmathdatabase.hxx
+++ b/starmath/inc/mathml/starmathdatabase.hxx
@@ -328,3 +328,5 @@ SmColorTokenTableEntry Identify_ColorName_HTML(const OUString& colorname);
*/
const SmColorTokenTableEntry* Identify_ColorName_DVIPSNAMES(const OUString& colorname);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/mathml/xparsmlbase.hxx b/starmath/inc/mathml/xparsmlbase.hxx
index 4494d547712f..6c645a55e36c 100644
--- a/starmath/inc/mathml/xparsmlbase.hxx
+++ b/starmath/inc/mathml/xparsmlbase.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef XPARSEMLBASE
-#define XPARSEMLBASE
+#pragma once
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/Pair.hpp>
@@ -51,4 +50,4 @@ const extern ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString, ::rtl::OUS
icustomMathmlHtmlEntitiesExport;
};
-#endif /*XPARSEMLBASE*/
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index ec5ab00af842..8d21a63dd508 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -59,8 +59,7 @@
*
*/
-#ifndef INCLUDED_STARMATH_INC_NODE_HXX
-#define INCLUDED_STARMATH_INC_NODE_HXX
+#pragma once
#include "types.hxx"
#include "token.hxx"
@@ -2104,7 +2103,4 @@ public:
};
-#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 9896eaa871fb..c69a6e2654be 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -21,8 +21,7 @@
*
*/
-#ifndef INCLUDED_STARMATH_INC_PARSE_HXX
-#define INCLUDED_STARMATH_INC_PARSE_HXX
+#pragma once
#include "parse5.hxx"
@@ -35,6 +34,4 @@ AbstractSmParser* GetVersionSmParser(sal_uInt16 nVersion);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/parse5.hxx b/starmath/inc/parse5.hxx
index f3c72a655626..053202a56d10 100644
--- a/starmath/inc/parse5.hxx
+++ b/starmath/inc/parse5.hxx
@@ -21,8 +21,7 @@
*
*/
-#ifndef INCLUDED_STARMATH_INC_PARSE5_HXX
-#define INCLUDED_STARMATH_INC_PARSE5_HXX
+#pragma once
#include "parsebase.hxx"
@@ -118,6 +117,4 @@ public:
inline bool SmParser::TokenInGroup(TG nGroup) { return bool(m_aCurToken.nGroup & nGroup); }
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/parsebase.hxx b/starmath/inc/parsebase.hxx
index c1da50468ab9..c8507db1dbbb 100644
--- a/starmath/inc/parsebase.hxx
+++ b/starmath/inc/parsebase.hxx
@@ -21,8 +21,7 @@
*
*/
-#ifndef INCLUDED_STARMATH_INC_PARSEBASE_HXX
-#define INCLUDED_STARMATH_INC_PARSEBASE_HXX
+#pragma once
#include <unotools/charclass.hxx>
@@ -113,6 +112,4 @@ public:
virtual const std::set<OUString>& GetUsedSymbols() const = 0;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 55beb7215e26..0b28581a00f9 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_RECT_HXX
-#define INCLUDED_STARMATH_INC_RECT_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
@@ -214,6 +213,4 @@ inline tools::Rectangle SmRect::AsRectangle() const
return tools::Rectangle(Point(GetItalicLeft(), GetTop()), GetItalicSize());
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index 87e82702c5d9..1a1e175c8811 100644
--- a/starmath/inc/smdll.hxx
+++ b/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 INCLUDED_STARMATH_INC_SMDLL_HXX
-#define INCLUDED_STARMATH_INC_SMDLL_HXX
+
+#pragma once
#include "smdllapi.hxx"
@@ -26,6 +26,4 @@ namespace SmGlobals
SM_DLLPUBLIC void ensure();
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smdllapi.hxx b/starmath/inc/smdllapi.hxx
index ad183991f579..6354936194ac 100644
--- a/starmath/inc/smdllapi.hxx
+++ b/starmath/inc/smdllapi.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_INC_SMDLLAPI_HXX
-#define INCLUDED_STARMATH_INC_SMDLLAPI_HXX
+#pragma once
#include <sal/types.h>
@@ -18,6 +17,4 @@
#define SM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc
index 59a4a7cd845f..d581961ce2b4 100644
--- a/starmath/inc/smmod.hrc
+++ b/starmath/inc/smmod.hrc
@@ -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 INCLUDED_VCL_INC_STRINGS_HRC
-#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -87,6 +87,4 @@ const char* RID_UI_SYMBOL_NAMES[] =
NC_("RID_UI_SYMBOL_NAMES", "or")
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index a80f2b843c39..bb783e7ad2e0 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_SMMOD_HXX
-#define INCLUDED_STARMATH_INC_SMMOD_HXX
+#pragma once
#include <sfx2/module.hxx>
#include <sfx2/app.hxx>
@@ -101,6 +100,4 @@ public:
#define SM_MOD() ( static_cast<SmModule*>(SfxApplication::GetModule(SfxToolsModule::Math)) )
-#endif // INCLUDED_STARMATH_INC_SMMOD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index d8a98c4d0dad..b7733017cfbd 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_STARMATH_HRC
-#define INCLUDED_STARMATH_INC_STARMATH_HRC
+#pragma once
#include <svl/solar.hrc>
@@ -70,6 +69,4 @@
#define SID_AUTO_CLOSE_BRACKETS (SID_SMA_START + 127)
#define SID_DEFAULT_SM_SYNTAX_VERSION (SID_SMA_START + 130)
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index ab85c5b49aa6..85451b612aa3 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -24,8 +24,7 @@
* When passing the mouse over them, those descriptions will be displayed.
*/
-#ifndef INCLUDED_SM_INC_STRINGS_HRC
-#define INCLUDED_SM_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -402,6 +401,4 @@
#define RID_PRINTUIOPT_SCALING NC_("RID_PRINTUIOPT_SCALING", "~Scaling" )
// clang-format on
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index 258e2b800403..9162dd141016 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -13,8 +13,7 @@
* The user can then graphically insert them.
*/
-#ifndef INCLUDED_STARMATH_INC_STRINGS_HXX
-#define INCLUDED_STARMATH_INC_STRINGS_HXX
+#pragma once
#define RID_UNDOFORMATNAME "Format"
@@ -302,6 +301,4 @@
#define RID_XNOTSUCCEEDSY "<?> nsucc <?> "
// clang-format on
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 5b43d3f0692d..39ce0be6e38c 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -22,8 +22,7 @@
* Will remember the char name, char code and font.
*/
-#ifndef INCLUDED_STARMATH_INC_SYMBOL_HXX
-#define INCLUDED_STARMATH_INC_SYMBOL_HXX
+#pragma once
#include <map>
#include <vector>
@@ -106,6 +105,4 @@ public:
void Save();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index ffb3acadf499..ef405a45c2b4 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -26,8 +26,7 @@
* Location of the token in the starmath code.
*/
-#ifndef INCLUDED_STARMATH_INC_TOKEN_HXX
-#define INCLUDED_STARMATH_INC_TOKEN_HXX
+#pragma once
#include "types.hxx"
#include <rtl/ustring.hxx>
@@ -309,6 +308,4 @@ struct SmToken
void setChar(sal_Unicode cChar) { cMathChar = OUString(&cChar, 1); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index c3313a8a1d9d..b0bd00dad939 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_INC_TYPES_HXX
-#define INCLUDED_STARMATH_INC_TYPES_HXX
+#pragma once
#include <sal/types.h>
#define FONTNAME_MATH "OpenSymbol"
@@ -204,6 +203,4 @@ sal_Unicode const MS_SUCCEEDSEQUIV = 0x227F;
sal_Unicode const MS_NOTPRECEDES = 0x2280;
sal_Unicode const MS_NOTSUCCEEDS = 0x2281;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 54b27df4601d..b54c762ac125 100644
--- a/starmath/inc/unomodel.hxx
+++ b/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 INCLUDED_STARMATH_INC_UNOMODEL_HXX
-#define INCLUDED_STARMATH_INC_UNOMODEL_HXX
+
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/view/XRenderable.hpp>
@@ -91,7 +91,4 @@ public:
virtual Size getFormulaSize() const override;
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index f5ec5a4dedec..ee504017038a 100644
--- a/starmath/inc/utility.hxx
+++ b/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 INCLUDED_STARMATH_INC_UTILITY_HXX
-#define INCLUDED_STARMATH_INC_UTILITY_HXX
+
+#pragma once
#include <sal/config.h>
@@ -142,6 +142,4 @@ public:
virtual void Insert(const vcl::Font &rFont) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ea10e9e8e303..b3d5b72f4a6d 100644
--- a/starmath/inc/view.hxx
+++ b/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 INCLUDED_STARMATH_INC_VIEW_HXX
-#define INCLUDED_STARMATH_INC_VIEW_HXX
+
+#pragma once
#include <sal/config.h>
#include <rtl/ref.hxx>
@@ -309,6 +309,4 @@ private:
void ZoomByItemSet(const SfxItemSet *pSet);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 7ecdb37404fa..eac047133ebf 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -19,8 +19,7 @@
*
*/
-#ifndef INCLUDED_STARMATH_INC_VISITORS_HXX
-#define INCLUDED_STARMATH_INC_VISITORS_HXX
+#pragma once
#include <sal/config.h>
#include <sal/log.hxx>
@@ -493,6 +492,4 @@ private:
OUStringBuffer maCmdText;
};
-#endif // INCLUDED_STARMATH_INC_VISITORS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 834886fe3cde..d93159b34d83 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_ACCESSIBILITY_HXX
-#define INCLUDED_STARMATH_SOURCE_ACCESSIBILITY_HXX
+#pragma once
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -355,7 +354,4 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index 29f93cd00265..7fd3a476a8c8 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_EQNOLEFILEHDR_HXX
-#define INCLUDED_STARMATH_SOURCE_EQNOLEFILEHDR_HXX
+#pragma once
#include <sal/types.h>
#include <tools/stream.hxx>
@@ -72,6 +71,4 @@ public:
bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 14706e72e874..995595df20d6 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
-#define INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX
+#pragma once
#include <node.hxx>
@@ -181,7 +180,4 @@ public:
sal_uInt8 nVersion,sal_uInt8 nTypeFace=0);
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index 019172056ba5..cd2e9d446585 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_OOXMLEXPORT_HXX
-#define INCLUDED_STARMATH_SOURCE_OOXMLEXPORT_HXX
+#pragma once
#include "wordexportbase.hxx"
@@ -44,6 +43,4 @@ private:
oox::drawingml::DocumentType const m_DocumentType;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index 5fc7a6a335e8..4f8df14bfd16 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
-#define INCLUDED_STARMATH_SOURCE_OOXMLIMPORT_HXX
+#pragma once
#include <rtl/ustring.hxx>
@@ -49,6 +48,4 @@ private:
oox::formulaimport::XmlStream& m_rStream;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/rtfexport.hxx b/starmath/source/rtfexport.hxx
index b0ba7f5d7a26..e8c38aaa6c51 100644
--- a/starmath/source/rtfexport.hxx
+++ b/starmath/source/rtfexport.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_RTFEXPORT_HXX
-#define INCLUDED_STARMATH_SOURCE_RTFEXPORT_HXX
+#pragma once
#include "wordexportbase.hxx"
@@ -40,6 +39,4 @@ private:
rtl_TextEncoding m_nEncoding;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index d1eceaecf940..81a68d909982 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_SMDETECT_HXX
-#define INCLUDED_STARMATH_SOURCE_SMDETECT_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
@@ -44,6 +43,4 @@ public:
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx
index 8fa3557cd89d..9c15fe035793 100644
--- a/starmath/source/tmpdevice.hxx
+++ b/starmath/source/tmpdevice.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_STARMATH_SOURCE_TMPDEVICE_HXX
-#define INCLUDED_STARMATH_SOURCE_TMPDEVICE_HXX
+#pragma once
#include <tools/color.hxx>
#include <vcl/outdev.hxx>
@@ -44,6 +43,4 @@ public:
operator OutputDevice&() { return rOutDev; }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/uiobject.hxx b/starmath/source/uiobject.hxx
index 1aba4738b8c5..665572e5ad5e 100644
--- a/starmath/source/uiobject.hxx
+++ b/starmath/source/uiobject.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_UIOBJECT_HXX
-#define INCLUDED_STARMATH_SOURCE_UIOBJECT_HXX
+#pragma once
#include <vcl/uitest/uiobject.hxx>
#include <ElementsDockingWindow.hxx>
@@ -55,6 +54,4 @@ protected:
virtual OUString get_name() const override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/wordexportbase.hxx b/starmath/source/wordexportbase.hxx
index d23bf79358fa..33a179d05fbb 100644
--- a/starmath/source/wordexportbase.hxx
+++ b/starmath/source/wordexportbase.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
-#define INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
+#pragma once
#include <node.hxx>
@@ -46,6 +45,4 @@ private:
const SmNode* const m_pTree;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list