starmath/inc/ElementsDockingWindow.hxx | 4 ++--
starmath/inc/cfgitem.hxx | 4 ++--
starmath/inc/document.hxx | 6 +++---
starmath/inc/mathml/import.hxx | 4 ++--
starmath/inc/mathml/mathmlimport.hxx | 6 +++---
starmath/source/ElementsDockingWindow.cxx | 2 +-
starmath/source/cfgitem.cxx | 8 ++++----
starmath/source/document.cxx | 2 +-
starmath/source/mathml/mathmlexport.cxx | 2 +-
starmath/source/unomodel.cxx | 2 +-
10 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit c37022ff57b6efe11869e9901e874cff80eca0c6
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Nov 5 14:42:51 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Nov 6 10:25:09 2023 +0100
"SyntaxVersion" has been declared as "sal_Int16" in unomodel
not "sal_uInt16"
See "aModelPropertyInfoMap" var in starmath/source/unomodel.cxx
It fixes this message when loading
https://bugs.documentfoundation.org/attachment.cgi?id=55799
warn:legacy.osl:19853:19853:xmloff/source/core/SettingsExportHelper.cxx:176:
this type is not implemented now
Change-Id: I18779b122555681f7544e64745c8074775e27277
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158952
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/starmath/inc/ElementsDockingWindow.hxx
b/starmath/inc/ElementsDockingWindow.hxx
index 22c7b899586e..6bbb4a542756 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -41,7 +41,7 @@ class SmElementsControl
SmDocShell* mpDocShell;
SmFormat maFormat;
int mnCurrentSetIndex;
- sal_uInt16 m_nSmSyntaxVersion;
+ sal_Int16 m_nSmSyntaxVersion;
std::vector<std::unique_ptr<ElementData>> maItemDatas;
std::unique_ptr<weld::IconView> mpIconView;
@@ -67,7 +67,7 @@ public:
static const std::vector<TranslateId>& categories();
void setElementSetIndex(int nSetIndex);
- void setSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion);
+ void setSmSyntaxVersion(sal_Int16 nSmSyntaxVersion);
void SetSelectHdl(const Link<OUString, void>& rLink) { maSelectHdlLink =
rLink; }
diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx
index 1dfbd3ef9dd4..08a6e834f1fd 100644
--- a/starmath/inc/cfgitem.hxx
+++ b/starmath/inc/cfgitem.hxx
@@ -195,8 +195,8 @@ public:
bool IsShowFormulaCursor() const;
void SetShowFormulaCursor(bool bVal);
- sal_uInt16 GetDefaultSmSyntaxVersion() const;
- void SetDefaultSmSyntaxVersion(sal_uInt16 nVal);
+ sal_Int16 GetDefaultSmSyntaxVersion() const;
+ void SetDefaultSmSyntaxVersion(sal_Int16 nVal);
SmFontPickList& GetFontPickList(sal_uInt16 nIdent) { return
vFontPickList[nIdent]; }
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index e7c767d12df7..c73723a434d0 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -92,7 +92,7 @@ class SM_DLLPUBLIC SmDocShell final : public SfxObjectShell,
public SfxListener
VclPtr<Printer> mpTmpPrinter; //ditto
sal_uInt16 mnModifyCount;
bool mbFormulaArranged;
- sal_uInt16 mnSmSyntaxVersion;
+ sal_Int16 mnSmSyntaxVersion;
std::unique_ptr<AbstractSmParser> maParser;
std::unique_ptr<SmCursor> mpCursor;
std::set< OUString > maUsedSymbols; // to export used symbols only
when saving
@@ -176,8 +176,8 @@ public:
AbstractSmParser* GetParser() { return maParser.get(); }
const SmTableNode *GetFormulaTree() const { return mpTree.get(); }
void SetFormulaTree(SmTableNode *pTree) { mpTree.reset(pTree); }
- sal_uInt16 GetSmSyntaxVersion() const { return mnSmSyntaxVersion; }
- void SetSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion);
+ sal_Int16 GetSmSyntaxVersion() const { return mnSmSyntaxVersion; }
+ void SetSmSyntaxVersion(sal_Int16 nSmSyntaxVersion);
const std::set< OUString > & GetUsedSymbols() const { return
maUsedSymbols; }
diff --git a/starmath/inc/mathml/import.hxx b/starmath/inc/mathml/import.hxx
index 18c4334060ba..764d5451c652 100644
--- a/starmath/inc/mathml/import.hxx
+++ b/starmath/inc/mathml/import.hxx
@@ -138,11 +138,11 @@ public:
/** Set syntax version
*/
- void SetSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion) { m_nSmSyntaxVersion
= nSmSyntaxVersion; }
+ void SetSmSyntaxVersion(sal_Int16 nSmSyntaxVersion) { m_nSmSyntaxVersion =
nSmSyntaxVersion; }
/** Get syntax version
*/
- sal_uInt16 GetSmSyntaxVersion() const { return m_nSmSyntaxVersion; }
+ sal_Int16 GetSmSyntaxVersion() const { return m_nSmSyntaxVersion; }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/starmath/inc/mathml/mathmlimport.hxx
b/starmath/inc/mathml/mathmlimport.hxx
index efa5c353700f..3e2b5d2a991d 100644
--- a/starmath/inc/mathml/mathmlimport.hxx
+++ b/starmath/inc/mathml/mathmlimport.hxx
@@ -78,7 +78,7 @@ class SmXMLImport final : public SvXMLImport
bool bSuccess;
int nParseDepth;
OUString aText;
- sal_uInt16 mnSmSyntaxVersion;
+ sal_Int16 mnSmSyntaxVersion;
public:
SmXMLImport(const css::uno::Reference<css::uno::XComponentContext>&
rContext,
@@ -105,8 +105,8 @@ public:
void IncParseDepth() { ++nParseDepth; }
bool TooDeep() const { return nParseDepth >= 2048; }
void DecParseDepth() { --nParseDepth; }
- void SetSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion) { mnSmSyntaxVersion =
nSmSyntaxVersion; }
- sal_uInt16 GetSmSyntaxVersion() const { return mnSmSyntaxVersion; }
+ void SetSmSyntaxVersion(sal_Int16 nSmSyntaxVersion) { mnSmSyntaxVersion =
nSmSyntaxVersion; }
+ sal_Int16 GetSmSyntaxVersion() const { return mnSmSyntaxVersion; }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index dad659a11c43..b00e92717280 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -656,7 +656,7 @@ void SmElementsControl::build()
}
}
-void SmElementsControl::setSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion)
+void SmElementsControl::setSmSyntaxVersion(sal_Int16 nSmSyntaxVersion)
{
if( m_nSmSyntaxVersion != nSmSyntaxVersion )
{
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 8f698bb282ee..62918828fd96 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -140,7 +140,7 @@ struct SmCfgOther
SmPrintSize ePrintSize;
sal_uInt16 nPrintZoomFactor;
sal_uInt16 nSmEditWindowZoomFactor;
- sal_uInt16 nSmSyntaxVersion;
+ sal_Int16 nSmSyntaxVersion;
bool bPrintTitle;
bool bPrintFormulaText;
bool bPrintFrame;
@@ -155,7 +155,7 @@ struct SmCfgOther
SmCfgOther();
};
-constexpr sal_uInt16 nDefaultSmSyntaxVersion(5);
+constexpr sal_Int16 nDefaultSmSyntaxVersion(5);
SmCfgOther::SmCfgOther()
: ePrintSize(PRINT_SIZE_NORMAL)
@@ -1255,7 +1255,7 @@ bool SmMathConfig::IsAutoCloseBrackets() const
return pOther->bIsAutoCloseBrackets;
}
-sal_uInt16 SmMathConfig::GetDefaultSmSyntaxVersion() const
+sal_Int16 SmMathConfig::GetDefaultSmSyntaxVersion() const
{
if (utl::ConfigManager::IsFuzzing())
return nDefaultSmSyntaxVersion;
@@ -1295,7 +1295,7 @@ void SmMathConfig::SetAutoCloseBrackets( bool bVal )
SetOtherIfNotEqual( pOther->bIsAutoCloseBrackets, bVal );
}
-void SmMathConfig::SetDefaultSmSyntaxVersion( sal_uInt16 nVal )
+void SmMathConfig::SetDefaultSmSyntaxVersion( sal_Int16 nVal )
{
if (!pOther)
LoadOther();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 04c348cbab45..e644288ff35e 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -99,7 +99,7 @@ void SmDocShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu("view");
}
-void SmDocShell::SetSmSyntaxVersion(sal_uInt16 nSmSyntaxVersion)
+void SmDocShell::SetSmSyntaxVersion(sal_Int16 nSmSyntaxVersion)
{
mnSmSyntaxVersion = nSmSyntaxVersion;
maParser.reset(starmathdatabase::GetVersionSmParser(mnSmSyntaxVersion));
diff --git a/starmath/source/mathml/mathmlexport.cxx
b/starmath/source/mathml/mathmlexport.cxx
index 3c308cd84bc6..1c18e716e7d6 100644
--- a/starmath/source/mathml/mathmlexport.cxx
+++ b/starmath/source/mathml/mathmlexport.cxx
@@ -445,7 +445,7 @@ void SmXMLExport::ExportContent_()
return;
SmModule* pMod = SM_MOD();
- sal_uInt16 nSmSyntaxVersion =
pMod->GetConfig()->GetDefaultSmSyntaxVersion();
+ sal_Int16 nSmSyntaxVersion =
pMod->GetConfig()->GetDefaultSmSyntaxVersion();
// Convert symbol names
if (pDocShell)
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 829c57de820f..ea1d55793e5b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -663,7 +663,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry**
ppEntries, const Any*
}
break;
case HANDLE_STARMATH_VERSION:
- pDocSh->SetSmSyntaxVersion(pValues->get<sal_uInt16>());
+ pDocSh->SetSmSyntaxVersion(pValues->get<sal_Int16>());
break;
}
}
