diff options
25 files changed, 218 insertions, 215 deletions
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index 1a183059a193..18cf2a58bb2e 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -3350,7 +3350,7 @@ starmath/inc/rect.hxx:175 class SmRect & SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,_Bool) enum RectCopyMBL eCopyMode 0 -starmath/source/cfgitem.hxx:85 +starmath/inc/cfgitem.hxx:85 class rtl::OUString SmFontFormatList::GetFontFormatId(const struct SmFontFormat &,_Bool) _Bool bAdd 1 diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results index 5434059344e7..cd8595bef3b8 100644 --- a/compilerplugins/clang/singlevalfields.results +++ b/compilerplugins/clang/singlevalfields.results @@ -655,7 +655,7 @@ soltools/mkdepend/def.h:189 starmath/inc/edit.hxx:57 SmEditWindow aModifyIdle SmEditWindow ModifyIdle -starmath/source/cfgitem.hxx:102 +starmath/inc/cfgitem.hxx:109 SmMathConfig vFontPickList 5 stoc/source/corereflection/lrucache.hxx:52 diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index bef00255118e..edd2eb530360 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -11043,7 +11043,6 @@ starmath/source/accessibility.hxx starmath/source/action.cxx starmath/source/caret.cxx starmath/source/cfgitem.cxx -starmath/source/cfgitem.hxx starmath/source/cursor.cxx starmath/source/dialog.cxx starmath/source/document.cxx diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index cc3dab8875e7..204072aff092 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Library_set_precompiled_header,sm,starmath/inc/pch/precompiled_ $(eval $(call gb_Library_set_include,sm,\ -I$(SRCDIR)/starmath/inc \ + -I$(SRCDIR)/starmath/mathml/inc \ -I$(WORKDIR)/SdiTarget/starmath/sdi \ $$(INCLUDE) \ )) @@ -74,10 +75,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/document \ starmath/source/edit \ starmath/source/format \ - starmath/source/xparsmlbase \ - starmath/source/mathmlattr \ - starmath/source/mathmlexport \ - starmath/source/mathmlimport \ starmath/source/mathtype \ starmath/source/node \ starmath/source/ooxmlexport \ @@ -99,7 +96,11 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/view \ starmath/source/visitors \ starmath/source/wordexportbase \ - starmath/source/starmathdatabase \ + starmath/mathml/source/xparsmlbase \ + starmath/mathml/source/mathmlattr \ + starmath/mathml/source/mathmlexport \ + starmath/mathml/source/mathmlimport \ + starmath/mathml/source/starmathdatabase \ )) diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx new file mode 100644 index 000000000000..35f0955c243a --- /dev/null +++ b/starmath/inc/cfgitem.hxx @@ -0,0 +1,189 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * 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_SOURCE_CFGITEM_HXX +#define INCLUDED_STARMATH_SOURCE_CFGITEM_HXX + +#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 +{ +template <class E> class Sequence; +} + +class SmSym; +class SmSymbolManager; +class SmFormat; +namespace vcl +{ +class Font; +} +struct SmCfgOther; +class SfxItemSet; + +struct SmFontFormat +{ + OUString aName; + sal_Int16 nCharSet; + sal_Int16 nFamily; + sal_Int16 nPitch; + sal_Int16 nWeight; + sal_Int16 nItalic; + + SmFontFormat(); + explicit SmFontFormat(const vcl::Font& rFont); + + vcl::Font GetFont() const; + bool operator==(const SmFontFormat& rFntFmt) const; +}; + +struct SmFntFmtListEntry +{ + OUString aId; + SmFontFormat aFntFmt; + + SmFntFmtListEntry(const OUString& rId, const SmFontFormat& rFntFmt); +}; + +class SmFontFormatList +{ + std::vector<SmFntFmtListEntry> aEntries; + bool bModified; + + SmFontFormatList(const SmFontFormatList&) = delete; + SmFontFormatList& operator=(const SmFontFormatList&) = delete; + +public: + SmFontFormatList(); + + void Clear(); + void AddFontFormat(const OUString& rFntFmtId, const SmFontFormat& rFntFmt); + void RemoveFontFormat(std::u16string_view rFntFmtId); + + const SmFontFormat* GetFontFormat(std::u16string_view rFntFmtId) const; + const SmFontFormat* GetFontFormat(size_t nPos) const; + OUString GetFontFormatId(const SmFontFormat& rFntFmt) const; + OUString GetFontFormatId(const SmFontFormat& rFntFmt, bool bAdd); + OUString GetFontFormatId(size_t nPos) const; + OUString GetNewFontFormatId() const; + size_t GetCount() const { return aEntries.size(); } + + bool IsModified() const { return bModified; } + void SetModified(bool bVal) { bModified = bVal; } +}; + +class SmMathConfig final : public utl::ConfigItem, public SfxBroadcaster +{ + std::unique_ptr<SmFormat> pFormat; + std::unique_ptr<SmCfgOther> pOther; + std::unique_ptr<SmFontFormatList> pFontFormatList; + std::unique_ptr<SmSymbolManager> pSymbolMgr; + bool bIsOtherModified; + bool bIsFormatModified; + SmFontPickList vFontPickList[7]; + + SmMathConfig(const SmMathConfig&) = delete; + SmMathConfig& operator=(const SmMathConfig&) = delete; + + void StripFontFormatList(const std::vector<SmSym>& rSymbols); + + void Save(); + + void ReadSymbol(SmSym& rSymbol, const OUString& rSymbolName, + std::u16string_view rBaseNode) const; + void ReadFontFormat(SmFontFormat& rFontFormat, std::u16string_view rSymbolName, + std::u16string_view rBaseNode) const; + + void SetOtherIfNotEqual(bool& rbItem, bool bNewVal); + + void LoadOther(); + void SaveOther(); + void LoadFormat(); + void SaveFormat(); + void LoadFontFormatList(); + void SaveFontFormatList(); + + void SetOtherModified(bool bVal); + bool IsOtherModified() const { return bIsOtherModified; } + void SetFormatModified(bool bVal); + bool IsFormatModified() const { return bIsFormatModified; } + + SmFontFormatList& GetFontFormatList(); + const SmFontFormatList& GetFontFormatList() const + { + return const_cast<SmMathConfig*>(this)->GetFontFormatList(); + } + + virtual void ImplCommit() override; + +public: + SmMathConfig(); + virtual ~SmMathConfig() override; + + // utl::ConfigItem + virtual void Notify(const css::uno::Sequence<OUString>& rPropertyNames) override; + + SmSymbolManager& GetSymbolManager(); + void GetSymbols(std::vector<SmSym>& rSymbols) const; + void SetSymbols(const std::vector<SmSym>& rNewSymbols); + + const SmFormat& GetStandardFormat() const; + void SetStandardFormat(const SmFormat& rFormat, bool bSaveFontFormatList = false); + + bool IsPrintTitle() const; + void SetPrintTitle(bool bVal); + bool IsPrintFormulaText() const; + void SetPrintFormulaText(bool bVal); + bool IsPrintFrame() const; + void SetPrintFrame(bool bVal); + SmPrintSize GetPrintSize() const; + void SetPrintSize(SmPrintSize eSize); + sal_uInt16 GetPrintZoomFactor() const; + void SetPrintZoomFactor(sal_uInt16 nVal); + + bool IsSaveOnlyUsedSymbols() const; + void SetSaveOnlyUsedSymbols(bool bVal); + bool IsAutoCloseBrackets() const; + void SetAutoCloseBrackets(bool bVal); + bool IsIgnoreSpacesRight() const; + void SetIgnoreSpacesRight(bool bVal); + bool IsAutoRedraw() const; + void SetAutoRedraw(bool bVal); + bool IsShowFormulaCursor() const; + void SetShowFormulaCursor(bool bVal); + + SmFontPickList& GetFontPickList(sal_uInt16 nIdent) { return vFontPickList[nIdent]; } + + void ItemSetToConfig(const SfxItemSet& rSet); + void ConfigToItemSet(SfxItemSet& rSet) const; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathmlattr.hxx b/starmath/mathml/inc/mathmlattr.hxx index 104495d2c878..104495d2c878 100644 --- a/starmath/source/mathmlattr.hxx +++ b/starmath/mathml/inc/mathmlattr.hxx diff --git a/starmath/source/mathmlexport.hxx b/starmath/mathml/inc/mathmlexport.hxx index 32afe9f9aff1..32afe9f9aff1 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/mathml/inc/mathmlexport.hxx diff --git a/starmath/source/mathmlimport.hxx b/starmath/mathml/inc/mathmlimport.hxx index f390483e9be0..f390483e9be0 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/mathml/inc/mathmlimport.hxx diff --git a/starmath/inc/starmathdatabase.hxx b/starmath/mathml/inc/starmathdatabase.hxx index 2828ecfd8a98..7c16f38deafb 100644 --- a/starmath/inc/starmathdatabase.hxx +++ b/starmath/mathml/inc/starmathdatabase.hxx @@ -19,7 +19,7 @@ #pragma once -#include "token.hxx" +#include <token.hxx> // Starmath color types // In order to add them to starmath, edit the SmColorTokenTableEntry lists on diff --git a/starmath/source/xparsmlbase.hxx b/starmath/mathml/inc/xparsmlbase.hxx index 83650382e31b..83650382e31b 100644 --- a/starmath/source/xparsmlbase.hxx +++ b/starmath/mathml/inc/xparsmlbase.hxx diff --git a/starmath/source/mathmlattr.cxx b/starmath/mathml/source/mathmlattr.cxx index b2a3f2453ec5..008f8e2a81f6 100644 --- a/starmath/source/mathmlattr.cxx +++ b/starmath/mathml/source/mathmlattr.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "mathmlattr.hxx" +#include <mathmlattr.hxx> #include <unordered_map> diff --git a/starmath/source/mathmlexport.cxx b/starmath/mathml/source/mathmlexport.cxx index de7216f30bc7..fed4ac8a549d 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/mathml/source/mathmlexport.cxx @@ -57,14 +57,14 @@ #include <memory> #include <stack> -#include "mathmlexport.hxx" -#include "xparsmlbase.hxx" +#include <mathmlexport.hxx> +#include <xparsmlbase.hxx> #include <strings.hrc> #include <smmod.hxx> #include <unomodel.hxx> #include <document.hxx> #include <utility.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <starmathdatabase.hxx> using namespace ::com::sun::star::beans; diff --git a/starmath/source/mathmlimport.cxx b/starmath/mathml/source/mathmlimport.cxx index fd27d226a948..2b341028ef0c 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/mathml/source/mathmlimport.cxx @@ -62,9 +62,9 @@ one go*/ #include <memory> -#include "mathmlattr.hxx" -#include "xparsmlbase.hxx" -#include "mathmlimport.hxx" +#include <mathmlattr.hxx> +#include <xparsmlbase.hxx> +#include <mathmlimport.hxx> #include <document.hxx> #include <smdll.hxx> #include <unomodel.hxx> diff --git a/starmath/source/starmathdatabase.cxx b/starmath/mathml/source/starmathdatabase.cxx index d0e61820acc8..d0e61820acc8 100644 --- a/starmath/source/starmathdatabase.cxx +++ b/starmath/mathml/source/starmathdatabase.cxx diff --git a/starmath/source/xparsmlbase.cxx b/starmath/mathml/source/xparsmlbase.cxx index 519fab844465..7e0e93ab7390 100644 --- a/starmath/source/xparsmlbase.cxx +++ b/starmath/mathml/source/xparsmlbase.cxx @@ -16,7 +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 . */ -#include "xparsmlbase.hxx" +#include <xparsmlbase.hxx> static ::css::beans::Pair<::rtl::OUString, ::rtl::OUString> icustomMathmlHtmlEntitiesData[starmathdatabase::STARMATH_MATHMLHTML_ENTITY_NUMBER] = { diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index e5438e383440..2648d749ea89 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <officecfg/Office/Math.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <starmath.hrc> #include <smmod.hxx> diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx deleted file mode 100644 index 47aaf6309d33..000000000000 --- a/starmath/source/cfgitem.hxx +++ /dev/null @@ -1,186 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * 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_SOURCE_CFGITEM_HXX -#define INCLUDED_STARMATH_SOURCE_CFGITEM_HXX - -#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 { template <class E> class Sequence; } - -class SmSym; -class SmSymbolManager; -class SmFormat; -namespace vcl { class Font; } -struct SmCfgOther; -class SfxItemSet; - -struct SmFontFormat -{ - OUString aName; - sal_Int16 nCharSet; - sal_Int16 nFamily; - sal_Int16 nPitch; - sal_Int16 nWeight; - sal_Int16 nItalic; - - SmFontFormat(); - explicit SmFontFormat( const vcl::Font &rFont ); - - vcl::Font GetFont() const; - bool operator == ( const SmFontFormat &rFntFmt ) const; -}; - -struct SmFntFmtListEntry -{ - OUString aId; - SmFontFormat aFntFmt; - - SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ); -}; - -class SmFontFormatList -{ - std::vector<SmFntFmtListEntry> aEntries; - bool bModified; - - SmFontFormatList(const SmFontFormatList&) = delete; - SmFontFormatList& operator=(const SmFontFormatList&) = delete; - -public: - SmFontFormatList(); - - void Clear(); - void AddFontFormat( const OUString &rFntFmtId, const SmFontFormat &rFntFmt ); - void RemoveFontFormat( std::u16string_view rFntFmtId ); - - const SmFontFormat * GetFontFormat( std::u16string_view rFntFmtId ) const; - const SmFontFormat * GetFontFormat( size_t nPos ) const; - OUString GetFontFormatId( const SmFontFormat &rFntFmt ) const; - OUString GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd ); - OUString GetFontFormatId( size_t nPos ) const; - OUString GetNewFontFormatId() const; - size_t GetCount() const { return aEntries.size(); } - - bool IsModified() const { return bModified; } - void SetModified( bool bVal ) { bModified = bVal; } -}; - -class SmMathConfig final : public utl::ConfigItem, public SfxBroadcaster -{ - std::unique_ptr<SmFormat> pFormat; - std::unique_ptr<SmCfgOther> pOther; - std::unique_ptr<SmFontFormatList> pFontFormatList; - std::unique_ptr<SmSymbolManager> pSymbolMgr; - bool bIsOtherModified; - bool bIsFormatModified; - SmFontPickList vFontPickList[7]; - - SmMathConfig(const SmMathConfig&) = delete; - SmMathConfig& operator=(const SmMathConfig&) = delete; - - void StripFontFormatList( const std::vector< SmSym > &rSymbols ); - - - void Save(); - - void ReadSymbol( SmSym &rSymbol, - const OUString &rSymbolName, - std::u16string_view rBaseNode ) const; - void ReadFontFormat( SmFontFormat &rFontFormat, - std::u16string_view rSymbolName, - std::u16string_view rBaseNode ) const; - - void SetOtherIfNotEqual( bool &rbItem, bool bNewVal ); - - void LoadOther(); - void SaveOther(); - void LoadFormat(); - void SaveFormat(); - void LoadFontFormatList(); - void SaveFontFormatList(); - - void SetOtherModified( bool bVal ); - bool IsOtherModified() const { return bIsOtherModified; } - void SetFormatModified( bool bVal ); - bool IsFormatModified() const { return bIsFormatModified; } - - SmFontFormatList & GetFontFormatList(); - const SmFontFormatList & GetFontFormatList() const - { - return const_cast<SmMathConfig*>(this)->GetFontFormatList(); - } - - virtual void ImplCommit() override; - -public: - SmMathConfig(); - virtual ~SmMathConfig() override; - - // utl::ConfigItem - virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; - - SmSymbolManager & GetSymbolManager(); - void GetSymbols( std::vector< SmSym > &rSymbols ) const; - void SetSymbols( const std::vector< SmSym > &rNewSymbols ); - - const SmFormat & GetStandardFormat() const; - void SetStandardFormat( const SmFormat &rFormat, bool bSaveFontFormatList = false ); - - bool IsPrintTitle() const; - void SetPrintTitle( bool bVal ); - bool IsPrintFormulaText() const; - void SetPrintFormulaText( bool bVal ); - bool IsPrintFrame() const; - void SetPrintFrame( bool bVal ); - SmPrintSize GetPrintSize() const; - void SetPrintSize( SmPrintSize eSize ); - sal_uInt16 GetPrintZoomFactor() const; - void SetPrintZoomFactor( sal_uInt16 nVal ); - - bool IsSaveOnlyUsedSymbols() const; - void SetSaveOnlyUsedSymbols( bool bVal ); - bool IsAutoCloseBrackets() const; - void SetAutoCloseBrackets( bool bVal ); - bool IsIgnoreSpacesRight() const; - void SetIgnoreSpacesRight( bool bVal ); - bool IsAutoRedraw() const; - void SetAutoRedraw( bool bVal ); - bool IsShowFormulaCursor() const; - void SetShowFormulaCursor( bool bVal ); - - SmFontPickList & GetFontPickList(sal_uInt16 nIdent) { return vFontPickList[nIdent]; } - - void ItemSetToConfig(const SfxItemSet &rSet); - void ConfigToItemSet(SfxItemSet &rSet) const; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 33efa5b98ac2..eec0553ebe34 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -43,7 +43,7 @@ #include <starmath.hrc> #include <strings.hrc> #include <helpids.h> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <smmod.hxx> #include <symbol.hxx> #include <view.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 07886b68f6a0..a7f6ac6b31ea 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -73,14 +73,14 @@ #include "ooxmlexport.hxx" #include "ooxmlimport.hxx" #include "rtfexport.hxx" -#include "mathmlimport.hxx" -#include "mathmlexport.hxx" +#include <mathmlimport.hxx> +#include <mathmlexport.hxx> #include <svx/svxids.hrc> #include <cursor.hxx> #include <tools/diagnose_ex.h> #include <visitors.hxx> #include "accessibility.hxx" -#include "cfgitem.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 b441b3802cc2..9b4cd02fb876 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -38,7 +38,7 @@ #include <smmod.hxx> #include <view.hxx> #include <document.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include "accessibility.hxx" #include <memory> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index e1ec6e3f9d61..ef09bf24d9fa 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -32,7 +32,7 @@ #include <parse.hxx> #include <strings.hrc> #include <smmod.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <cassert> #include <stack> #include <starmathdatabase.hxx> diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index df9e9e589821..640eba718a34 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -27,7 +27,7 @@ #include <vcl/virdev.hxx> #include <unotools/syslocale.hxx> #include <smmod.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <dialog.hxx> #include <view.hxx> #include <smmod.hrc> diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 0d2f33045c08..ed223e04a5ed 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -21,7 +21,7 @@ #include <symbol.hxx> #include <utility.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <smmod.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 623fad785844..d75c96ea626d 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -50,7 +50,7 @@ #include <starmath.hrc> #include <strings.hrc> #include <smmod.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> using namespace ::cppu; using namespace ::std; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 27288ffa3469..2a69b340e3ef 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -64,13 +64,13 @@ #include <unomodel.hxx> #include <view.hxx> -#include "cfgitem.hxx" +#include <cfgitem.hxx> #include <dialog.hxx> #include <document.hxx> #include <starmath.hrc> #include <strings.hrc> #include <smmod.hxx> -#include "mathmlimport.hxx" +#include <mathmlimport.hxx> #include <cursor.hxx> #include "accessibility.hxx" #include <ElementsDockingWindow.hxx> |