starmath/inc/ElementsDockingWindow.hxx | 7 +------ starmath/inc/caret.hxx | 5 ----- starmath/inc/cfgitem.hxx | 3 --- starmath/inc/cursor.hxx | 5 ----- starmath/inc/dialog.hxx | 1 - starmath/inc/document.hxx | 5 ----- starmath/inc/edit.hxx | 1 - starmath/inc/mathml/mathmlimport.hxx | 1 - starmath/inc/node.hxx | 6 ------ starmath/inc/parsebase.hxx | 4 ---- starmath/inc/smmod.hxx | 2 -- starmath/inc/token.hxx | 12 ++++++++++-- starmath/inc/unomodel.hxx | 2 -- starmath/inc/view.hxx | 4 ---- starmath/inc/visitors.hxx | 2 -- starmath/source/ElementsDockingWindow.cxx | 2 -- starmath/source/accessibility.cxx | 5 ----- starmath/source/accessibility.hxx | 1 - starmath/source/cfgitem.cxx | 4 ---- starmath/source/cursor.cxx | 2 -- starmath/source/dialog.cxx | 2 -- starmath/source/document.cxx | 1 - starmath/source/edit.cxx | 1 - starmath/source/mathml/mathmlexport.cxx | 1 - starmath/source/mathml/mathmlimport.cxx | 2 -- starmath/source/mathtype.cxx | 5 +---- starmath/source/mathtype.hxx | 8 +------- starmath/source/node.cxx | 14 -------------- starmath/source/ooxmlexport.cxx | 1 - starmath/source/parse5.cxx | 5 ----- starmath/source/rect.cxx | 2 -- starmath/source/rtfexport.cxx | 2 -- starmath/source/symbol.cxx | 2 -- starmath/source/uiobject.hxx | 2 -- starmath/source/unofilter.cxx | 2 -- starmath/source/view.cxx | 2 -- starmath/source/visitors.cxx | 2 +- starmath/source/wordexportbase.cxx | 1 - starmath/source/wordexportbase.hxx | 11 +---------- 39 files changed, 15 insertions(+), 125 deletions(-)
New commits: commit b6d7a8929d77ef67bbeb584cb0283d5a4f82ebbb Author: dante <dante19031...@gmail.com> AuthorDate: Sat Feb 27 19:26:41 2021 +0100 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Mar 1 08:23:09 2021 +0100 Starmath cleanup unused includes Change-Id: I294c5bbeadb718e35c0c5e56332b4df71433555a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111687 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 1deafb09b805..ebb3541549dc 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -24,15 +24,10 @@ #include <vcl/customweld.hxx> #include <vcl/weld.hxx> -#include "format.hxx" -#include <memory> -#include <tuple> - +#include "parse.hxx" #include "AccessibleSmElementsControl.hxx" class SmDocShell; -class SmNode; -class SmParser; class SmElement { diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx index 6cc663206da4..1ae0dc438d34 100644 --- a/starmath/inc/caret.hxx +++ b/starmath/inc/caret.hxx @@ -10,13 +10,8 @@ #define INCLUDED_STARMATH_INC_CARET_HXX #include <sal/config.h> - #include "node.hxx" -#include <cassert> -#include <memory> -#include <vector> - /** Representation of caret position with an equation */ struct SmCaretPos { diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx index 8e450d04a1d3..c0a4be4c60be 100644 --- a/starmath/inc/cfgitem.hxx +++ b/starmath/inc/cfgitem.hxx @@ -23,14 +23,11 @@ #include "utility.hxx" #include <string_view> -#include <vector> - #include <rtl/ustring.hxx> #include <svl/SfxBroadcaster.hxx> #include <unotools/configitem.hxx> #include "types.hxx" -#include <memory> namespace com::sun::star::uno { diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index a30beda63368..47d39819c54b 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -9,13 +9,8 @@ #ifndef INCLUDED_STARMATH_INC_CURSOR_HXX #define INCLUDED_STARMATH_INC_CURSOR_HXX -#include "node.hxx" #include "caret.hxx" -#include <cassert> -#include <list> -#include <memory> - /** Factor to multiple the squared horizontal distance with * Used for Up and Down movement. */ diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index d3017f8e9554..2d87467de870 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -23,7 +23,6 @@ #include <vcl/outdev.hxx> #include <vcl/customweld.hxx> #include "symbol.hxx" -#include <memory> class SubsetMap; class SmFormat; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 17933546265c..88d2126ac579 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_STARMATH_INC_DOCUMENT_HXX #define INCLUDED_STARMATH_INC_DOCUMENT_HXX -#include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> #include <sfx2/docfac.hxx> #include <sfx2/objsh.hxx> @@ -30,11 +29,7 @@ #include <oox/core/filterbase.hxx> #include <oox/export/utils.hxx> -#include <memory> -#include <set> - #include "format.hxx" -#include "node.hxx" #include "parse.hxx" #include "smdllapi.hxx" diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 60d0ad2bbb04..7b5e9285b5b6 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -23,7 +23,6 @@ #include <vcl/idle.hxx> #include <vcl/transfer.hxx> #include <editeng/editdata.hxx> -#include <memory> class SmDocShell; class SmViewShell; diff --git a/starmath/inc/mathml/mathmlimport.hxx b/starmath/inc/mathml/mathmlimport.hxx index efbaeba47908..a4c82627047b 100644 --- a/starmath/inc/mathml/mathmlimport.hxx +++ b/starmath/inc/mathml/mathmlimport.hxx @@ -24,7 +24,6 @@ #include <vcl/errcode.hxx> #include <deque> -#include <memory> class SmNode; class SfxMedium; diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 61f98ec75d87..ec5ab00af842 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -67,12 +67,6 @@ #include "rect.hxx" #include "format.hxx" -#include <o3tl/typed_flags_set.hxx> -#include <rtl/ustrbuf.hxx> - -#include <cassert> -#include <vector> - enum class FontAttribute { None = 0x0000, Bold = 0x0001, diff --git a/starmath/inc/parsebase.hxx b/starmath/inc/parsebase.hxx index ee6a0621b0d6..c1da50468ab9 100644 --- a/starmath/inc/parsebase.hxx +++ b/starmath/inc/parsebase.hxx @@ -25,11 +25,7 @@ #define INCLUDED_STARMATH_INC_PARSEBASE_HXX #include <unotools/charclass.hxx> -#include <memory> -#include <set> -#include <vector> -#include "token.hxx" #include "node.hxx" #define DEPTH_LIMIT 1024 diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 3bab0068495b..a80f2b843c39 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -23,9 +23,7 @@ #include <sfx2/module.hxx> #include <sfx2/app.hxx> #include <vcl/vclptr.hxx> - #include <unotools/options.hxx> -#include <memory> namespace svtools { class ColorConfig; } diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index 650884471aa5..ffb3acadf499 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -29,11 +29,19 @@ #ifndef INCLUDED_STARMATH_INC_TOKEN_HXX #define INCLUDED_STARMATH_INC_TOKEN_HXX -#include <sal/types.h> #include "types.hxx" #include <rtl/ustring.hxx> -#include <o3tl/typed_flags_set.hxx> +#include <rtl/ustrbuf.hxx> #include <tools/color.hxx> +#include <o3tl/typed_flags_set.hxx> + +// std imports +#include <cassert> +#include <vector> +#include <stack> +#include <tuple> +#include <list> +#include <set> // TokenGroups enum class TG diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index f18b09381c38..54b27df4601d 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -27,8 +27,6 @@ #include <vcl/print.hxx> #include <oox/mathml/export.hxx> #include <oox/mathml/import.hxx> -#include <memory> - #define PRTUIOPT_TITLE_ROW "TitleRow" #define PRTUIOPT_FORMULA_TEXT "FormulaText" diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index ee4e17b10767..ea10e9e8e303 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -20,9 +20,6 @@ #define INCLUDED_STARMATH_INC_VIEW_HXX #include <sal/config.h> - -#include <memory> - #include <rtl/ref.hxx> #include <sfx2/docinsert.hxx> #include <sfx2/dockwin.hxx> @@ -38,7 +35,6 @@ class SmViewShell; class SmPrintUIOptions; class SmGraphicAccessible; -class SmNode; namespace svtools { class ColorConfig; } diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index 4929bdd0d3e8..7ecdb37404fa 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -23,12 +23,10 @@ #define INCLUDED_STARMATH_INC_VISITORS_HXX #include <sal/config.h> - #include <sal/log.hxx> #include "node.hxx" #include "caret.hxx" -#include <memory> /** Base class for visitors that visits a tree of SmNodes * @remarks all methods have been left abstract to ensure that implementers diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index aae6027bbdc4..7dacc85e2a1f 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> #include <ElementsDockingWindow.hxx> #include <starmath.hrc> @@ -26,7 +25,6 @@ #include <view.hxx> #include <visitors.hxx> #include <document.hxx> -#include <node.hxx> #include "uiobject.hxx" #include <strings.hxx> diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 851f122c5ad5..ae21fd08bb1a 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/config.h> -#include <sal/log.hxx> - -#include <memory> - #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleTextType.hpp> diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 8cccdc916e72..834886fe3cde 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -35,7 +35,6 @@ #include <editeng/unoedsrc.hxx> #include <edit.hxx> #include <view.hxx> -#include <memory> class SmDocShell; diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 8b9739ac14b9..b4c950233ac4 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cassert> -#include <memory> -#include <vector> - #include <svl/itemset.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index a7d5ba76c542..32ee10c60f06 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -6,7 +6,6 @@ * 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/. */ -#include <memory> #include <cursor.hxx> #include <visitors.hxx> #include <document.hxx> @@ -14,7 +13,6 @@ #include <comphelper/string.hxx> #include <editeng/editeng.hxx> #include <osl/diagnose.h> -#include <cassert> void SmCursor::Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor){ SmCaretPosGraphEntry* NewPos = nullptr; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index eec0553ebe34..8a862516b682 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <cassert> - #include <comphelper/string.hxx> #include <o3tl/temporary.hxx> #include <svl/eitem.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index a80297cac604..59dcb21e2128 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -81,7 +81,6 @@ #include <visitors.hxx> #include "accessibility.hxx" #include <cfgitem.hxx> -#include <memory> #include <utility> #include <oox/mathml/export.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index a53089bfa49b..d77433a7df8e 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -40,7 +40,6 @@ #include <document.hxx> #include <cfgitem.hxx> #include "accessibility.hxx" -#include <memory> #define SCROLL_LINE 24 diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx index e9e65697f83a..8414bc7f8dca 100644 --- a/starmath/source/mathml/mathmlexport.cxx +++ b/starmath/source/mathml/mathmlexport.cxx @@ -54,7 +54,6 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <memory> #include <stack> #include <mathmlexport.hxx> diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index b5870bf86324..f9862430665d 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -60,8 +60,6 @@ one go*/ #include <svx/strings.hrc> #include <tools/diagnose_ex.h> -#include <memory> - #include <mathmlattr.hxx> #include <xparsmlbase.hxx> #include <mathmlimport.hxx> diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index e13dd7160f2e..10250bbb22aa 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -18,15 +18,12 @@ */ #include "mathtype.hxx" +#include "eqnolefilehdr.hxx" #include <filter/msfilter/classids.hxx> #include <osl/diagnose.h> #include <sfx2/docfile.hxx> #include <sot/storage.hxx> -#include <sal/log.hxx> - -#include "eqnolefilehdr.hxx" -#include <node.hxx> void MathType::Init() { diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 1e3a744d7789..14706e72e874 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -20,15 +20,9 @@ #ifndef INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX #define INCLUDED_STARMATH_SOURCE_MATHTYPE_HXX -#include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> - -#include <set> -#include <vector> +#include <node.hxx> class SfxMedium; -class SmMatrixNode; -class SmNode; class SotStorage; class SvStream; diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 696db00cca64..3687e74e0d35 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -18,28 +18,14 @@ */ -#include <node.hxx> -#include <rect.hxx> #include <symbol.hxx> #include <smmod.hxx> #include "tmpdevice.hxx" #include <visitors.hxx> -#include <tools/color.hxx> -#include <tools/fract.hxx> -#include <tools/gen.hxx> #include <vcl/metric.hxx> -#include <vcl/outdev.hxx> -#include <sal/log.hxx> #include <osl/diagnose.h> -#include <cassert> -#include <cstdlib> -#include <math.h> -#include <memory> -#include <float.h> -#include <vector> - bool starmathdatabase::isStructuralNode(SmNodeType ntype) { // clang-format off diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx index 3b0836c12ceb..8a94b890888d 100644 --- a/starmath/source/ooxmlexport.cxx +++ b/starmath/source/ooxmlexport.cxx @@ -8,7 +8,6 @@ */ #include "ooxmlexport.hxx" -#include <node.hxx> #include <oox/token/tokens.hxx> #include <rtl/ustring.hxx> diff --git a/starmath/source/parse5.cxx b/starmath/source/parse5.cxx index 0f65252dd498..34953e8dafdf 100644 --- a/starmath/source/parse5.cxx +++ b/starmath/source/parse5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> #include <com/sun/star/i18n/UnicodeType.hpp> #include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseType.hpp> @@ -25,16 +24,12 @@ #include <tools/lineend.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> -#include <sal/log.hxx> #include <osl/diagnose.h> #include <rtl/character.hxx> -#include <node.hxx> #include <parse5.hxx> #include <strings.hrc> #include <smmod.hxx> #include <cfgitem.hxx> -#include <cassert> -#include <stack> #include <starmathdatabase.hxx> using namespace ::com::sun::star::i18n; diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 3cc94da55a62..8d7ea52d9717 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -29,8 +29,6 @@ #include <types.hxx> #include <smmod.hxx> -#include <cassert> - namespace { bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev, diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx index 575093cfe7cc..9ce0bb3e1dbe 100644 --- a/starmath/source/rtfexport.cxx +++ b/starmath/source/rtfexport.cxx @@ -8,11 +8,9 @@ */ #include "rtfexport.hxx" -#include <node.hxx> #include <svtools/rtfkeywd.hxx> #include <filter/msfilter/rtfutil.hxx> -#include <sal/log.hxx> SmRtfExport::SmRtfExport(const SmNode* pIn) : SmWordExportBase(pIn) diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index ed223e04a5ed..4dfd8374872c 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vector> - #include <symbol.hxx> #include <utility.hxx> #include <cfgitem.hxx> diff --git a/starmath/source/uiobject.hxx b/starmath/source/uiobject.hxx index e6132ff772a8..1aba4738b8c5 100644 --- a/starmath/source/uiobject.hxx +++ b/starmath/source/uiobject.hxx @@ -10,9 +10,7 @@ #ifndef INCLUDED_STARMATH_SOURCE_UIOBJECT_HXX #define INCLUDED_STARMATH_SOURCE_UIOBJECT_HXX -#include <memory> #include <vcl/uitest/uiobject.hxx> - #include <ElementsDockingWindow.hxx> class ElementUIObject : public UIObject diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index 610d4281c765..efb5bbdd1caf 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <memory> - #include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sot/storage.hxx> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 3d732bbc5b4d..0539f52f6b6c 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -75,8 +75,6 @@ #include "accessibility.hxx" #include <ElementsDockingWindow.hxx> #include <helpids.h> -#include <cassert> -#include <memory> #define MINZOOM sal_uInt16(25) #define MAXZOOM sal_uInt16(800) diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index 2d71df50c7bc..f1f1f94cc962 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -14,7 +14,7 @@ #include <visitors.hxx> #include "tmpdevice.hxx" #include <cursor.hxx> -#include <cassert> + #include <starmathdatabase.hxx> // SmDefaultingVisitor diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index c4ba615ea1d4..adf1a275c37f 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -8,7 +8,6 @@ */ #include "wordexportbase.hxx" -#include <node.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/starmath/source/wordexportbase.hxx b/starmath/source/wordexportbase.hxx index 28bdf8ba4336..d23bf79358fa 100644 --- a/starmath/source/wordexportbase.hxx +++ b/starmath/source/wordexportbase.hxx @@ -10,16 +10,7 @@ #ifndef INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX #define INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX -class SmAttributeNode; -class SmBinHorNode; -class SmBraceNode; -class SmMatrixNode; -class SmNode; -class SmOperNode; -class SmRootNode; -class SmSubSupNode; -class SmUnHorNode; -class SmVerticalBraceNode; +#include <node.hxx> /** Base class implementing writing of formulas to Word. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits