xmloff/source/text/txtimp.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a86b5c62c8a11d3903f740c072e77caa9d2a4e25
Author: Simon Chenery <simon_chen...@yahoo.com>
AuthorDate: Sat Aug 23 11:19:03 2025 +0200
Commit: David Gilbert <freedesk...@treblig.org>
CommitDate: Tue Aug 26 01:06:15 2025 +0200
tdf#145614 Convert #define MAX_COMBINED_CHARACTERS to constexpr
Change-Id: Ic5888d7d929913dab813c36373c19afedc521fd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190090
Reviewed-by: David Gilbert <freedesk...@treblig.org>
Tested-by: Jenkins
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index d2d2099979e9..36c79bbc6d10 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -86,9 +86,6 @@ using namespace ::xmloff::token;
using namespace ::com::sun::star::ucb;
-// maximum allowed length of combined characters field
-#define MAX_COMBINED_CHARACTERS 6
-
struct XMLTextImportHelper::Impl
{
std::optional< std::vector<OUString> > m_xPrevFrmNames;
@@ -1301,6 +1298,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
u"com.sun.star.text.TextField.CombinedCharacters"_ustr), UNO_QUERY);
if( xTmp.is() )
{
+ // maximum allowed length of combined characters field
+ constexpr auto MAX_COMBINED_CHARACTERS = 6;
+
// fix cursor if larger than possible for
// combined characters field
if (rCursor->getString().getLength() >
