starmath/inc/strings.hrc | 8 ++++++++
starmath/inc/strings.hxx | 8 ++++++++
starmath/source/ElementsDockingWindow.cxx | 10 ++++++++++
sw/source/core/inc/unocontentcontrol.hxx | 5 +++--
sw/source/core/inc/unometa.hxx | 14 ++++++++------
sw/source/core/inc/unoport.hxx | 3 ++-
sw/source/core/txtnode/attrcontentcontrol.cxx | 1 +
sw/source/core/txtnode/fmtatr2.cxx | 3 ++-
sw/source/core/unocore/unocoll.cxx | 1 +
sw/source/core/unocore/unoobj.cxx | 1 +
sw/source/core/unocore/unoportenum.cxx | 14 +++++++-------
sw/source/core/unocore/unotext.cxx | 6 +++---
sw/source/uibase/uno/unotxdoc.cxx | 1 +
13 files changed, 55 insertions(+), 20 deletions(-)
New commits:
commit acdc5c50938a3c7032a00ab08efbb4916519e06b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Sep 17 19:16:27 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 18 08:09:07 2023 +0200
use more concrete UNO types in sw
Change-Id: Ied57649bba82b3d9c7324e1e1c6d29a8b4f5390c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156999
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 9ca70148accd..62d0f49280c8 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -99,7 +99,7 @@ public:
/// @throws lang::IllegalArgumentException
/// @throws uno::RuntimeException
- uno::Reference< text::XTextRange >
+ rtl::Reference<SwXParagraph>
finishOrAppendParagraph(
const uno::Sequence< beans::PropertyValue >&
rCharacterAndParagraphProperties,
@@ -1151,7 +1151,7 @@ SwXText::finishParagraphInsert(
return m_pImpl->finishOrAppendParagraph(rProperties, xInsertPosition);
}
-uno::Reference< text::XTextRange >
+rtl::Reference<SwXParagraph>
SwXText::Impl::finishOrAppendParagraph(
const uno::Sequence< beans::PropertyValue > & rProperties,
const uno::Reference< text::XTextRange >& xInsertPosition)
@@ -1167,7 +1167,7 @@ SwXText::Impl::finishOrAppendParagraph(
throw uno::RuntimeException();
}
- uno::Reference< text::XTextRange > xRet;
+ rtl::Reference<SwXParagraph> xRet;
bool bIllegalException = false;
bool bRuntimeException = false;
OUString sMessage;
commit 2cedcebc15f7199c8a3c16bb3f25c7a422770ecc
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Sun Sep 17 19:52:47 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Mon Sep 18 08:09:00 2023 +0200
tdf#111705: Add the new maj and hadd operators to the elements panel
Change-Id: Ib62592d86a1bf2e5d94348fca731473dba92be74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156996
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index 015c7e7c453a..b6eeff196633 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -119,6 +119,10 @@
#define RID_SUM_FROMX_HELP NC_("RID_SUM_FROMX_HELP", "Sum
Subscript Bottom" )
#define RID_SUM_TOX_HELP NC_("RID_SUM_TOX_HELP", "Sum
Superscript Top" )
#define RID_SUM_FROMTOX_HELP NC_("RID_SUM_FROMTOX_HELP", "Sum
Sup/Sub script" )
+#define RID_MAJX_HELP NC_("RID_MAJX_HELP", "Summation
(Arabic)" )
+#define RID_MAJ_FROMX_HELP NC_("RID_MAJ_FROMX_HELP",
"Summation Subscript Bottom (Arabic)" )
+#define RID_MAJ_TOX_HELP NC_("RID_MAJ_TOX_HELP", "Summation
Superscript Top (Arabic)" )
+#define RID_MAJ_FROMTOX_HELP NC_("RID_MAJ_FROMTOX_HELP",
"Summation Sup/Sub script (Arabic)" )
#define RID_PRODX_HELP NC_("RID_PRODX_HELP", "Product" )
#define RID_PROD_FROMX_HELP NC_("RID_PROD_FROMX_HELP",
"Product Subscript Bottom" )
#define RID_PROD_TOX_HELP NC_("RID_PROD_TOX_HELP", "Product
Superscript Top" )
@@ -139,6 +143,10 @@
#define RID_LIMSUP_FROMX_HELP NC_("RID_LIMSUP_FROMX_HELP",
"Limit Superior Subscript Bottom" )
#define RID_LIMSUP_TOX_HELP NC_("RID_LIMSUP_TOX_HELP", "Limit
Superior Superscript Top" )
#define RID_LIMSUP_FROMTOX_HELP NC_("RID_LIMSUP_FROMTOX_HELP",
"Limit Superior Sup/Sub script" )
+#define RID_HADDX_HELP NC_("RID_HADDX_HELP", "Limits
(Persian)" )
+#define RID_HADD_FROMX_HELP NC_("RID_HADD_FROMX_HELP", "Limits
Subscript Bottom (Persian)" )
+#define RID_HADD_TOX_HELP NC_("RID_HADD_TOX_HELP", "Limits
Superscript Top (Persian)" )
+#define RID_HADD_FROMTOX_HELP NC_("RID_HADD_FROMTOX_HELP",
"Limits Sup/Sub script (Persian)" )
#define RID_EXISTS_HELP NC_("RID_EXISTS_HELP", "There
Exists" )
#define RID_NOTEXISTS_HELP NC_("RID_NOTEXISTS_HELP", "There
does not exist" )
#define RID_FORALL_HELP NC_("RID_FORALL_HELP", "For all" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index e22625155ff2..4be4f1d144f5 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -110,6 +110,10 @@ inline constexpr OUStringLiteral RID_UNDOFORMATNAME =
u"Format";
#define RID_SUM_FROMX "sum from{<?>} <?> "
#define RID_SUM_TOX "sum to{<?>} <?> "
#define RID_SUM_FROMTOX "sum from{<?>} to{<?>} <?> "
+#define RID_MAJX "maj <?> "
+#define RID_MAJ_FROMX "maj from{<?>} <?> "
+#define RID_MAJ_TOX "maj to{<?>} <?> "
+#define RID_MAJ_FROMTOX "maj from{<?>} to{<?>} <?> "
#define RID_PRODX "prod <?> "
#define RID_PROD_FROMX "prod from{<?>} <?> "
#define RID_PROD_TOX "prod to{<?>} <?> "
@@ -130,6 +134,10 @@ inline constexpr OUStringLiteral RID_UNDOFORMATNAME =
u"Format";
#define RID_LIMSUP_FROMX "limsup from{<?>} <?> "
#define RID_LIMSUP_TOX "limsup to{<?>} <?> "
#define RID_LIMSUP_FROMTOX "limsup from{<?>} to{<?>} <?> "
+#define RID_HADDX "hadd <?> "
+#define RID_HADD_FROMX "hadd from{<?>} <?> "
+#define RID_HADD_TOX "hadd to{<?>} <?> "
+#define RID_HADD_FROMTOX "hadd from{<?>} to{<?>} <?> "
#define RID_EXISTS "exists "
#define RID_NOTEXISTS "notexists "
#define RID_FORALL "forall "
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index d1feabd921a9..149211950444 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -197,11 +197,21 @@ const SmElementDescr s_a5OperatorsList[] =
{RID_LIMSUP_TOX, RID_LIMSUP_TOX_HELP, {}, {}},
{RID_LIMSUP_FROMTOX, RID_LIMSUP_FROMTOX_HELP, {}, {}},
{},
+ {RID_HADDX, RID_HADDX_HELP, {}, {}},
+ {RID_HADD_FROMX, RID_HADD_FROMX_HELP, {}, {}},
+ {RID_HADD_TOX, RID_HADD_TOX_HELP, {}, {}},
+ {RID_HADD_FROMTOX, RID_HADD_FROMTOX_HELP, {}, {}},
+ {},
{RID_SUMX, RID_SUMX_HELP, {}, {}},
{RID_SUM_FROMX, RID_SUM_FROMX_HELP, {}, {}},
{RID_SUM_TOX, RID_SUM_TOX_HELP, {}, {}},
{RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP, {}, {}},
{},
+ {RID_MAJX, RID_MAJX_HELP, {}, {}},
+ {RID_MAJ_FROMX, RID_MAJ_FROMX_HELP, {}, {}},
+ {RID_MAJ_TOX, RID_MAJ_TOX_HELP, {}, {}},
+ {RID_MAJ_FROMTOX, RID_MAJ_FROMTOX_HELP, {}, {}},
+ {},
{RID_PRODX, RID_PRODX_HELP, {}, {}},
{RID_PROD_FROMX, RID_PROD_FROMX_HELP, {}, {}},
{RID_PROD_TOX, RID_PROD_TOX_HELP, {}, {}},
commit 49a3e606856167f4e9c3a80e89900bf7c29c8423
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Sep 17 19:10:46 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 18 08:08:58 2023 +0200
use more concrete UNO types in sw
Change-Id: I028032671a346e1d046b846d3f9617b5a12ffd70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156998
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/inc/unocontentcontrol.hxx
b/sw/source/core/inc/unocontentcontrol.hxx
index d2881e0c8b08..08e32afd7f54 100644
--- a/sw/source/core/inc/unocontentcontrol.hxx
+++ b/sw/source/core/inc/unocontentcontrol.hxx
@@ -35,13 +35,14 @@
#include <unobaseclass.hxx>
#include <unocoll.hxx>
-typedef std::deque<css::uno::Reference<css::text::XTextRange>> TextRangeList_t;
-
class SwPaM;
class SwTextNode;
class SwFormatContentControl;
class SwContentControl;
class SwXText;
+class SwXTextPortion;
+
+typedef std::deque<rtl::Reference<SwXTextPortion>> TextRangeList_t;
/**
* UNO API wrapper around an SwContentControl, exposed as the
com.sun.star.text.ContentControl
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index d89ef914df1f..c2e4f4c30f8a 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -36,18 +36,20 @@
#include <unobaseclass.hxx>
-typedef std::deque<
- css::uno::Reference< css::text::XTextRange > >
- TextRangeList_t;
-
+class SwXTextPortion;
class SwPaM;
class SwTextNode;
class SwXText;
-
namespace sw {
class Meta;
}
+typedef std::deque<
+ rtl::Reference<SwXTextPortion> >
+ TextRangeList_t;
+
+
+
typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
, css::lang::XServiceInfo
@@ -93,7 +95,7 @@ public:
CreateXMeta(
::sw::Meta & rMeta,
css::uno::Reference<SwXText> xParentText,
- std::unique_ptr<TextRangeList_t const> && pPortions =
std::unique_ptr<TextRangeList_t const>());
+ std::unique_ptr<TextRangeList_t const> && pPortions);
static rtl::Reference<SwXMeta>
CreateXMeta(SwDoc & rDoc, bool isField);
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 53f05964fabd..d64936a70353 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -46,9 +46,10 @@ class SwFrameFormat;
class SwRangeRedline;
class SwTextRuby;
class SwXText;
+class SwXTextPortion;
typedef std::deque<
- css::uno::Reference< css::text::XTextRange > >
+ rtl::Reference<SwXTextPortion> >
TextRangeList_t;
enum SwTextPortionType
diff --git a/sw/source/core/txtnode/attrcontentcontrol.cxx
b/sw/source/core/txtnode/attrcontentcontrol.cxx
index c8a76e4041df..bc62606f2d97 100644
--- a/sw/source/core/txtnode/attrcontentcontrol.cxx
+++ b/sw/source/core/txtnode/attrcontentcontrol.cxx
@@ -31,6 +31,7 @@
#include <textcontentcontrol.hxx>
#include <doc.hxx>
#include <unocontentcontrol.hxx>
+#include <unoport.hxx>
#include <wrtsh.hxx>
using namespace com::sun::star;
diff --git a/sw/source/core/txtnode/fmtatr2.cxx
b/sw/source/core/txtnode/fmtatr2.cxx
index ba7862fd4110..7792d0183d54 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -32,6 +32,7 @@
#include <fmtruby.hxx>
#include <charfmt.hxx>
#include <unoevent.hxx>
+#include <unoport.hxx>
#include <com/sun/star/text/RubyAdjust.hpp>
#include <com/sun/star/text/RubyPosition.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -736,7 +737,7 @@ bool Meta::IsInContent() const
css::uno::Reference< css::rdf::XMetadatable > Meta::MakeUnoObject()
{
- return SwXMeta::CreateXMeta(*this, {});
+ return SwXMeta::CreateXMeta(*this, {}, {});
}
MetaField::MetaField(SwFormatMeta * const i_pFormat,
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index 14229655e6a0..5b78e31e5582 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -45,6 +45,7 @@
#include <textboxhelper.hxx>
#include <unofootnote.hxx>
#include <unolinebreak.hxx>
+#include <unoport.hxx>
#include <vcl/svapp.hxx>
#include <fmtcntnt.hxx>
#include <authfld.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 69ba9d3a6dbc..52e015984913 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -38,6 +38,7 @@
#include <ndtxt.hxx>
#include <unocrsr.hxx>
#include <unocrsrhelper.hxx>
+#include <unoport.hxx>
#include <swundo.hxx>
#include <rootfrm.hxx>
#include <paratr.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index afc10f618dba..420aa9a8bf95 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -348,7 +348,7 @@ uno::Any SwXTextPortionEnumeration::nextElement()
throw container::NoSuchElementException();
Any any;
- any <<= m_Portions.front();
+ any <<= uno::Reference<XTextRange>(m_Portions.front());
m_Portions.pop_front();
return any;
}
@@ -513,7 +513,7 @@ lcl_CreateTOXMarkPortion(
return pPortion;
}
-static uno::Reference<text::XTextRange>
+static rtl::Reference<SwXTextPortion>
lcl_CreateMetaPortion(
css::uno::Reference<SwXText> const& xParent,
const SwUnoCursor * const pUnoCursor,
@@ -540,7 +540,7 @@ lcl_CreateMetaPortion(
}
/// Creates a text portion that has a non-empty ContentControl property.
-static uno::Reference<text::XTextRange>
+static rtl::Reference<SwXTextPortion>
lcl_CreateContentControlPortion(const css::uno::Reference<SwXText>& xParent,
const SwUnoCursor* pUnoCursor, SwTextAttr&
rAttr,
std::unique_ptr<const TextRangeList_t>&&
pPortions)
@@ -736,14 +736,14 @@ lcl_ExportHints(
{
case RES_TXTATR_TOXMARK:
{
- Reference<XTextRange> xTmp = lcl_CreateTOXMarkPortion(
+ rtl::Reference<SwXTextPortion> xTmp =
lcl_CreateTOXMarkPortion(
xParent, pUnoCursor, *pAttr, true);
rPortionStack.top().first->push_back(xTmp);
}
break;
case RES_TXTATR_REFMARK:
{
- Reference<XTextRange> xTmp = lcl_CreateRefMarkPortion(
+ rtl::Reference<SwXTextPortion> xTmp =
lcl_CreateRefMarkPortion(
xParent, pUnoCursor, *pAttr, true);
rPortionStack.top().first->push_back(xTmp);
}
@@ -787,7 +787,7 @@ lcl_ExportHints(
std::unique_ptr<const TextRangeList_t>
pCurrentPortions(Top.first);
rPortionStack.pop();
- const uno::Reference<text::XTextRange> xPortion(
+ rtl::Reference<SwXTextPortion> xPortion(
lcl_CreateMetaPortion(xParent, pUnoCursor,
*pAttr,
std::move(pCurrentPortions)));
rPortionStack.top().first->push_back(xPortion);
@@ -820,7 +820,7 @@ lcl_ExportHints(
{
std::unique_ptr<const TextRangeList_t>
pCurrentPortions(Top.first);
rPortionStack.pop();
- uno::Reference<text::XTextRange> xPortion(
+ rtl::Reference<SwXTextPortion> xPortion(
lcl_CreateContentControlPortion(xParent,
pUnoCursor, *pAttr,
std::move(pCurrentPortions)));
rPortionStack.top().first->push_back(xPortion);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 18a4d1b20ce8..6aa26957bba0 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -172,6 +172,7 @@
#include <SearchResultLocator.hxx>
#include <textcontentcontrol.hxx>
#include <unocontentcontrol.hxx>
+#include <unoport.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
