[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtAccessibleWidget.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 2de74491a5a7b2183cce977f8ffaf81d0df11d75 Author: Michael Weghorn AuthorDate: Wed Aug 10 16:59:50 2022 +0200 Commit: Michael Weghorn CommitDate: Thu Aug 11 08:47:21 2022 +0200 qt a11y: Use correct coord system in QtAccessibleWidget::childAt `QAccessibleInterface::childAt` uses screen coordinates, but `XAccessibleComponent::getAccessibleAtPoint` wants local coordinates (i.e. coordinates relative to the object's top left corner), so convert accordingly. Change-Id: I61ab695ea6fdaf336903a0dc7d4c50c90a14e656 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138096 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx index 90f345919ef7..c0ed4a2096f7 100644 --- a/vcl/qt5/QtAccessibleWidget.cxx +++ b/vcl/qt5/QtAccessibleWidget.cxx @@ -711,8 +711,11 @@ QAccessibleInterface* QtAccessibleWidget::childAt(int x, int y) const return nullptr; Reference xAccessibleComponent(xAc, UNO_QUERY); +// convert from screen to local coordinates +QPoint aLocalCoords = QPoint(x, y) - rect().topLeft(); return QAccessible::queryAccessibleInterface( -new QtXAccessible(xAccessibleComponent->getAccessibleAtPoint(awt::Point(x, y; +new QtXAccessible(xAccessibleComponent->getAccessibleAtPoint( +awt::Point(aLocalCoords.x(), aLocalCoords.y(); } QAccessibleInterface* QtAccessibleWidget::customFactory(const QString& classname, QObject* object)
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtAccessibleWidget.cxx | 86 -
1 file changed, 76 insertions(+), 10 deletions(-)
New commits:
commit 38289a8abed7dc2a34035d579bf8f0dbbf058d67
Author: Michael Weghorn
AuthorDate: Wed Aug 10 15:21:39 2022 +0200
Commit: Michael Weghorn
CommitDate: Thu Aug 11 08:46:19 2022 +0200
qt a11y: Implement QtAccessibleWidget::text{After,Before}Offset
In a quick test with a Writer paragraph having the text
"Abcd efgh ijkl" selected in Accerciser's treeview of the
LO a11y hierarchy, the results of running these
commands looked as expected:
In [28]: text = acc.queryText()
In [29]: text.getTextBeforeOffset(4, pyatspi.text.TEXT_BOUNDARY_CHAR)
Out[29]: ('d', 3, 4)
In [30]: text.getTextAfterOffset(4, pyatspi.text.TEXT_BOUNDARY_CHAR)
Out[30]: ('e', 5, 6)
In [31]: text.getTextBeforeOffset(4,
pyatspi.text.TEXT_BOUNDARY_WORD_START)
Out[31]: ('Abcd', 0, 4)
In [32]: text.getTextAfterOffset(4,
pyatspi.text.TEXT_BOUNDARY_WORD_START)
Out[32]: ('efgh', 5, 9)
Change-Id: Icc310c05634763e92c298e793d87a603b654ac4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138092
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index ac60b3746803..90f345919ef7 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -1023,12 +1023,46 @@ QString QtAccessibleWidget::text(int startOffset, int
endOffset) const
return toQString(xText->getTextRange(startOffset, endOffset));
}
-QString QtAccessibleWidget::textAfterOffset(int /* offset */,
-QAccessible::TextBoundaryType /*
boundaryType */,
-int* /* startOffset */, int* /*
endOffset */) const
+QString QtAccessibleWidget::textAfterOffset(int nOffset,
+QAccessible::TextBoundaryType
eBoundaryType,
+int* pStartOffset, int*
pEndOffset) const
{
-SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::textAfterOffset");
-return QString();
+if (pStartOffset == nullptr || pEndOffset == nullptr)
+return QString();
+
+*pStartOffset = -1;
+*pEndOffset = -1;
+
+Reference xText(getAccessibleContextImpl(), UNO_QUERY);
+if (!xText.is())
+return QString();
+
+const int nCharCount = characterCount();
+// -1 is special value for text length
+if (nOffset == -1)
+nOffset = nCharCount;
+else if (nOffset < -1 || nOffset > nCharCount)
+{
+SAL_WARN("vcl.qt",
+ "QtAccessibleWidget::textAfterOffset called with invalid
offset: " << nOffset);
+return QString();
+}
+
+if (eBoundaryType == QAccessible::NoBoundary)
+{
+if (nOffset == nCharCount)
+return QString();
+*pStartOffset = nOffset + 1;
+*pEndOffset = nCharCount;
+return text(nOffset + 1, nCharCount);
+}
+
+sal_Int16 nUnoBoundaryType = lcl_matchQtTextBoundaryType(eBoundaryType);
+assert(nUnoBoundaryType > 0);
+const TextSegment aSegment = xText->getTextBehindIndex(nOffset,
nUnoBoundaryType);
+*pStartOffset = aSegment.SegmentStart;
+*pEndOffset = aSegment.SegmentEnd;
+return toQString(aSegment.SegmentText);
}
QString QtAccessibleWidget::textAtOffset(int offset,
QAccessible::TextBoundaryType boundaryType,
@@ -1069,12 +1103,44 @@ QString QtAccessibleWidget::textAtOffset(int offset,
QAccessible::TextBoundaryTy
return toQString(segment.SegmentText);
}
-QString QtAccessibleWidget::textBeforeOffset(int /* offset */,
- QAccessible::TextBoundaryType /*
boundaryType */,
- int* /* startOffset */, int* /*
endOffset */) const
+QString QtAccessibleWidget::textBeforeOffset(int nOffset,
+ QAccessible::TextBoundaryType
eBoundaryType,
+ int* pStartOffset, int*
pEndOffset) const
{
-SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::textBeforeOffset");
-return QString();
+if (pStartOffset == nullptr || pEndOffset == nullptr)
+return QString();
+
+*pStartOffset = -1;
+*pEndOffset = -1;
+
+Reference xText(getAccessibleContextImpl(), UNO_QUERY);
+if (!xText.is())
+return QString();
+
+const int nCharCount = characterCount();
+// -1 is special value for text length
+if (nOffset == -1)
+nOffset = nCharCount;
+else if (nOffset < -1 || nOffset > nCharCount)
+{
+SAL_WARN("vcl.qt",
+ "QtAccessibleWidget::textBeforeOffset called with invalid
offset: " << nOffset);
+return QString();
+}
+
+if (eBoundaryType == QAccessible::NoBoundary)
+
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtAccessibleWidget.cxx | 96 -
1 file changed, 85 insertions(+), 11 deletions(-)
New commits:
commit 69ecff82d0e5a0592f9bf6aa4fee364ff1c9754c
Author: Michael Weghorn
AuthorDate: Wed Aug 10 08:47:07 2022 +0200
Commit: Michael Weghorn
CommitDate: Thu Aug 11 08:46:03 2022 +0200
qt a11y: Check range for offset passed to text methods
Otherwise LO crashes when invalid offsets are passed
from AT when using the qt5/qt6/kf5 VCL plugins.
One scenario that resulted in a crash:
* start Accerciser
* start Calc
* press F2 in cell A1 to enter edit mode
* navigate to the "Cell A1" object representing the
editable cell, then to its paragraph child in
Accerciser's treeview of the LO a11y hierarchy
* in Accerciser's "Interface Viewer", type
Enter, then any character
This would crash due to a
`com::sun::star::lang::IndexOutOfBoundsException`
being thrown by one of the methods of the
XAccessibleText/XAccessibleEditableText
interfaces.
Change-Id: I1b8c6057ca1e4e4485d516418bb82cd1a6697ce1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138078
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index a7d0457801e6..ac60b3746803 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -844,7 +844,10 @@ QString QtAccessibleWidget::attributes(int offset, int*
startOffset, int* endOff
offset = nTextLength - 1;
if (offset < 0 || offset > nTextLength)
+{
+SAL_WARN("vcl.qt", "QtAccessibleWidget::attributes called with invalid
offset: " << offset);
return QString();
+}
const Sequence attribs
= xText->getCharacterAttributes(offset, Sequence());
@@ -887,6 +890,7 @@ int QtAccessibleWidget::characterCount() const
return xText->getCharacterCount();
return 0;
}
+
QRect QtAccessibleWidget::characterRect(int nOffset) const
{
Reference xText(getAccessibleContextImpl(), UNO_QUERY);
@@ -931,11 +935,21 @@ void QtAccessibleWidget::removeSelection(int /*
selectionIndex */)
{
SAL_INFO("vcl.qt", "Unsupported
QAccessibleTextInterface::removeSelection");
}
+
void QtAccessibleWidget::scrollToSubstring(int startIndex, int endIndex)
{
Reference xText(getAccessibleContextImpl(), UNO_QUERY);
-if (xText.is())
-xText->scrollSubstringTo(startIndex, endIndex,
AccessibleScrollType_SCROLL_ANYWHERE);
+if (!xText.is())
+return;
+
+sal_Int32 nTextLength = xText->getCharacterCount();
+if (startIndex < 0 || startIndex > nTextLength || endIndex < 0 || endIndex
> nTextLength)
+{
+SAL_WARN("vcl.qt", "QtAccessibleWidget::scrollToSubstring called with
invalid offset.");
+return;
+}
+
+xText->scrollSubstringTo(startIndex, endIndex,
AccessibleScrollType_SCROLL_ANYWHERE);
}
void QtAccessibleWidget::selection(int selectionIndex, int* startOffset, int*
endOffset) const
@@ -960,25 +974,55 @@ int QtAccessibleWidget::selectionCount() const
return 1; // Only 1 selection supported atm
return 0;
}
+
void QtAccessibleWidget::setCursorPosition(int position)
{
Reference xText(getAccessibleContextImpl(), UNO_QUERY);
-if (xText.is())
-xText->setCaretPosition(position);
+if (!xText.is())
+return;
+
+if (position < 0 || position > xText->getCharacterCount())
+{
+SAL_WARN("vcl.qt",
+ "QtAccessibleWidget::setCursorPosition called with invalid
offset: " << position);
+return;
+}
+
+xText->setCaretPosition(position);
}
+
void QtAccessibleWidget::setSelection(int /* selectionIndex */, int
startOffset, int endOffset)
{
Reference xText(getAccessibleContextImpl(), UNO_QUERY);
-if (xText.is())
-xText->setSelection(startOffset, endOffset);
+if (!xText.is())
+return;
+
+sal_Int32 nTextLength = xText->getCharacterCount();
+if (startOffset < 0 || startOffset > nTextLength || endOffset < 0 ||
endOffset > nTextLength)
+{
+SAL_WARN("vcl.qt", "QtAccessibleWidget::setSelection called with
invalid offset.");
+return;
+}
+
+xText->setSelection(startOffset, endOffset);
}
+
QString QtAccessibleWidget::text(int startOffset, int endOffset) const
{
Reference xText(getAccessibleContextImpl(), UNO_QUERY);
-if (xText.is())
-return toQString(xText->getTextRange(startOffset, endOffset));
-return QString();
+if (!xText.is())
+return QString();
+
+sal_Int32 nTextLength = xText->getCharacterCount();
+if (startOffset < 0 || startOffset > nTextLength || endOffset < 0 ||
endOffset > nTextLength)
+{
+SAL_WARN("vcl.qt", "QtAccessibleWidget::text called with invalid
offset.");
+return QString();
+}
+
+return toQString(xText->getTextRange(startOffset, endO
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/chart/objectformatter.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit f810f05e2b50068f6d14be152eb4c2ffbc1c4e5e
Author: Balazs Varga
AuthorDate: Tue Aug 9 18:11:02 2022 +0200
Commit: Balazs Varga
CommitDate: Thu Aug 11 08:29:29 2022 +0200
Related: tdf#150176 pptx chart import: fix automatic border style
With this patch it will work not just for pptx, but other ooxml presentation
file formats.
Follow up of commit: 071a36e042c76286fedb38f479dac79f29b661f9
(tdf#150176 pptx chart import: fix automatic border style)
Change-Id: I05e03d2723e9978156dfd8025e3a4b5bcecddbc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138059
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index 5644b9eedf09..e552dea82fb9 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -39,6 +39,8 @@
#include
#include
+#include
+
namespace oox::drawingml::chart {
using namespace ::com::sun::star::chart2;
@@ -829,13 +831,18 @@ LineFormatter::LineFormatter( ObjectFormatterData& rData,
const AutoFormatEntry*
if( const Theme* pTheme = mrData.mrFilter.getCurrentTheme() )
if( const LineProperties* pLineProps = pTheme->getLineStyle(
pAutoFormatEntry->mnThemedIdx ) )
*mxAutoLine = *pLineProps;
-// set automatic border property for chartarea, because of tdf#81437 and
tdf#82217, except for pptx (tdf#150176)
-if ( eObjType == OBJECTTYPE_CHARTSPACE &&
!rData.mrFilter.getFileUrl().endsWithIgnoreAsciiCase(".pptx") )
+// set automatic border property for chartarea, because of tdf#81437 and
tdf#82217, except for Impress (tdf#150176)
+if ( eObjType == OBJECTTYPE_CHARTSPACE )
{
-mxAutoLine->maLineFill.moFillType =
oox::GraphicHelper::getDefaultChartAreaLineStyle();
-mxAutoLine->moLineWidth =
oox::GraphicHelper::getDefaultChartAreaLineWidth();
-// this value is what MSO 2016 use as a default color for chartspace
border
-mxAutoLine->maLineFill.maFillColor.setSrgbClr( 0xD9D9D9 );
+OUString aFilterName;
+
rData.mrFilter.getMediaDescriptor()[utl::MediaDescriptor::PROP_FILTERNAME] >>=
aFilterName;
+if (!aFilterName.startsWithIgnoreAsciiCase("Impress"))
+{
+mxAutoLine->maLineFill.moFillType =
oox::GraphicHelper::getDefaultChartAreaLineStyle();
+mxAutoLine->moLineWidth =
oox::GraphicHelper::getDefaultChartAreaLineWidth();
+// this value is what MSO 2016 use as a default color for
chartspace border
+mxAutoLine->maLineFill.maFillColor.setSrgbClr(0xD9D9D9);
+}
}
// change line width according to chart auto style
if( mxAutoLine->moLineWidth.has_value() )
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/crsrsh.hxx |3 ++-
sw/inc/undobj.hxx |6 +++---
sw/source/core/crsr/crsrsh.cxx| 10 ++
sw/source/core/inc/UndoCore.hxx |2 +-
sw/source/core/undo/undobj.cxx| 20 ++--
sw/source/core/undo/undobj1.cxx |2 +-
sw/source/uibase/docvw/edtwin.cxx |4 ++--
sw/source/uibase/inc/wrtsh.hxx|3 ++-
sw/source/uibase/wrtsh/wrtsh1.cxx |8
9 files changed, 31 insertions(+), 27 deletions(-)
New commits:
commit a51509ee69b730e8987c149ac19e0bedccded127
Author: Noel Grandin
AuthorDate: Mon Aug 8 14:31:31 2022 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 11 07:58:11 2022 +0200
unique_ptr->optional in SwUndoSaveSection
Change-Id: I5fb07b35dbe3da55b6ca71537ac57dec9a5d0183
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138056
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 51d406f84cb8..7d1d38759529 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -200,13 +200,13 @@ public:
// Save a complete section in nodes-array.
class SwUndoSaveSection : private SwUndoSaveContent
{
-std::unique_ptr m_pMovedStart;
+std::optional m_oMovedStart;
std::unique_ptr m_pRedlineSaveData;
SwNodeOffset m_nMoveLen; // Index into UndoNodes-Array.
SwNodeOffset m_nStartPos;
protected:
-SwNodeIndex* GetMvSttIdx() const { return m_pMovedStart.get(); }
+const SwNodeIndex* GetMvSttIdx() const { return m_oMovedStart ?
&*m_oMovedStart : nullptr; }
SwNodeOffset GetMvNodeCnt() const { return m_nMoveLen; }
public:
@@ -309,7 +309,7 @@ protected:
SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId );
-SwNodeIndex* GetMvSttIdx() const { return
SwUndoSaveSection::GetMvSttIdx(); }
+const SwNodeIndex* GetMvSttIdx() const { return
SwUndoSaveSection::GetMvSttIdx(); }
SwNodeOffset GetMvNodeCnt() const { return
SwUndoSaveSection::GetMvNodeCnt(); }
public:
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index c1c66b702a78..76d474adcc99 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -54,7 +54,7 @@ public:
void RedlineToDoc( SwPaM const & rPam );
-SwNodeIndex* GetMvSttIdx() const
+const SwNodeIndex* GetMvSttIdx() const
{
return SwUndoSaveSection::GetMvSttIdx();
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index b91eb0c6a0ac..3fc087bfc443 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1212,14 +1212,14 @@ SwUndoSaveSection::SwUndoSaveSection()
SwUndoSaveSection::~SwUndoSaveSection()
{
-if (m_pMovedStart) // delete also the section from UndoNodes array
+if (m_oMovedStart) // delete also the section from UndoNodes array
{
// SaveSection saves the content in the PostIt section.
-SwNodes& rUNds = m_pMovedStart->GetNode().GetNodes();
+SwNodes& rUNds = m_oMovedStart->GetNode().GetNodes();
// cid#1486004 Uncaught exception
-suppress_fun_call_w_exception(rUNds.Delete(*m_pMovedStart,
m_nMoveLen));
+suppress_fun_call_w_exception(rUNds.Delete(*m_oMovedStart,
m_nMoveLen));
-m_pMovedStart.reset();
+m_oMovedStart.reset();
}
m_pRedlineSaveData.reset();
}
@@ -1272,9 +1272,9 @@ void SwUndoSaveSection::SaveSection(
// Keep positions as SwContentIndex so that this section can be deleted in
DTOR
SwNodeOffset nEnd;
-m_pMovedStart.reset(new SwNodeIndex(rRange.aStart));
-MoveToUndoNds(aPam, m_pMovedStart.get(), &nEnd);
-m_nMoveLen = nEnd - m_pMovedStart->GetIndex() + 1;
+m_oMovedStart = rRange.aStart;
+MoveToUndoNds(aPam, &*m_oMovedStart, &nEnd);
+m_nMoveLen = nEnd - m_oMovedStart->GetIndex() + 1;
}
void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx,
@@ -1303,11 +1303,11 @@ void SwUndoSaveSection::RestoreSection(
return;
SwPosition aInsPos( rInsPos );
-SwNodeOffset nEnd = m_pMovedStart->GetIndex() + m_nMoveLen - 1;
-MoveFromUndoNds(*pDoc, m_pMovedStart->GetIndex(), aInsPos, &nEnd,
bForceCreateFrames);
+SwNodeOffset nEnd = m_oMovedStart->GetIndex() + m_nMoveLen - 1;
+MoveFromUndoNds(*pDoc, m_oMovedStart->GetIndex(), aInsPos, &nEnd,
bForceCreateFrames);
// destroy indices again, content was deleted from UndoNodes array
-m_pMovedStart.reset();
+m_oMovedStart.reset();
m_nMoveLen = SwNodeOffset(0);
if( m_pRedlineSaveData )
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 55b0f622d694..c8af10da32d6 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -444,7 +444,7 @@ SwRewriter SwUndoDelLayFormat::GetRewriter() const
if (pDoc)
{
-SwNodeIndex* pIdx = GetMvSttIdx();
+const SwNodeIndex* pIdx = GetMvSttIdx();
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 22 commits - fpicker/source hwpfilter/source sc/inc sc/source shell/source svtools/source sw/source vcl/source writerfilter/source
fpicker/source/office/fileview.cxx | 10 +
hwpfilter/source/drawing.h | 13 +-
hwpfilter/source/hcode.cxx |2
hwpfilter/source/htags.cxx | 26 ++---
hwpfilter/source/hwpfile.cxx |7 +
hwpfilter/source/hwpfile.h |6 +
hwpfilter/source/hwpread.cxx | 21 ++--
hwpfilter/source/hwpreader.cxx | 78 ---
sc/inc/documentimport.hxx|2
sc/inc/table.hxx |2
sc/source/core/data/document.cxx | 12 +-
sc/source/core/data/documentimport.cxx | 14 ++
sc/source/core/data/table2.cxx | 15 ++
sc/source/filter/lotus/op.cxx| 11 --
sc/source/filter/oox/sheetdatabuffer.cxx | 16 ++-
shell/source/win32/SysShExec.cxx |8 +
svtools/source/dialogs/ServerDetailsControls.cxx |2
sw/source/filter/ww8/wrtw8sty.cxx| 28 ++---
sw/source/filter/ww8/wrtww8.hxx |4
vcl/source/fontsubset/sft.cxx| 12 +-
vcl/source/fontsubset/ttcr.cxx | 35 +-
vcl/source/outdev/hatch.cxx |7 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2
23 files changed, 208 insertions(+), 125 deletions(-)
New commits:
commit bc8b0f5a6dcb5758def46da50d5c1c7110fac3ac
Author: Caolán McNamara
AuthorDate: Tue Mar 1 10:18:51 2022 +
Commit: Aron Budea
CommitDate: Thu Aug 11 05:49:42 2022 +0200
ofz: don't register style if hbox load failed
Change-Id: I4d9d5d76f0c2385871003720e933ed1926f66c70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130771
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 3ac009bfec614ece98313c6444b4c1183ff14954)
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index bdb3855f437b..b90e1b635818 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -234,7 +234,6 @@ bool TxtBox::Read(HWPFile & hwpf)
hwpf.Read2b(&option, 1);
hwpf.Read2b(&ctrl_ch, 1);
hwpf.Read2b(style.margin, 12);
-hwpf.AddFBoxStyle(&style);
hwpf.Read2b(&box_xs, 1);
hwpf.Read2b(&box_ys, 1);
hwpf.Read2b(&cap_xs, 1);
@@ -362,7 +361,10 @@ bool TxtBox::Read(HWPFile & hwpf)
else
m_pTable = nullptr;
-return !hwpf.State();
+bSuccess = !hwpf.State();
+if (bSuccess)
+hwpf.AddFBoxStyle(&style);
+return bSuccess;
}
namespace
@@ -510,12 +512,14 @@ bool Picture::Read(HWPFile & hwpf)
style.boxtype = 'G';
else
style.boxtype = 'D';
-hwpf.AddFBoxStyle(&style);
// caption
hwpf.ReadParaList(caption);
-return !hwpf.State();
+bool bSuccess = !hwpf.State();
+if (bSuccess)
+hwpf.AddFBoxStyle(&style);
+return bSuccess;
}
// line(15)
@@ -553,7 +557,6 @@ bool Line::Read(HWPFile & hwpf)
hwpf.Read2b(&option, 1);
hwpf.Read2b(&ctrl_ch, 1);
hwpf.Read2b(style.margin, 12);
-hwpf.AddFBoxStyle(&style);
hwpf.Read2b(&box_xs, 1);
hwpf.Read2b(&box_ys, 1);
hwpf.Read2b(&cap_xs, 1);
@@ -582,7 +585,10 @@ bool Line::Read(HWPFile & hwpf)
hwpf.Read2b(&color, 1);
style.xpos = width;
-return !hwpf.State();
+bool bSuccess = !hwpf.State();
+if (bSuccess)
+hwpf.AddFBoxStyle(&style);
+return bSuccess;
}
// hidden(15)
commit c144a726f1500ecf53adc7e9ef1aab926cbeafec
Author: Caolán McNamara
AuthorDate: Tue Mar 1 09:35:34 2022 +
Commit: Aron Budea
CommitDate: Thu Aug 11 05:49:05 2022 +0200
ofz: glyph data must be at least 10 bytes long to be useful
Change-Id: I312c33c598013feced15c6f2dbcc66e493b703e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130767
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit b228045cf3fb50128fd40a8f26376443ad22f874)
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index d4ff5f413ede..86dc02206e92 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -1270,7 +1270,7 @@ static void ProcessTables(TrueTypeCreator *tt)
/* printf("IDs: %d %d.\n", gd->glyphID, gd->newID); */
-if (gd->nbytes != 0) {
+if (gd->nbytes >= 10) {
sal_Int16 z = GetInt16(gd->ptr, 2);
if (z < xMin) xMin = z;
commit cf7e029434be7f546679581d9c75110c6d4ebece
Author: Caolán McNamara
AuthorDate: Mon Feb 28 21:12:07 2022 +
Commit: Aron Budea
CommitDate: Thu Aug 11 05:48:34 2022 +0200
ofz: measure maximum possible contours
Change-Id: Ie039abd835fef0651
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 9 commits - hwpfilter/source lotuswordpro/source
hwpfilter/source/hwpreader.cxx| 12 +-
lotuswordpro/source/filter/lwpdrawobj.cxx | 123 --
2 files changed, 73 insertions(+), 62 deletions(-)
New commits:
commit 19e2c6c742b9a66dcc86f6344cedda667f847733
Author: Caolán McNamara
AuthorDate: Sun Mar 13 10:48:47 2022 +
Commit: Aron Budea
CommitDate: Wed Aug 10 22:48:21 2022 +0200
ofz#45524 string is presumed to be at least length 1
Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131468
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit eca150aeb9254a3c04d15be5a6278c2c65bf3fb0)
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 24d7c6530615..5b367326caec 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1253,7 +1253,11 @@ void LwpDrawTextArt::Read()
-
(m_aTextArtRec.aPath[1].n*3 + 1)*4;
-if (!m_pStream->good() || m_aTextArtRec.nTextLen >
m_pStream->remainingSize())
+if (!m_pStream->good())
+throw BadRead();
+if (m_aTextArtRec.nTextLen > m_pStream->remainingSize())
+throw BadRead();
+if (m_aTextArtRec.nTextLen < 1)
throw BadRead();
m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
commit 735be88f5f4e30d19de4b7d9b2ada4115bb2ebc5
Author: zhutyra
AuthorDate: Tue Feb 1 13:54:55 2022 +
Commit: Aron Budea
CommitDate: Wed Aug 10 22:48:06 2022 +0200
read of width/height uses wrong record size
this initially went wrong at:
commit b4fb7a437bb0ce987702b12008737756623618ac
Date: Mon May 23 21:38:40 2011 +0100
fix up some more endian
LIBREOFFICE-SBQ5TJRS
Change-Id: Ie418f530f55288351f73f3c0cbab9ac48e6b6964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129259
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 6694e3ea9c2f05a20245d94c5c1eda955cb3aacc)
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index d4d4b7ff19f9..24d7c6530615 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1392,8 +1392,12 @@ void LwpDrawBitmap::Read()
if (aInfoHeader2.nHeaderLen == sizeof(BmpInfoHeader))
{
-m_pStream->ReadUInt32( aInfoHeader2.nWidth );
-m_pStream->ReadUInt32( aInfoHeader2.nHeight );
+sal_uInt16 nTmp;
+
+m_pStream->ReadUInt16( nTmp );
+aInfoHeader2.nWidth = nTmp;
+m_pStream->ReadUInt16( nTmp );
+aInfoHeader2.nHeight = nTmp;
m_pStream->ReadUInt16( aInfoHeader2.nPlanes );
m_pStream->ReadUInt16( aInfoHeader2.nBitCount );
commit e607dcc3074a908e19b315f176f1c8eb80de1e42
Author: zhutyra
AuthorDate: Tue Feb 1 14:07:26 2022 +
Commit: Aron Budea
CommitDate: Wed Aug 10 22:46:36 2022 +0200
ensure bounds checking
LIBREOFFICE-SBQ5TJRS
Change-Id: I71f35bc120fdd70298685131f29a6bb822d50f11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129261
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 17dd787a4ca9c17883e0bdfc75c89c2fa7ec169e)
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index ec617fb24346..d4d4b7ff19f9 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1373,21 +1373,20 @@ void LwpDrawBitmap::Read()
m_pStream->ReadUInt16( m_aBmpRec.nTranslation );
m_pStream->ReadUInt16( m_aBmpRec.nRotation );
+// 20 == length of draw-specific fields.
if (m_aObjHeader.nRecLen < 20)
throw BadRead();
-// 20 == length of draw-specific fields.
-// 14 == length of bmp file header.
-m_aBmpRec.nFileSize = m_aObjHeader.nRecLen - 20 + 14;
+sal_uInt64 nBmpPos = m_pStream->Tell();
+sal_uInt64 nBmpLen =
+std::min(m_aObjHeader.nRecLen - 20,
m_pStream->remainingSize());
BmpInfoHeader2 aInfoHeader2;
m_pStream->ReadUInt32( aInfoHeader2.nHeaderLen );
-if (!m_pStream->good())
+if (!m_pStream->good() || nBmpLen < aInfoHeader2.nHeaderLen)
throw BadRead();
-m_pImageData.reset( new sal_uInt8 [m_aBmpRec.nFileSize] );
-
sal_uInt32 N;
sal_uInt32 rgbTableSize;
@@ -1411,7 +1410,7 @@ void LwpDrawBitmap::Read()
rgbTableSize = 3 * (1 << N);
}
}
-else
+else if (aInfoHeader2.nHeaderLen >= sizeof(BmpInfoHeader2))
{
m_pStream->ReadUInt32( aInfoHeader2.nWidth );
m_pStream->ReadUInt32( aInfoHeader2.nHeight );
@@ -1430,9 +1429,15 @@ void LwpDrawBitmap::Read()
{
rgbTableSize = 4 * (1 << N);
}
-
+}
+else
+{
+throw BadRead();
}
+
[Libreoffice-commits] core.git: Branch 'feature/chartdatatable' - 978 commits - accessibility/inc accessibility/source android/source animations/source avmedia/source basctl/inc basctl/source basctl/u
Rebased ref, commits from common ancestor:
commit 4208b0fac6111c9e5d438e2fe346e5987fcc8f4d
Author: Tomaž Vajngerl
AuthorDate: Mon Jul 18 08:12:19 2022 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Aug 10 15:16:22 2022 +0200
chart2: Data table rendering of keys (legend symbols)
Change-Id: Iff13b188df18fe8f9919274869774f53f2ea323b
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 3fe2fedcf7e8..5c7e70e97900 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -104,8 +104,7 @@ private:
public:
ChartView() = delete;
-ChartView(css::uno::Reference< css::uno::XComponentContext > xContext,
- ChartModel& rModel);
+ChartView(css::uno::Reference xContext,
ChartModel& rModel);
virtual ~ChartView() override;
@@ -185,6 +184,8 @@ public:
void setViewDirty();
+css::uno::Reference const&
getComponentContext() { return m_xCC;}
+
/// See sfx2::XmlDump::dumpAsXml().
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
@@ -210,8 +211,7 @@ private: //methods
private: //member
::osl::Mutex m_aMutex;
-css::uno::Reference< css::uno::XComponentContext>
-m_xCC;
+css::uno::Reference< css::uno::XComponentContext> m_xCC;
chart::ChartModel& mrChartModel;
diff --git a/chart2/source/view/axes/VAxisBase.cxx
b/chart2/source/view/axes/VAxisBase.cxx
index 814d3afd7858..30aead187dcb 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -244,7 +244,8 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter&
rIter )
void
VAxisBase::createDataTableView(std::vector>&
/*rSeriesPlotterList*/,
uno::Reference const& /*xNumberFormatsSupplier*/,
-rtl::Reference<::chart::ChartModel> const&
/*xChartDoc*/)
+rtl::Reference<::chart::ChartModel> const&
/*xChartDoc*/,
+
css::uno::Reference const& /*rComponentContext*/)
{
}
diff --git a/chart2/source/view/axes/VAxisBase.hxx
b/chart2/source/view/axes/VAxisBase.hxx
index 2c4123ba951d..4ee4f5e288ae 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -23,6 +23,7 @@
#include "Tickmarks.hxx"
namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
@@ -30,6 +31,7 @@ namespace chart
class VSeriesPlotter;
class DataTableView;
class ChartModel;
+class LegendEntryProvider;
class VAxisBase : public VAxisOrGridBase
{
@@ -65,7 +67,8 @@ public:
virtual void
createDataTableView(std::vector>&
rSeriesPlotterList,
css::uno::Reference const&
xNumberFormatsSupplier,
- rtl::Reference<::chart::ChartModel>
const& xChartDoc);
+ rtl::Reference<::chart::ChartModel>
const& xChartDoc,
+
css::uno::Reference const& rComponentContext);
std::shared_ptr getDataTableView() { return
m_pDataTableView; }
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index d7e78d5d2e85..293d1f0479a8 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1995,11 +1995,12 @@ void VCartesianAxis::createShapes()
void
VCartesianAxis::createDataTableView(std::vector>&
rSeriesPlotterList,
Reference const& xNumberFormatsSupplier,
- rtl::Reference<::chart::ChartModel>
const& xChartDoc)
+ rtl::Reference<::chart::ChartModel>
const& xChartDoc,
+
css::uno::Reference const& rComponentContext)
{
if (m_aAxisProperties.m_bDisplayDataTable)
{
-m_pDataTableView.reset(new DataTableView(xChartDoc,
m_aAxisProperties.m_xDataTableModel));
+m_pDataTableView.reset(new DataTableView(xChartDoc,
m_aAxisProperties.m_xDataTableModel, rComponentContext));
m_pDataTableView->initializeValues(rSeriesPlotterList);
m_xNumberFormatsSupplier = xNumberFormatsSupplier;
}
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx
b/chart2/source/view/axes/VCartesianAxis.hxx
index a9baca907bdd..132887510eff 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -23,7 +23,6 @@
namespace chart
{
-
class VCartesianAxis : public VAxisBase
{
// public methods
@@ -101,7 +100,8 @@ public:
void createDataTableView(std::vector>&
rSeriesPlotterList,
css::uno::Reference const&
xNumberFormatsSupplier,
- rtl::Reference<::chart::ChartModel> const&
xChartDoc) override;
+
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlfly.hxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 450471ebbdbff40998509731028b28e0ada53f58
Author: Andrea Gelmini
AuthorDate: Wed Aug 10 11:33:34 2022 +0200
Commit: Julien Nabet
CommitDate: Wed Aug 10 17:56:00 2022 +0200
Removed duplicated included & move to pragma once
Change-Id: If936a1b105f68f234a6537a4a9e9ab9661714a78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138071
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sw/source/filter/html/htmlfly.hxx
b/sw/source/filter/html/htmlfly.hxx
index 58865d361640..f6265f532526 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -17,10 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
-#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFLY_HXX
-
-#include
+#pragma once
#include
#include
@@ -130,6 +127,4 @@ class SwHTMLPosFlyFrames
o3tl::find_partialorder_ptrequals>
{};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/fldui/fldmgr.cxx |4 ++--
sw/source/uibase/inc/fldmgr.hxx |5 +++--
sw/source/uibase/wrtsh/wrtsh1.cxx |4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit b55180df249fe9a2efa145142a9c1ed7c51be849
Author: Noel Grandin
AuthorDate: Mon Aug 8 18:55:46 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 10 16:28:10 2022 +0200
unique_ptr->optional in SwInsertField_Data
Change-Id: Ifcf9cf2b3f731737e12c5316e4fa584cc47fce36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138076
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 7a860203f63d..ec544bca99ac 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -893,7 +893,7 @@ SwFieldTypesEnum SwFieldMgr::GetCurTypeId() const
// Over string insert field or update
bool SwFieldMgr::InsertField(
-const SwInsertField_Data& rData)
+SwInsertField_Data& rData)
{
std::unique_ptr pField;
bool bExp = false;
@@ -1487,7 +1487,7 @@ bool SwFieldMgr::InsertField(
// insert
pCurShell->StartAllAction();
-bool const isSuccess = pCurShell->InsertField2(*pField,
rData.m_pAnnotationRange.get());
+bool const isSuccess = pCurShell->InsertField2(*pField,
rData.m_oAnnotationRange ? &*rData.m_oAnnotationRange : nullptr);
if (isSuccess)
{
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 8c1a9d5918cc..c62d5cb00c97 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
namespace com::sun::star{
@@ -80,7 +81,7 @@ struct SwInsertField_Data
css::uno::Any m_aDBColumn;
weld::Widget* m_pParent; // parent widget used for
SwWrtShell::StartInputFieldDlg()
/// Marks the PostIt field's annotation start/end if it differs from the
cursor selection.
-std::unique_ptr m_pAnnotationRange;
+std::optional m_oAnnotationRange;
SwInsertField_Data(SwFieldTypesEnum nType, sal_uInt16 nSub, const
OUString& rPar1, const OUString& rPar2,
sal_uInt32 nFormatId, SwWrtShell* pShell = nullptr,
sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
@@ -123,7 +124,7 @@ public:
{ m_pWrtShell = pShell; }
// insert field using TypeID (TYP_ ...)
-bool InsertField( const SwInsertField_Data& rData );
+bool InsertField( SwInsertField_Data& rData );
// change the current field directly
voidUpdateCurField(sal_uInt32 nFormat,
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index d61cb158c93f..805ec71f61d8 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -2276,8 +2276,8 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr,
const SfxRequest& rReq)
}
else if (pFormat && pFormat->GetAnchor().GetAnchorId() ==
RndStdIds::FLY_AT_CHAR)
{
-aData.m_pAnnotationRange.reset(new
SwPaM(*GetCurrentShellCursor().Start(),
-
*GetCurrentShellCursor().End()));
+
aData.m_oAnnotationRange.emplace(*GetCurrentShellCursor().Start(),
+
*GetCurrentShellCursor().End());
}
}
}
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.4.0.3'
Tag 'libreoffice-7.4.0.3' created by Christian Lohmaier at 2022-08-10 14:14 + Tag libreoffice-7.4.0.3 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmLzvVMACgkQ9DSh76/u rqNMqhAAwmsEOEMbcqmo2oAFkNOLg/g5J4ytTOdcfHSlRvGADhUgVvBibgqFkRhF guHyxU7gW7pbg+kM6nsP+6fYXDII4rnYoIlKfHpuln/zNLu55Sd7Yj230RyU++C6 Xpcp2OgBsQB+zZNspLLN2dSmjoiSBsoFXcnJorCEtkAimEBluiqnqPVxevBwZCuY JUtO10MUwKLfvVsHs8WnlzVuHmlAGFSBUm63ofk160jZNdaoWj592VZuxSp7myWJ gcQdfHSwpcEw72AXfCd5psnADYsTfLzZfGDHlmPfrIypg4NSULEPNYXm1k2prQd9 gb9vREQJOlO9upFNlu183vnvUY9pZsmWdquNjHiXTeKx4JOghVyQ8D1V3mfuTqGz oxa/0HrA1gDDnUM3oKlbL/WP09GPHBjQW0YH0qCC08XXZCCmdCETrV8iI5hEbuaJ xAPaodYhyIZ5tLz7Ljw9uSiVGF21tlICTXVAE2mnuoqgmBGOKqOX3zQVwC2nVVz1 CnJXTVMRNmvbwVsmopbQ3XnL1ba+blpPzBWLlBYybJeM6EzKm6ncpnQyKJWUf9wq 1Vri9daCnPJh7y3VrC/vPbuWWYv0cIH2fYwOvGA5P1n/XxtCqJ2ZljLKbsLJ66MW IlM8E17LemHgrMgEvNGMwE/5oulwEsFL/Wn6I8L46CwzvitP0cI= =SwUj -END PGP SIGNATURE- Changes since libreoffice-7-4-branch-point-390: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.4.0.3'
Tag 'libreoffice-7.4.0.3' created by Christian Lohmaier at 2022-08-10 14:14 + Tag libreoffice-7.4.0.3 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmLzvVMACgkQ9DSh76/u rqOTnQ/+KbVesdAU2UEEKITBtf1VqeyRuK//16WfH8KC9nad80ykH2D6Kt/nz+Ne deNuWAQFUv5cnAA9XSN5v6aMBrXdIXoB+Z5hNMIxVFLJTyAw2uRRSRQQn8RV+oIR ZESAe40S2rKgFUXR0uxfm62vYYD9ghH/Le9pqCLQBEIOQYzuINON42/hDUPonstn 2Xc8TI7t0CW0GS2IOZnXMjtKws5wBJ0WzBMvoawKj/+M+ZA8R2f9hQHj/QvcTAFH B31LQHZ5EZ1+XzGnieIS6ydSuOJ5ks2WxKQd+OqBo8iSqyzSMljX+ickwsMF/DFh VxkirqxOY4M7QO9hCA9TGkqMhQSwVazEIUxENjlzVQhHKH15I9LdRzmuEsA66TRh m7lxGO8O/wOxx50wbN9rZUKAbnIhLjGoFeF+ay/zml1VeYSRN1kR0Ef9hBGUMKB9 FyMMVg5oyIufnBsoePjZnQ/DvF56Qky8OOKuUgY+nmTNuT+HI6NYZY4J5RI1hKmK lBFIpvoJIEePu5UvhPh5WgE609GXnw+aL7vJe9ubAt1TePHixxyaZ53jmp2WoNdG ej6xfWAMuge/LNIE71PWrEvOhzGgofq+buPgEA/n6gyUVVqgUE5o/G9pu+GCxOQI wACX8keOEJl7qV8Orj39rpVmWmT3woCd00kAEvoG0jeavGFugaI= =v7n3 -END PGP SIGNATURE- Changes since libreoffice-7-4-branch-point-14: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.4.0.3'
Tag 'libreoffice-7.4.0.3' created by Christian Lohmaier at 2022-08-10 14:14 + Tag libreoffice-7.4.0.3 -BEGIN PGP SIGNATURE- iQIyBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmLzvVAACgkQ9DSh76/u rqO2aA/4rClzA9aHcerYqce7oSejOfRWNsEvhCDAX2ImeKCOECCA9CuKS6RMiQQc RBSE5pP5NaNY9gCtk8vEjXDXoelH6oqhc+DZ9hy/BU9169KGbsweKO/Ce9yhnSGe fWf718lb12umJxZLPmDljkVA6+MbcCBd+0Hp/6SB+p7pPGZAiQdnvzlm5Buq+UIM peY2AXNdXUswT8ns/NfmYkTOCw3KMQxEIy62eqq9tprGK8mhi2cAaLb2o0Cb3IKD I6Y+v9xGxmutXzokFHMKK751/RpxmGZIfG2fd0g96hba4hd7h/2NVi6lWeTW18hy WUQTGfD1e2WrAm5EyGfmOzSNE/ZmRAxR0CCRNnLLAYf0qbDxa+VSaAEimgieBHRI c9WoXImjoh5gxus2dxoz52BSwhurN4OVHFGZABtwMJk/4hu6oifSb0Mr3GTtthaP 48XCKVfHEHgd3rGpxRspD7TnVacegyAJjmVwC95Oh9Zkbk/AzKmrsyjcVqz7c2bK /VFBmjeER4iw6PlzB1KAfmFlukT+ql9+SlsJKW0rSKBcnzX9oTH2lEfkcGwE2EGR xlJ1paHenWbukxt6aDvSAiH5KDFCZpa+FJKHlQn1tJOzcXsolNBxlMU4XXZa8SP8 kkmY2QTQ8Rx8EwkkVl1xSKJRkz36BkebATPXMLUX35yNIvfF6A== =roll -END PGP SIGNATURE- Changes since libreoffice-7-4-branch-point-2: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.4.0.3'
Tag 'libreoffice-7.4.0.3' created by Christian Lohmaier at 2022-08-10 14:14 + Tag libreoffice-7.4.0.3 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmLzvVMACgkQ9DSh76/u rqNQrA//X1dnunxnmKSm6uk/3iihvRz74AAg8mhy1SHFO2znGKIR5YAVkkpxp6+X K0UwLh7C/ZMSO1NaDByPRiQrZL0hWLnDomHxuXYYvxnXF1CXVxxRTO2zfD2qe0o7 HVPoKU4MZxvme73noSXsNudUKw+13vLeeK4XYn10s79RE/YznCmAZsKJ3Qknibh1 EWI7qdQKGSjt22hqLSIywTn5g0TNVo6ExkhGNLkPoAF7sxKAnIlkPhqSn022IOWk hj1r5+0nrFXhWq1RVAAqSjLKxbO7uFsQ4OQL2NEZewApHKlwbT9D5ZKFp0BEptkE +s8mt6CEVTfLaYbQbYEs19+gCIENw8RbZU3FvqIO/aaV3zhILPpaXO1XWtx5HIMy FRNtgaFsB1OUJSV9FyJXW1/jZZMet7Xe1mgClOGTPDQ+F/3QmY+nDwC8Au8e/6Tc 1sOsj+zvemLQ6EOiW9r2tKcRicHCjFXHCJbwOrAA2hFMA/gN/G50+yg9xTEuzykE M88D0ypX12SjjmSEVTgKm95/sYtVGY7d0waATArBeSX09TaQpOSwDNtADy196vmh Ld3s7d7kruHGXRyrRdrQ3mykyOr6f0C1WY+dSKSLv8gUDaQYCLbPTXqTSgaraofo Rz4VT5rW0XiPWcUE/3CZMu6ExbQIx7C9Yr9lQJ1huzVX3Cl5iOI= =P+fy -END PGP SIGNATURE- Changes since libreoffice-7-4-branch-point-51: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cb1c3fb01d9e035b2ac7b58677181a07cd92dc1 Author: Christian Lohmaier AuthorDate: Wed Aug 10 16:15:04 2022 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 10 16:15:04 2022 +0200 bump product version to 7.4.0.3.0+ Change-Id: I6ce959f37410c2607c0c92d8898f5d2c9ecc2d89 diff --git a/configure.ac b/configure.ac index 45fb6f2e34f6..022d9f18f72e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.4.0.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.4.0.3.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 4514 ++-- 1 file changed, 2270 insertions(+), 2244 deletions(-) New commits: commit 6e3dd4f05a69c0ed32a4a0d26e79c4af8a4dc0ec Author: Christian Lohmaier AuthorDate: Wed Aug 10 16:06:03 2022 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 10 16:10:33 2022 +0200 update credits Change-Id: I70c537db5dbf921de0c8b3bebf7d241f9173b705 (cherry picked from commit b099798085e7b883974928e06644a03ef98cea58) (cherry picked from commit 31711a0cd969906392e2a060a3610e49993f8aaa) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 7c9b7449e0d5..0ec5b6ad16d3 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://openoffice.org/2009/office"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.3.2$Linux_X86_64 LibreOffice_project/d1d0ea68f081ee2800a922cac8f79445e46033482012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.5.2$Linux_X86_64 LibreOffice_project/184fe81b8c8c30d8b5082578aee2fed2ea847c012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 808 + 2152 501 32175 28180 @@ -16,9 +16,9 @@ 3649 3434 501 - 808 + 2152 32674 - 28986 + 30330 0 0 false @@ -97,7 +97,7 @@ true - 11044056 + 4413 true false @@ -166,7 +166,7 @@ - + @@ -350,13 +350,10 @@ - - - - - + + @@ -422,21 +419,21 @@ - + - + - + - + - + @@ -1078,20 +1075,19 @@ Credits -1774 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-07-15 20:07:46. +1778 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-08-09 12:12:09. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - - + + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 33138Joined: 2000-10-10 + Caolán McNamaraCommits: 33245Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1100,7 +1096,7 @@ Oliver BolteCommits: 31008Joined: 2000
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 4514 ++-- 1 file changed, 2270 insertions(+), 2244 deletions(-) New commits: commit 31711a0cd969906392e2a060a3610e49993f8aaa Author: Christian Lohmaier AuthorDate: Wed Aug 10 16:06:03 2022 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 10 16:08:33 2022 +0200 update credits Change-Id: I70c537db5dbf921de0c8b3bebf7d241f9173b705 (cherry picked from commit b099798085e7b883974928e06644a03ef98cea58) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 7c9b7449e0d5..0ec5b6ad16d3 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://openoffice.org/2009/office"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.3.2$Linux_X86_64 LibreOffice_project/d1d0ea68f081ee2800a922cac8f79445e46033482012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.5.2$Linux_X86_64 LibreOffice_project/184fe81b8c8c30d8b5082578aee2fed2ea847c012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 808 + 2152 501 32175 28180 @@ -16,9 +16,9 @@ 3649 3434 501 - 808 + 2152 32674 - 28986 + 30330 0 0 false @@ -97,7 +97,7 @@ true - 11044056 + 4413 true false @@ -166,7 +166,7 @@ - + @@ -350,13 +350,10 @@ - - - - - + + @@ -422,21 +419,21 @@ - + - + - + - + - + @@ -1078,20 +1075,19 @@ Credits -1774 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-07-15 20:07:46. +1778 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-08-09 12:12:09. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - - + + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 33138Joined: 2000-10-10 + Caolán McNamaraCommits: 33245Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1100,7 +1096,7 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - + Jens-Heiner Rechtien
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 4514 ++-- 1 file changed, 2270 insertions(+), 2244 deletions(-) New commits: commit 274137fbf3b024bd29cbf43ca293c351f9389fc5 Author: Christian Lohmaier AuthorDate: Wed Aug 10 16:06:03 2022 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 10 16:07:45 2022 +0200 update credits Change-Id: I70c537db5dbf921de0c8b3bebf7d241f9173b705 (cherry picked from commit b099798085e7b883974928e06644a03ef98cea58) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 7c9b7449e0d5..0ec5b6ad16d3 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://openoffice.org/2009/office"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.3.2$Linux_X86_64 LibreOffice_project/d1d0ea68f081ee2800a922cac8f79445e46033482012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.5.2$Linux_X86_64 LibreOffice_project/184fe81b8c8c30d8b5082578aee2fed2ea847c012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 808 + 2152 501 32175 28180 @@ -16,9 +16,9 @@ 3649 3434 501 - 808 + 2152 32674 - 28986 + 30330 0 0 false @@ -97,7 +97,7 @@ true - 11044056 + 4413 true false @@ -166,7 +166,7 @@ - + @@ -350,13 +350,10 @@ - - - - - + + @@ -422,21 +419,21 @@ - + - + - + - + - + @@ -1078,20 +1075,19 @@ Credits -1774 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-07-15 20:07:46. +1778 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-08-09 12:12:09. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - - + + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 33138Joined: 2000-10-10 + Caolán McNamaraCommits: 33245Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1100,7 +1096,7 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - + Jens-Heiner Rechtien
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 4514 ++-- 1 file changed, 2270 insertions(+), 2244 deletions(-) New commits: commit b099798085e7b883974928e06644a03ef98cea58 Author: Christian Lohmaier AuthorDate: Wed Aug 10 16:06:03 2022 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 10 16:06:42 2022 +0200 update credits Change-Id: I70c537db5dbf921de0c8b3bebf7d241f9173b705 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 7c9b7449e0d5..0ec5b6ad16d3 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://openoffice.org/2009/office"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.3.2$Linux_X86_64 LibreOffice_project/d1d0ea68f081ee2800a922cac8f79445e46033482012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.3.5.2$Linux_X86_64 LibreOffice_project/184fe81b8c8c30d8b5082578aee2fed2ea847c012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 808 + 2152 501 32175 28180 @@ -16,9 +16,9 @@ 3649 3434 501 - 808 + 2152 32674 - 28986 + 30330 0 0 false @@ -97,7 +97,7 @@ true - 11044056 + 4413 true false @@ -166,7 +166,7 @@ - + @@ -350,13 +350,10 @@ - - - - - + + @@ -422,21 +419,21 @@ - + - + - + - + - + @@ -1078,20 +1075,19 @@ Credits -1774 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-07-15 20:07:46. +1778 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2022-08-09 12:12:09. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - - - + + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 33138Joined: 2000-10-10 + Caolán McNamaraCommits: 33245Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1100,7 +1096,7 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - + Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18 @@ -1108,27 +1104,27 @@
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source filter/source
desktop/source/lib/init.cxx|6 +-
filter/source/storagefilterdetect/filterdetect.cxx |7 +++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 35883e33fdc482862ea00ec0c74d5d253799ecb1
Author: Mert Tumer
AuthorDate: Wed Apr 6 16:59:53 2022 +0300
Commit: Henry Castro
CommitDate: Wed Aug 10 16:00:13 2022 +0200
lok: load template documents as regular documents
otherwise lok cannot save them directly because
libreoffice will try to open a save-as dialog
For odg, change the draw8_template type draw8
Signed-off-by: Mert Tumer
Change-Id: I34b0ed03adcac89eaa926f8ae6c57e6f622a90f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132633
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138074
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2847e64621b2..1533021c56a9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2575,10 +2575,14 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
document::MacroExecMode::NEVER_EXECUTE;
#endif
+// set AsTemplate explicitly false to be able to load template files
+// as regular files, otherwise we cannot save them; it will try
+// to bring saveas dialog which cannot work with LOK case
uno::Sequence aFilterOptions{
comphelper::makePropertyValue("FilterOptions", sFilterOptions),
comphelper::makePropertyValue("InteractionHandler", xInteraction),
-comphelper::makePropertyValue("MacroExecutionMode", nMacroExecMode)
+comphelper::makePropertyValue("MacroExecutionMode",
nMacroExecMode),
+comphelper::makePropertyValue("AsTemplate", false)
};
/* TODO
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx
b/filter/source/storagefilterdetect/filterdetect.cxx
index f45edd6cb5b6..d8e5df13b874 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -32,6 +32,8 @@
#include
#include
+#include
+
using namespace ::com::sun::star;
using utl::MediaDescriptor;
@@ -102,6 +104,11 @@ OUString SAL_CALL
StorageFilterDetect::detect(uno::SequencegetPropertyValue( "MediaType" ) >>= aMediaType;
aTypeName = getInternalFromMediaType( aMediaType );
+if (comphelper::LibreOfficeKit::isActive() && aTypeName ==
"draw8_template")
+{
+// save it as draw8 instead of template format
+aTypeName = "draw8";
+}
}
catch( const lang::WrappedTargetException& aWrap )
[Libreoffice-commits] core.git: vcl/source
vcl/source/treelist/iconview.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6aa61dc78640113060889ffe69464ef2e8aab5c4
Author: Mike Kaganski
AuthorDate: Tue Aug 9 20:54:15 2022 +0300
Commit: Mike Kaganski
CommitDate: Wed Aug 10 15:49:14 2022 +0200
jsdialog: dump IconView::GetActivateOnSingleClick
Change-Id: I426c3148ee9ba92f10411ff88fc6a6fad8f0da53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138064
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 7814810cb7dd..df9dde3ddd87 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -308,6 +308,7 @@ void IconView::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
{
SvTreeListBox::DumpAsPropertyTree(rJsonWriter);
rJsonWriter.put("type", "iconview");
+rJsonWriter.put("singleclickactivate", GetActivateOnSingleClick());
auto aNode = rJsonWriter.startArray("entries");
lcl_DumpEntryAndSiblings(rJsonWriter, First(), this);
}
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0d82e387bd541046ef92838461d2e5cf90a8a08 Author: Christian Lohmaier AuthorDate: Wed Aug 10 15:40:42 2022 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 10 15:40:42 2022 +0200 Update git submodules * Update translations from branch 'master' to f808bec4d777ad59ba0a993408723c34e2fa9989 - update translations for 7.4.0 rc3/master and force-fix errors using pocheck Change-Id: I6c070b2c1cad40730d6a8ead60d4edd9b23c9c38 diff --git a/translations b/translations index 9d3310b0b023..f808bec4d777 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 9d3310b0b0232aea02d5f75f4d3ce76b6d58635c +Subproject commit f808bec4d777ad59ba0a993408723c34e2fa9989
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82047c0ada0dbecccedd84d0c1bec3a081cf55bf Author: Christian Lohmaier AuthorDate: Wed Aug 10 15:43:09 2022 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 10 15:43:09 2022 +0200 Update git submodules * Update translations from branch 'libreoffice-7-4-0' to a962c1deb790b96929510d22397b61eafb2f2dbe - update translations for 7.4.0 rc3/master and force-fix errors using pocheck Change-Id: I6c070b2c1cad40730d6a8ead60d4edd9b23c9c38 (cherry picked from commit f808bec4d777ad59ba0a993408723c34e2fa9989) (cherry picked from commit 929d184ef2f58edbc3c87636bea59646ac504bc0) diff --git a/translations b/translations index 2fffceacfb66..a962c1deb790 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2fffceacfb667d384c5093d59e18a1962dccf1b3 +Subproject commit a962c1deb790b96929510d22397b61eafb2f2dbe
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1fca0e49cdc98c3647251788534d5d2f3ac447a6 Author: Christian Lohmaier AuthorDate: Wed Aug 10 15:41:47 2022 +0200 Commit: Gerrit Code Review CommitDate: Wed Aug 10 15:41:47 2022 +0200 Update git submodules * Update translations from branch 'libreoffice-7-4' to 929d184ef2f58edbc3c87636bea59646ac504bc0 - update translations for 7.4.0 rc3/master and force-fix errors using pocheck Change-Id: I6c070b2c1cad40730d6a8ead60d4edd9b23c9c38 (cherry picked from commit f808bec4d777ad59ba0a993408723c34e2fa9989) diff --git a/translations b/translations index 077c18a8091b..929d184ef2f5 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 077c18a8091b5cafac7e6079fc9105899d0b40a1 +Subproject commit 929d184ef2f58edbc3c87636bea59646ac504bc0
[Libreoffice-commits] core.git: Branch 'feature/chartdatatable' - 5 commits - chart2/inc chart2/qa chart2/source include/svx include/xmloff offapi/com schema/libreoffice svx/source xmloff/Library_xo.m
chart2/inc/ChartView.hxx|8
chart2/qa/extras/chart2export2.cxx | 52
chart2/qa/extras/data/xlsx/ChartDataTable.xlsx |binary
chart2/source/controller/main/ChartController_Insert.cxx| 25 +-
chart2/source/model/main/DataTable.cxx |6
chart2/source/model/main/Diagram.cxx|2
chart2/source/view/axes/VAxisBase.cxx |3
chart2/source/view/axes/VAxisBase.hxx |5
chart2/source/view/axes/VCartesianAxis.cxx |5
chart2/source/view/axes/VCartesianAxis.hxx |4
chart2/source/view/axes/VCartesianCoordinateSystem.cxx |5
chart2/source/view/axes/VCartesianCoordinateSystem.hxx |3
chart2/source/view/axes/VCoordinateSystem.cxx |3
chart2/source/view/axes/VPolarCoordinateSystem.cxx |3
chart2/source/view/axes/VPolarCoordinateSystem.hxx |3
chart2/source/view/charttypes/VSeriesPlotter.cxx| 140
chart2/source/view/inc/DataTableView.hxx| 16 +
chart2/source/view/inc/LegendEntryProvider.hxx |9
chart2/source/view/inc/VCoordinateSystem.hxx|4
chart2/source/view/inc/VSeriesPlotter.hxx | 12 +
chart2/source/view/main/ChartView.cxx | 13 -
chart2/source/view/main/DataTableView.cxx | 121 --
include/svx/svdotable.hxx |2
include/xmloff/xmltoken.hxx |7
offapi/com/sun/star/text/NumberingRules.idl |2
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 113 +++--
svx/source/table/svdotable.cxx | 12 +
xmloff/Library_xo.mk|1
xmloff/source/chart/PropertyMaps.cxx|6
xmloff/source/chart/SchXMLChartContext.cxx |4
xmloff/source/chart/SchXMLDataTableContext.cxx | 87 +++
xmloff/source/chart/SchXMLDataTableContext.hxx | 40 +++
xmloff/source/chart/SchXMLExport.cxx| 38 ++-
xmloff/source/core/xmltoken.cxx | 11
xmloff/source/token/tokens.txt |5
35 files changed, 677 insertions(+), 93 deletions(-)
New commits:
commit 7d203b23ff94f59d29b2e283dd5866b77a2d137d
Author: Tomaž Vajngerl
AuthorDate: Mon Jul 18 08:12:19 2022 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Aug 10 12:12:51 2022 +0200
chart2: data table rendering of keys (legend symbols)
Change-Id: Iff13b188df18fe8f9919274869774f53f2ea323b
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 3fe2fedcf7e8..5c7e70e97900 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -104,8 +104,7 @@ private:
public:
ChartView() = delete;
-ChartView(css::uno::Reference< css::uno::XComponentContext > xContext,
- ChartModel& rModel);
+ChartView(css::uno::Reference xContext,
ChartModel& rModel);
virtual ~ChartView() override;
@@ -185,6 +184,8 @@ public:
void setViewDirty();
+css::uno::Reference const&
getComponentContext() { return m_xCC;}
+
/// See sfx2::XmlDump::dumpAsXml().
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
@@ -210,8 +211,7 @@ private: //methods
private: //member
::osl::Mutex m_aMutex;
-css::uno::Reference< css::uno::XComponentContext>
-m_xCC;
+css::uno::Reference< css::uno::XComponentContext> m_xCC;
chart::ChartModel& mrChartModel;
diff --git a/chart2/source/view/axes/VAxisBase.cxx
b/chart2/source/view/axes/VAxisBase.cxx
index 814d3afd7858..30aead187dcb 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -244,7 +244,8 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter&
rIter )
void
VAxisBase::createDataTableView(std::vector>&
/*rSeriesPlotterList*/,
uno::Reference const& /*xNumberFormatsSupplier*/,
-rtl::Reference<::chart::ChartModel> const&
/*xChartDoc*/)
+rtl::Reference<::chart::ChartModel> const&
/*xChartDoc*/,
+
css::uno::Reference const& /*rComponentContext*/)
{
}
diff --git a/chart2/source/view/axes/VAxisBase.hxx
b/chart2/source/view/axes/VAxisBase.hxx
index 2c4123ba951d..4ee4f5e288ae 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -23,6 +23,7 @@
#include "Tickmarks.hxx"
namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
@@ -30,6 +31,7 @@ n
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - framework/source
framework/source/uielement/toolbarmanager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 00cc08d8b2e44b02d706305630e1bccb8d7b1149
Author: Maxim Monastirsky
AuthorDate: Tue Aug 9 21:26:55 2022 +0300
Commit: Thorsten Behrens
CommitDate: Wed Aug 10 13:58:47 2022 +0200
Missing colon in toolbar help ids
Regression of 5200a73627d13e2997f81b53f61e143e77e328ee
("use more string_view in various").
Change-Id: I402eb6c03dcfa661c79c5469cfca3c86ac528f60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138066
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
(cherry picked from commit f4c922f91e717728376dca943008a6dd56387c71)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138023
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
(cherry picked from commit ad0354c5c5964eefa9241653581c1860d1042644)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138030
Reviewed-by: Xisco Fauli
Reviewed-by: Caolán McNamara
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 4d56884ffbb2..3cce6eef4509 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -633,7 +633,7 @@ void ToolBarManager::Init()
sal_Int32 idx = m_aResourceName.lastIndexOf('/');
idx++; // will become 0 if '/' not found: use full string
std::u16string_view aToolbarName = m_aResourceName.subView( idx );
-OString aHelpIdAsString = ".HelpId" + OUStringToOString( aToolbarName,
RTL_TEXTENCODING_UTF8 );
+OString aHelpIdAsString = ".HelpId:" + OUStringToOString( aToolbarName,
RTL_TEXTENCODING_UTF8 );
m_pImpl->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
[Libreoffice-commits] core.git: basic/source bridges/source cppu/source include/vcl slideshow/source sw/source vcl/unx
basic/source/sbx/sbxobj.cxx |4 ++--
basic/source/sbx/sbxvar.cxx |2 +-
bridges/source/cpp_uno/shared/component.cxx |4 ++--
cppu/source/uno/lbenv.cxx|4 ++--
include/vcl/weld.hxx |2 +-
slideshow/source/engine/animationnodes/nodetools.cxx |2 +-
sw/source/core/fields/cellfml.cxx| 12 ++--
vcl/unx/gtk3/gtksalmenu.cxx |2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit ca550863f7d2e650116582dee298388ea3a97725
Author: Stephan Bergmann
AuthorDate: Tue Aug 9 11:30:32 2022 +0200
Commit: Stephan Bergmann
CommitDate: Wed Aug 10 13:40:09 2022 +0200
Better cast to sal_[u]IntPtr when passing pointer to O[U]String::number
Change-Id: I5b7a0fa060c1e0ae4aa194e0c1862f303dd8a2d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138062
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index a6cbeaba5ca7..f83324a26bb8 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -700,7 +700,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill )
OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
OString aClassNameStr(OUStringToOString(aClassName,
RTL_TEXTENCODING_ASCII_US));
rStrm.WriteCharPtr( "Object( " )
- .WriteOString( OString::number(reinterpret_cast(this))
).WriteCharPtr( "=='" )
+ .WriteOString( OString::number(reinterpret_cast(this))
).WriteCharPtr( "=='" )
.WriteCharPtr( aNameStr.isEmpty() ? "" : aNameStr.getStr()
).WriteCharPtr( "', " )
.WriteCharPtr( "of class '" ).WriteOString( aClassNameStr
).WriteCharPtr( "', " )
.WriteCharPtr( "counts " )
@@ -710,7 +710,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill )
{
OString aParentNameStr(OUStringToOString(GetName(),
RTL_TEXTENCODING_ASCII_US));
rStrm.WriteCharPtr( "in parent " )
- .WriteOString(
OString::number(reinterpret_cast(GetParent())) )
+ .WriteOString(
OString::number(reinterpret_cast(GetParent())) )
.WriteCharPtr( "=='" ).WriteCharPtr( aParentNameStr.isEmpty() ?
"" : aParentNameStr.getStr() ).WriteCharPtr( "'" );
}
else
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 947b24ff9421..b73b93c0733d 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -572,7 +572,7 @@ void SbxVariable::Dump( SvStream& rStrm, bool bFill )
{
OString aBNameStr(OUStringToOString(GetName( SbxNameType::ShortTypes ),
RTL_TEXTENCODING_ASCII_US));
rStrm.WriteCharPtr( "Variable( " )
- .WriteOString( OString::number(reinterpret_cast(this))
).WriteCharPtr( "==" )
+ .WriteOString( OString::number(reinterpret_cast(this))
).WriteCharPtr( "==" )
.WriteOString( aBNameStr );
OString aBParentNameStr(OUStringToOString(GetParent()->GetName(),
RTL_TEXTENCODING_ASCII_US));
if ( GetParent() )
diff --git a/bridges/source/cpp_uno/shared/component.cxx
b/bridges/source/cpp_uno/shared/component.cxx
index cef72d8b6a8e..0a2f1a25150f 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -88,12 +88,12 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
{
// interface
OUString aRet =
-OUString::number( reinterpret_cast< sal_Int64 >(xHome.get()),
16 ) +
+OUString::number( reinterpret_cast< sal_IntPtr >(xHome.get()),
16 ) +
";" +
// ;environment[context]
OUString::unacquired(&pEnv->aBase.pTypeName) +
"[" +
-OUString::number( reinterpret_cast< sal_Int64
>(pEnv->aBase.pContext), 16 ) +
+OUString::number( reinterpret_cast< sal_IntPtr
>(pEnv->aBase.pContext), 16 ) +
// ];good guid
cppu_cppenv_getStaticOIdPart();
*ppOId = aRet.pData;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 3e0152c969a1..55195bc228b7 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -850,10 +850,10 @@ static void unoenv_computeObjectIdentifier(
(*pUnoI->release)( pUnoI );
OUString aStr(
// interface
-OUString::number( reinterpret_cast< sal_Int64 >(pUnoI), 16 ) + ";"
+OUString::number( reinterpret_cast< sal_IntPtr >(pUnoI), 16 ) + ";"
// environment[context]
+ OUString::unacquired(&pEnv->aBase.pTypeName) + "["
-+ OUString::number( reinterpret_cast< sal_Int64 >(
++ OUString::number( reinterpret_cast< sal_IntPtr >(
reinterpret_cast<
uno_Environment * >(pEnv)->pContext ), 16 )
//
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/documentinfopage.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 59341a78e42106fe8c4d1ba8298bd040e2fad9c7 Author: Caolán McNamara AuthorDate: Tue Aug 9 17:13:54 2022 +0100 Commit: Caolán McNamara CommitDate: Wed Aug 10 13:38:27 2022 +0200 mnemonic-widget of showlocation Change-Id: Ie0955c2c8efcec5d1f43c86fe12b3a2b964c4c0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138080 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index a8d59288ca98..5d86e541e98c 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -261,6 +261,7 @@ end _Location: True +showlocation 0
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - framework/source
framework/source/uielement/toolbarmanager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ad0354c5c5964eefa9241653581c1860d1042644
Author: Maxim Monastirsky
AuthorDate: Tue Aug 9 21:26:55 2022 +0300
Commit: Noel Grandin
CommitDate: Wed Aug 10 13:17:17 2022 +0200
Missing colon in toolbar help ids
Regression of 5200a73627d13e2997f81b53f61e143e77e328ee
("use more string_view in various").
Change-Id: I402eb6c03dcfa661c79c5469cfca3c86ac528f60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138066
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
(cherry picked from commit f4c922f91e717728376dca943008a6dd56387c71)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138023
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 4d56884ffbb2..3cce6eef4509 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -633,7 +633,7 @@ void ToolBarManager::Init()
sal_Int32 idx = m_aResourceName.lastIndexOf('/');
idx++; // will become 0 if '/' not found: use full string
std::u16string_view aToolbarName = m_aResourceName.subView( idx );
-OString aHelpIdAsString = ".HelpId" + OUStringToOString( aToolbarName,
RTL_TEXTENCODING_UTF8 );
+OString aHelpIdAsString = ".HelpId:" + OUStringToOString( aToolbarName,
RTL_TEXTENCODING_UTF8 );
m_pImpl->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/qa sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx | 26 ---
sc/source/ui/view/tabvwshb.cxx | 44 ++-
2 files changed, 64 insertions(+), 6 deletions(-)
New commits:
commit ca2e58aadcf8bc70a6780fd5fe941f643ce81f54
Author: Noel Grandin
AuthorDate: Wed Aug 10 10:04:09 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 10 12:52:14 2022 +0200
calc: fix undo action disabled in different views
when actions are independant.
Update existing unit test to test this too.
Change-Id: I0af804321c371e72fb1ce096ec4ec3566a3fcffc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138079
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 327c7102eae1..41b885f1a525 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1588,6 +1588,8 @@ void ScTiledRenderingTest::testDisableUndoRepair()
int nView2 = SfxLokHelper::getView();
SfxViewShell* pView2 = SfxViewShell::Current();
CPPUNIT_ASSERT(pView1 != pView2);
+
+// both views have UNDO disabled
{
SfxItemSet aSet1(pView1->GetPool(), svl::Items);
SfxItemSet aSet2(pView2->GetPool(), svl::Items);
@@ -1604,6 +1606,7 @@ void ScTiledRenderingTest::testDisableUndoRepair()
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
Scheduler::ProcessEventsToIdle();
+// view1 has UNDO enabled, view2 is in UNDO-repair
{
SfxItemSet aSet1(pView1->GetPool(), svl::Items);
SfxItemSet aSet2(pView2->GetPool(), svl::Items);
@@ -1625,6 +1628,7 @@ void ScTiledRenderingTest::testDisableUndoRepair()
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'c', 0);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+// both views have UNDO enabled
Scheduler::ProcessEventsToIdle();
{
SfxItemSet aSet1(pView1->GetPool(), svl::Items);
@@ -1632,9 +1636,7 @@ void ScTiledRenderingTest::testDisableUndoRepair()
pView1->GetSlotState(SID_UNDO, nullptr, &aSet1);
pView2->GetSlotState(SID_UNDO, nullptr, &aSet2);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO));
-const SfxUInt32Item* pUInt32Item = dynamic_cast(aSet1.GetItem(SID_UNDO));
-CPPUNIT_ASSERT(pUInt32Item);
-CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE),
pUInt32Item->GetValue());
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem*
>(aSet1.GetItem(SID_UNDO)));
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem*
>(aSet2.GetItem(SID_UNDO)));
}
@@ -3196,11 +3198,13 @@ void ScTiledRenderingTest::testUndoReorderingRedo()
// view #1
int nView1 = SfxLokHelper::getView();
+SfxViewShell* pView1 = SfxViewShell::Current();
ViewCallback aView1;
// view #2
SfxLokHelper::createView();
int nView2 = SfxLokHelper::getView();
+SfxViewShell* pView2 = SfxViewShell::Current();
pModelObj->initializeForTiledRendering(uno::Sequence());
ViewCallback aView2;
@@ -3230,8 +3234,8 @@ void ScTiledRenderingTest::testUndoReorderingRedo()
// text edit a different cell in view #2
SfxLokHelper::setView(nView2);
-ScTabViewShell* pView2 =
dynamic_cast(SfxViewShell::Current());
-pView2->SetCursor(0, 2);
+ScTabViewShell* pViewShell2 =
dynamic_cast(SfxViewShell::Current());
+pViewShell2->SetCursor(0, 2);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'C', 0);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'C', 0);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'C', 0);
@@ -3253,6 +3257,18 @@ void ScTiledRenderingTest::testUndoReorderingRedo()
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("CC"), pDoc->GetString(ScAddress(0, 2, 0)));
+// Verify that the UNDO buttons/actions are still enabled
+{
+SfxItemSet aSet1(pView1->GetPool(), svl::Items);
+SfxItemSet aSet2(pView2->GetPool(), svl::Items);
+pView1->GetSlotState(SID_UNDO, nullptr, &aSet1);
+pView2->GetSlotState(SID_UNDO, nullptr, &aSet2);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem*
>(aSet1.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet2.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem*
>(aSet2.GetItem(SID_UNDO)));
+}
+
// View 1 presses undo again, and the first cell is erased
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::Proce
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/odfexport/data/tdf145226.fodt | 188 +
sw/qa/extras/odfexport/odfexport.cxx | 12 +
2 files changed, 200 insertions(+)
New commits:
commit 63f32f33709da3796b31328b358b313fd3887599
Author: Xisco Fauli
AuthorDate: Tue Aug 9 14:53:35 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Aug 10 11:58:45 2022 +0200
tdf#145226: sw_odfexport: Add unittest
Change-Id: Ie9baaca378c8962326d69ad0164cf9899a1ce98f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138054
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/odfexport/data/tdf145226.fodt
b/sw/qa/extras/odfexport/data/tdf145226.fodt
new file mode 100644
index ..426f2621f13f
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/tdf145226.fodt
@@ -0,0 +1,188 @@
+
+http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+
2022-08-09T14:29:03.6767505862022-08-09T14:29:17.977094506PT14S1LibreOfficeDev/7.5.0.0.alpha0$Linux_X86_64
LibreOffice_project/e77bfe281403e49c58730489e94b62032c296e75
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 3fb14b220c69..25110963896e 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2679,6 +2679,18 @@ CPPUNIT_TEST_FIXTURE(Test, testTableStyles5)
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf145226)
+{
+loadAndReload("tdf145226.fodt");
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+xmlDocUniquePtr pXmlDoc = parseExport("content.xml");
+
+assertXPathNoAttribute(pXmlDoc,
"/office:document-content/office:body/office:text/table:table/table:table-row[1]",
"style-name");
+assertXPathNoAttribute(pXmlDoc,
"/office:document-content/office:body/office:text/table:table/table:table-row[2]",
"st
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - sw/source
sw/source/filter/xml/xmlexp.hxx |4
sw/source/filter/xml/xmlfmte.cxx | 12 +-
sw/source/filter/xml/xmliteme.cxx |2
sw/source/filter/xml/xmltble.cxx | 157 --
sw/source/filter/xml/xmltexte.hxx | 12 ++
5 files changed, 107 insertions(+), 80 deletions(-)
New commits:
commit f720fdcdeda4cec27db823a1c7f7563ae0d87d51
Author: Michael Stahl
AuthorDate: Fri Jul 29 17:00:14 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Aug 10 11:54:40 2022 +0200
tdf#145226 sw: ODF export: fix table-row/table-cell styles
The SwFrameFormat for table lines and table boxes gets an auto-generated
name in SwDoc::MakeTableBoxFormat()/MakeTableLineFormat().
The problem is that xmltble.cxx assumes that these SwFrameFormats never
have a name, and sets names on them temporarily during
exportTextAutoStyles(), then later reads them when exporting the
table-rows and table-cells, then eventually resets them all to an empty
name.
One issue is that it assumes that a non-empty SwFrameFormat name
indicates a style has been exported, but that isn't always the case, and
the name may still be an auto-generated one.
Another issue is that overwriting the names interferes with the use of
the names in Undo operations.
So store the name for the ODF styles in members of the filter classes
instead of the core model.
(regression from commit 083fe09958658de8c3da87a28e0f8ff7b3b8a5e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127548
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 5a9fe1d80ea977c439dd10ee2056abe6b0cb4d07)
tdf#145226 sw: ODF export: fix table-row/table-cell style display-name
Missed this attribute in commit 5a9fe1d80ea977c439dd10ee2056abe6b0cb4d07
(cherry picked from commit de0120d9f75159f85d723439a89a6449082de669)
Change-Id: I9b17962decbf9f8ecd2a91551230cf0f012e7a9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137761
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit ea753b9c35616efa203dd6eddc524b54b198768a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137730
Reviewed-by: Caolán McNamara
Reviewed-by: Xisco Fauli
Tested-by: Xisco Fauli
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 53ab4431c645..86b919ac95a7 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -24,6 +24,7 @@
#include "xmlitmap.hxx"
#include
+#include
#include
#include
@@ -75,7 +76,8 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTableInfo,
bool bTop=false );
-void ExportFormat( const SwFormat& rFormat, enum
::xmloff::token::XMLTokenEnum eClass );
+void ExportFormat(const SwFormat& rFormat, enum
::xmloff::token::XMLTokenEnum eClass,
+::std::optional const oStyleName);
void ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth
);
void ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 60e650e48e72..f98e4ae3fb28 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -46,7 +46,8 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::xmloff::token;
-void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum
eFamily )
+void SwXMLExport::ExportFormat(const SwFormat& rFormat, enum XMLTokenEnum
eFamily,
+::std::optional const oStyleName)
{
//
CheckAttrList();
@@ -57,11 +58,14 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat,
enum XMLTokenEnum eFami
return;
OSL_ENSURE( eFamily != XML_TOKEN_INVALID, "family must be specified" );
// style:name="..."
+assert(oStyleName || (eFamily != XML_TABLE_ROW && eFamily !=
XML_TABLE_CELL));
bool bEncoded = false;
-AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(
-rFormat.GetName(), &bEncoded ) );
+OUString const name(oStyleName ? *oStyleName : rFormat.GetName());
+AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(name,
&bEncoded));
if( bEncoded )
-AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFormat.GetName()
);
+{
+AddAttribute(XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, name);
+}
if( eFamily != XML_TOKEN_INVALID )
AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
diff --git a/sw/source/filter/xml/xmliteme.cxx
b/sw/source/filter/xml/xmliteme.cxx
index 3989fb59b7cd..a8fbc712ac90 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -240,7 +240,7 @@ void SwXMLExport::ExportTableFormat( const SwFrameFormat&
rFormat, s
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - filter/source
filter/source/xsltfilter/LibXSLTTransformer.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddde8f60bcccde886676def369e5e3f271e7c92a Author: Caolán McNamara AuthorDate: Sat Aug 6 15:35:29 2022 +0100 Commit: Mike Kaganski CommitDate: Wed Aug 10 11:49:14 2022 +0200 crashtesting: keep a reference to the passed in LibXSLTTransformer otherwise, as seen with: soffice --headless --convert-to docx forum-mso-de-42789.docx and error will notify the other thread that the load has ended and the other thread will destroy the passed in LibXSLTTransformer early while this thread assumes it continues to exist Change-Id: Ieea9ecc3439ea73cd0433e5e12b87811906c49aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137819 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 5acf7bd13ed7f9d5c56a30f2be08a47d8e15d89c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137956 Reviewed-by: Michael Stahl Tested-by: Mike Kaganski Reviewed-by: Mike Kaganski diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 6cfaebe69a92..8696bda6a34a 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -67,7 +67,7 @@ namespace XSLT static const sal_Int32 OUTPUT_BUFFER_SIZE; static const sal_Int32 INPUT_BUFFER_SIZE; -LibXSLTTransformer* m_transformer; +rtl::Reference m_transformer; Sequence m_readBuf; Sequence m_writeBuf;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - basctl/source
basctl/source/basicide/macrodlg.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9b119bb65280a9a0294652d343fdbe880609cd3a
Author: Caolán McNamara
AuthorDate: Sun Aug 7 12:34:00 2022 +0100
Commit: Mike Kaganski
CommitDate: Wed Aug 10 11:48:14 2022 +0200
tdf#150291 crash on macro organizer with no macro selected
Change-Id: Ib7e05f4e3e1c63bc0bd497b590256c4ee77a0bf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137822
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit d4a885b7526b7242053f5587f47f1251c06492d1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137833
Reviewed-by: Michael Stahl
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index 03613c96c914..a9d3fd0f037c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -122,7 +122,8 @@ MacroChooser::~MacroChooser()
void MacroChooser::StoreMacroDescription()
{
-m_xBasicBox->get_selected(m_xBasicBoxIter.get());
+if (!m_xBasicBox->get_selected(m_xBasicBoxIter.get()))
+return;
EntryDescriptor aDesc =
m_xBasicBox->GetEntryDescriptor(m_xBasicBoxIter.get());
OUString aMethodName;
if (m_xMacroBox->get_selected(m_xMacroBoxIter.get()))
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - framework/source
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 34
+++---
1 file changed, 13 insertions(+), 21 deletions(-)
New commits:
commit 3429be2b219bc9b27cb5da94f91348f632cb10db
Author: Noel Grandin
AuthorDate: Tue Aug 2 20:15:07 2022 +0200
Commit: Mike Kaganski
CommitDate: Wed Aug 10 11:46:19 2022 +0200
tdf#149966 Crash on Windows and freeze on Linux when customizing Menu
use the notifyEach helper, which unlocks the mutex while we are
calling listeners, which means we can tolerate a re-entrant call to
removeConfigurationListener.
regression from
commit dab35c152af3345786b8335e83cd067b67d08b81
Author: Noel Grandin
Date: Sat Dec 18 20:24:15 2021 +0200
osl::Mutex->std::mutex in ModuleUIConfigurationManager
Change-Id: I7a2fbffb1c734b8bd0e952614592ce12c1611328
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137705
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 84c4ccfec1cbbd573609623a026a8cd2ad20400f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137963
Reviewed-by: Xisco Fauli
(cherry picked from commit cb5a1dfbb33ad21158a89ecb85ecdd1f428a8c96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137968
Reviewed-by: Michael Stahl
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 93058358d04a..ded9d777080c 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1625,29 +1625,21 @@ sal_Bool SAL_CALL
ModuleUIConfigurationManager::isReadOnly()
void ModuleUIConfigurationManager::implts_notifyContainerListener( const
ui::ConfigurationEvent& aEvent, NotifyOp eOp )
{
std::unique_lock aGuard(m_mutex);
-comphelper::OInterfaceIteratorHelper4 pIterator( aGuard,
m_aConfigListeners );
-while ( pIterator.hasMoreElements() )
+using ListenerMethodType = void (SAL_CALL
css::ui::XUIConfigurationListener::*)(const ui::ConfigurationEvent&);
+ListenerMethodType aListenerMethod {};
+switch ( eOp )
{
-try
-{
-switch ( eOp )
-{
-case NotifyOp_Replace:
-pIterator.next()->elementReplaced( aEvent );
-break;
-case NotifyOp_Insert:
-pIterator.next()->elementInserted( aEvent );
-break;
-case NotifyOp_Remove:
-pIterator.next()->elementRemoved( aEvent );
-break;
-}
-}
-catch( const css::uno::RuntimeException& )
-{
-pIterator.remove(aGuard);
-}
+case NotifyOp_Replace:
+aListenerMethod =
&css::ui::XUIConfigurationListener::elementReplaced;
+break;
+case NotifyOp_Insert:
+aListenerMethod =
&css::ui::XUIConfigurationListener::elementInserted;
+break;
+case NotifyOp_Remove:
+aListenerMethod =
&css::ui::XUIConfigurationListener::elementRemoved;
+break;
}
+m_aConfigListeners.notifyEach(aGuard, aListenerMethod, aEvent);
}
}
[Libreoffice-commits] core.git: include/vcl
include/vcl/outdev.hxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit bdf98cbb55aa89a15e194a48a7f248abb9465cb7
Author: Chris Sherlock
AuthorDate: Sat Jul 30 22:01:42 2022 +1000
Commit: Caolán McNamara
CommitDate: Wed Aug 10 11:46:09 2022 +0200
vcl: remove unused GLYPH_FONT_HEIGHT
GLYPH_FONT_HEIGHT not used since:
Commit: d538d3d84172a74dfe97d59a6d3daf9a45459cab
Short title: This fallback code makes no sense any more
Change-Id: I9c87e2fb2eb33abbc2a7e4d82435704f1a895c75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137631
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index ea14e3d018b7..2595415db1b5 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -138,12 +138,6 @@ namespace com::sun::star::i18n {
class XBreakIterator;
}
-#if defined UNX
-#define GLYPH_FONT_HEIGHT 128
-#else
-#define GLYPH_FONT_HEIGHT 256
-#endif
-
// OutputDevice-Types
enum OutDevType { OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV, OUTDEV_PDF };
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfexport/data/hidden-linebreaks.rtf | 27 ++
sw/qa/extras/rtfexport/rtfexport4.cxx |6
2 files changed, 33 insertions(+)
New commits:
commit b6e177982cb6c325ca67b208b2fb8397c03ab359
Author: Michael Stahl
AuthorDate: Tue Aug 9 15:49:35 2022 +0200
Commit: Michael Stahl
CommitDate: Wed Aug 10 11:13:54 2022 +0200
tdf#150269 sw: add unit test
This was fixed by commit 3afe4f66f7266ede9922ce0682db38c9369349b7
"sw clearing breaks: add RTF filter", which enabled sending run
properties for \line.
Change-Id: I7d8f8860bdbead0ec68ca5ad99bb28ddaa51f323
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138053
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfexport/data/hidden-linebreaks.rtf
b/sw/qa/extras/rtfexport/data/hidden-linebreaks.rtf
new file mode 100644
index ..ae49933e1574
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/hidden-linebreaks.rtf
@@ -0,0 +1,27 @@
+{\rtf1\adeflang1025\ansi\ansicpg1250\uc1\adeff31507\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang1038\deflangfe1038\themelang1038\themelangfe0\themelangcs0
+{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\f0\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose
020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}
+}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
+{\*\defchp \f31506\fs22\lang1038\langfe1033\langfenp1033 }
+{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }
+\noqfpromote
+{\stylesheet{\ql
\li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\rtlch\fcs1 \af31507\afs22\alang1025
+\ltrch\fcs0 \f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033
\snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden
\sunhideused \spriority1 Default Paragraph Font;}}
+{\info{\author G\'e1bor Kelemen2010}{\operator G\'e1bor Kelemen2010}
+{\creatim\yr2022\mo8\dy4\hr18}{\revtim\yr2022\mo8\dy4\hr18}{\version1}{\edmins0}{\nofpages1}{\nofwords76}{\nofchars527}{\nofcharsws602}{\vern107}}
+{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
+\paperw11906\paperh16838\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml1\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal
\nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd
\ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sftnbj
+\pard\plain \ltrpar\ql
\li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+\f31506\fs22\lang1038\langfe1033\cgrid\langnp1038\langfenp1033 {\rtlch\fcs1
\af31507 \ltrch\fcs0 \v\lang1024\langfe1024\noproof \line \line \line
}{\rtlch\fcs1 \af31507 \ltrch\fcs0
+\lang1024\langfe1024\noproof Lorem ipsum dolor sit amet }
+\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index f730afd93c25..a8bf53f8b6b8 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -117,6 +117,12 @@ DECLARE_RTFEXPORT_TEST(test148518, "FORMDROPDOWN.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), result);
}
+DECLARE_RTFEXPORT_TEST(test150269, "hidden-linebreaks.rtf")
+{
+uno::Reference xRun = getRun(getParagraph(1), 1,
u"\n\n\n");
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xRun, "CharHidden"));
+}
+
DECLARE_RTFEXPORT_TEST(testAnchoredAtSamePosition, "anchor.fodt")
{
SwXTextDocument* const pTextDoc =
dynamic_cast(mxComponent.get());
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx |2 ++
sw/source/core/crsr/crsrsh.cxx|9 -
sw/source/uibase/docvw/edtwin.cxx |5 -
sw/source/uibase/inc/wrtsh.hxx|1 +
sw/source/uibase/wrtsh/wrtsh1.cxx |9 -
5 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 581ba395222e04e43697484bef9181c877d1fd61
Author: Michael Stahl
AuthorDate: Mon Aug 8 16:15:36 2022 +0200
Commit: Michael Stahl
CommitDate: Wed Aug 10 10:57:00 2022 +0200
sw: fix infinite recursion in SwEditWin::GetSurroundingTextSelection()
The unexpected problem of calling SwCursorShell::Pop() from there ending
up calling the function itself again, with gtk3 UI, on loading
forum-mso-en-4034.docx and clicking somewhere or scrolling:
466 SwEditWin::GetSurroundingTextSelection() const at
sw/source/uibase/docvw/edtwin.cxx:6656
467 ImplHandleSurroundingTextRequest(vcl::Window*, rtl::OUString&,
Selection&) at vcl/source/window/winproc.cxx:2487
468 ImplHandleSalSurroundingTextRequest(vcl::Window*,
SalSurroundingTextRequestEvent*) at vcl/source/window/winproc.cxx:2497
469 ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) at
vcl/source/window/winproc.cxx:2826
470 SalFrame::CallCallback(SalEvent, void const*) const at
vcl/inc/salframe.hxx:306
471 GtkSalFrame::IMHandler::signalIMRetrieveSurrounding(_GtkIMContext*,
void*) at vcl/unx/gtk3/gtkframe.cxx:5707
472 _gtk_marshal_BOOLEAN__VOIDv () at /lib64/libgtk-3.so.0
473 g_signal_emit_valist () at /lib64/libgobject-2.0.so.0
474 g_signal_emit_by_name () at /lib64/libgobject-2.0.so.0
475 gtk_im_multicontext_retrieve_surrounding_cb () at /lib64/libgtk-3.so.0
476 _gtk_marshal_BOOLEAN__VOIDv () at /lib64/libgtk-3.so.0
477 g_signal_emit_valist () at /lib64/libgobject-2.0.so.0
478 g_signal_emit_by_name () at /lib64/libgobject-2.0.so.0
479 enable () at /lib64/libgtk-3.so.0
480 GtkSalFrame::IMHandler::createIMContext() at
vcl/unx/gtk3/gtkframe.cxx:5187
481 GtkSalFrame::IMHandler::IMHandler(GtkSalFrame*) at
vcl/unx/gtk3/gtkframe.cxx:5153
482 GtkSalFrame::SetInputContext(SalInputContext*) at
vcl/unx/gtk3/gtkframe.cxx:2711
483 vcl::Window::ImplNewInputContext() () at
vcl/source/window/window.cxx:1781
484 vcl::Window::SetInputContext(InputContext const&) at
vcl/source/window/window.cxx:2083
485 SwView::CheckReadonlySelection() at sw/source/uibase/uiview/view.cxx:699
486 SwView::AttrChangedNotify(LinkParamNone*) at
sw/source/uibase/uiview/view.cxx:510
487 SwView::LinkStubAttrChangedNotify(void*, LinkParamNone*) at
sw/source/uibase/uiview/view.cxx:499
488 Link::Call(LinkParamNone*) const at
include/tools/link.hxx:111
489 SwCursorShell::CallChgLnk() at sw/source/core/crsr/crsrsh.cxx:2544
490 SwCallLink::~SwCallLink() at sw/source/core/crsr/callnk.cxx:149
491 SwCursorShell::Pop(SwCursorShell::PopMode) at
sw/source/core/crsr/crsrsh.cxx:2327
492 SwWrtShell::Pop(SwCursorShell::PopMode) at
sw/source/uibase/wrtsh/wrtsh1.cxx:2016
493 SwEditWin::GetSurroundingTextSelection() const at
sw/source/uibase/docvw/edtwin.cxx:6656
This SwCallLink looks unnecessary here, but it's triggered because it
compares the state before Pop() to the state after Pop(), instead of the
state before Push() to the state after Pop().
This problem could probably benefit from being solved more generally,
but with 2 functions involved it gets rather ugly as it can't easily be
encapsulated in SwCursorShell.
(probably regression from aac9bd235e65b27faf63e64bba3ecd94837381d6)
Change-Id: Ief176b54daf96da378d2e5d57f3dd5b4a0817299
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137987
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 0b66682b9c92..c2a5d75c454c 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -45,6 +45,7 @@
class SfxItemSet;
class SfxPoolItem;
+class SwCallLink;
class SwContentFrame;
class SwUnoCursor;
class SwFormatField;
@@ -436,6 +437,7 @@ public:
* stack
* @return if there was one on the stack, otherwise
*/
+bool Pop(PopMode, ::std::unique_ptr pLink);
bool Pop(PopMode);
/*
* Combine 2 Cursors.
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 745fb43f5239..4b7fbcbd377d 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2268,7 +2268,14 @@ void SwCursorShell::Push()
*/
bool SwCursorShell::Pop(PopMode const eDelete)
{
-SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+::std::unique_ptr
pLink(::std::make_unique(*this)); // watch Cursor-Moves; call Link
if needed
+return Pop(eDelete, ::std::move(pLink));
+}
+
+bool SwCursorShell::Pop(PopMode const eDelete,
+[[maybe_unused]] ::std::unique_ptr const pLink)
+{
+assert(pLink); // parameter exists
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/modeltoviewhelper.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 4f62ae798cc1f9f7bc524e408fc7a370345b40a8
Author: Michael Stahl
AuthorDate: Mon Aug 8 16:12:14 2022 +0200
Commit: Michael Stahl
CommitDate: Wed Aug 10 10:54:31 2022 +0200
sw_fieldmarkhide: fix crash on exporting forum-mso-en-4034.docx to ODT
The problem is that there's a field in a preceding paragraph that ends
immediately before another field starts, and so the backwards iteration
erroneously picks it up in ModelToViewHelper ctor.
Change-Id: I6e65c04e0372377b3af48f1d80de287b6113e1c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137986
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index 78a582866fa0..757e6b89d9cd 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -140,8 +140,16 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode
&rNode,
// skip it, must be handled in loop below
if (pFieldMark->GetMarkStart().nNode < rNode)
{
-SwPosition const sepPos(::sw::mark::FindFieldSep(*pFieldMark));
-startedFields.emplace_front(pFieldMark, sepPos.nNode < rNode);
+// this can be a nested field's end - skip over those!
+if (pFieldMark->GetMarkEnd().nNode < rNode)
+{
+
assert(cursor.GetPoint()->GetNode().GetTextNode()->GetText()[cursor.GetPoint()->GetContentIndex()]
== CH_TXT_ATR_FIELDEND);
+}
+else
+{
+SwPosition const
sepPos(::sw::mark::FindFieldSep(*pFieldMark));
+startedFields.emplace_front(pFieldMark, sepPos.nNode <
rNode);
+}
*cursor.GetPoint() = pFieldMark->GetMarkStart();
}
if (!cursor.Move(fnMoveBackward, GoInContent))
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fmtcntnt.hxx |6 +++---
sw/source/core/layout/atrfrm.cxx | 23 +++
2 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 77a8d0d06573cd095863904d34dc7a0ca131cf1a
Author: Noel Grandin
AuthorDate: Mon Aug 8 15:31:20 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 10 10:50:32 2022 +0200
unique_ptr->optional in SwFormatContent
Change-Id: I815fa0f2dcdc1512958d95703b56449010fd2f6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138075
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index f579dd1c1676..3765e0a2e4a0 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -23,14 +23,14 @@
#include
#include "hintids.hxx"
#include "format.hxx"
+#include "ndindex.hxx"
-class SwNodeIndex;
class SwStartNode;
/// Content, content of frame (header, footer, fly).
class SAL_DLLPUBLIC_RTTI SwFormatContent final : public SfxPoolItem
{
-std::unique_ptr m_pStartNode;
+std::optional m_oStartNode;
SwFormatContent &operator=( const SwFormatContent & ) = delete;
@@ -43,7 +43,7 @@ public:
virtual booloperator==( const SfxPoolItem& ) const override;
virtual SwFormatContent* Clone( SfxItemPool* pPool = nullptr ) const
override;
-const SwNodeIndex *GetContentIdx() const { return m_pStartNode.get(); }
+const SwNodeIndex *GetContentIdx() const { return m_oStartNode ?
&*m_oStartNode : nullptr; }
void SetNewContentIdx( const SwNodeIndex *pIdx );
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 9da40280f0d9..841a0f8f918e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -578,15 +578,15 @@ SwFormatFooter* SwFormatFooter::Clone( SfxItemPool* )
const
// Partially implemented inline in hxx
SwFormatContent::SwFormatContent( const SwFormatContent &rCpy )
: SfxPoolItem( RES_CNTNT )
+, m_oStartNode( rCpy.m_oStartNode )
{
-m_pStartNode.reset( rCpy.GetContentIdx() ?
- new SwNodeIndex( *rCpy.GetContentIdx() ) : nullptr);
}
SwFormatContent::SwFormatContent( const SwStartNode *pStartNd )
: SfxPoolItem( RES_CNTNT )
{
-m_pStartNode.reset( pStartNd ? new SwNodeIndex( *pStartNd ) : nullptr);
+if (pStartNd)
+m_oStartNode = *pStartNd;
}
SwFormatContent::~SwFormatContent()
@@ -595,17 +595,16 @@ SwFormatContent::~SwFormatContent()
void SwFormatContent::SetNewContentIdx( const SwNodeIndex *pIdx )
{
-m_pStartNode.reset( pIdx ? new SwNodeIndex( *pIdx ) : nullptr );
+if (pIdx)
+m_oStartNode = *pIdx;
+else
+m_oStartNode.reset();
}
bool SwFormatContent::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
-if( static_cast(m_pStartNode) != static_cast(static_cast(rAttr).m_pStartNode) )
-return false;
-if( m_pStartNode )
-return ( *m_pStartNode == *static_cast(rAttr).GetContentIdx() );
-return true;
+return m_oStartNode == static_cast(rAttr).m_oStartNode;
}
SwFormatContent* SwFormatContent::Clone( SfxItemPool* ) const
@@ -617,13 +616,13 @@ void SwFormatContent::dumpAsXml(xmlTextWriterPtr pWriter)
const
{
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwFormatContent"));
(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"),
BAD_CAST(OString::number(Which()).getStr()));
-if (m_pStartNode)
+if (m_oStartNode)
{
(void)xmlTextWriterWriteAttribute(
pWriter, BAD_CAST("startNode"),
-
BAD_CAST(OString::number(sal_Int32(m_pStartNode->GetNode().GetIndex())).getStr()));
+
BAD_CAST(OString::number(sal_Int32(m_oStartNode->GetNode().GetIndex())).getStr()));
(void)xmlTextWriterWriteFormatAttribute(pWriter,
BAD_CAST("startNodePtr"), "%p",
- &m_pStartNode->GetNode());
+ &m_oStartNode->GetNode());
}
(void)xmlTextWriterEndElement(pWriter);
}
Re: Help ID for toolbars
On Mon, 2022-08-08 at 09:19 -0300, Olivier Hallot wrote: > ... Many toolbars have Help pages describing them in detail. ... > However in the case of the outlinetoolbar in Impress (1), the module > does not send HelpId... I don't know if its actually the same issue, but this commit today looks potentially related. https://cgit.freedesktop.org/libreoffice/core/commit/?id=f4c922f91e717728376dca943008a6dd56387c71
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/inc/UndoDelete.hxx |3 ++-
sw/source/core/inc/UndoInsert.hxx |3 ++-
sw/source/core/undo/undel.cxx | 10 +-
sw/source/core/undo/unins.cxx | 21 ++---
4 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 17073362f47425996575cefb682383f2710d3436
Author: Noel Grandin
AuthorDate: Sun Aug 7 21:46:07 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 10 10:08:45 2022 +0200
unique_ptr->optional in SwUndoInsert
Change-Id: Id351826427ef1ab6a292d7af96d3fa5bcf6ebb9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137999
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoInsert.hxx
b/sw/source/core/inc/UndoInsert.hxx
index ae7b6c02dbd5..20bc4be7fdc5 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -41,7 +42,7 @@ enum class MirrorGraph;
class SwUndoInsert final : public SwUndo, private SwUndoSaveContent
{
/// start of Content in UndoNodes for Redo
-std::unique_ptr m_pUndoNodeIndex;
+std::optional m_oUndoNodeIndex;
std::optional maText;
std::optional maUndoText;
std::unique_ptr m_pRedlData;
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 6ba42b5327cc..e923db1f2fe9 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -185,13 +185,13 @@ bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
SwUndoInsert::~SwUndoInsert()
{
-if (m_pUndoNodeIndex) // delete the section from UndoNodes array
+if (m_oUndoNodeIndex) // delete the section from UndoNodes array
{
// Insert saves the content in IconSection
-SwNodes& rUNds = m_pUndoNodeIndex->GetNodes();
-rUNds.Delete(*m_pUndoNodeIndex,
-rUNds.GetEndOfExtras().GetIndex() - m_pUndoNodeIndex->GetIndex());
-m_pUndoNodeIndex.reset();
+SwNodes& rUNds = m_oUndoNodeIndex->GetNodes();
+rUNds.Delete(*m_oUndoNodeIndex,
+rUNds.GetEndOfExtras().GetIndex() - m_oUndoNodeIndex->GetIndex());
+m_oUndoNodeIndex.reset();
}
else // the inserted text
{
@@ -268,9 +268,8 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext &
rContext)
if (!maText)
{
-m_pUndoNodeIndex.reset(
-new SwNodeIndex(m_pDoc->GetNodes().GetEndOfContent()));
-MoveToUndoNds(aPaM, m_pUndoNodeIndex.get());
+m_oUndoNodeIndex.emplace(m_pDoc->GetNodes().GetEndOfContent());
+MoveToUndoNds(aPaM, &*m_oUndoNodeIndex);
}
m_nNode = aPaM.GetPoint()->GetNodeIndex();
m_nContent = aPaM.GetPoint()->GetContentIndex();
@@ -341,9 +340,9 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext &
rContext)
}
else
{
-// re-insert content again (first detach m_pUndoNodeIndex!)
-SwNodeOffset const nMvNd = m_pUndoNodeIndex->GetIndex();
-m_pUndoNodeIndex.reset();
+// re-insert content again (first detach m_oUndoNodeIndex!)
+SwNodeOffset const nMvNd = m_oUndoNodeIndex->GetIndex();
+m_oUndoNodeIndex.reset();
MoveFromUndoNds(*pTmpDoc, nMvNd, *pPam->GetMark());
}
m_nNode = pPam->GetMark()->GetNodeIndex();
commit 296110d547903ef67f6d1048c044378d30cb1406
Author: Noel Grandin
AuthorDate: Sun Aug 7 22:30:49 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 10 10:08:33 2022 +0200
unique_ptr->optional in SwUndoDelete
Change-Id: I29cc59bb7283e86d4045cd854d7e9a4f056c3361
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138000
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index 2491af658c61..70e91367cb6b 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
#include
+#include
#include
#include
#include
@@ -39,7 +40,7 @@ class SwUndoDelete final
, private SwUndRng
, private SwUndoSaveContent
{
-std::unique_ptr m_pMvStt;// Position of Nodes in
UndoNodes-Array
+std::optional m_oMvStt;// Position of Nodes in
UndoNodes-Array
std::optional m_aSttStr, m_aEndStr;
std::unique_ptr m_pRedlSaveData;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 82d5e9635b89..f60f8911815e 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -385,7 +385,7 @@ SwUndoDelete::SwUndoDelete(
// Step 3: Moving into UndoArray...
m_nNode = rNds.GetEndOfContent().GetI
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sal/osl
sal/osl/w32/tempfile.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b30545c75675b2d414f9aae175265acc9cdcf6cd
Author: Caolán McNamara
AuthorDate: Tue Aug 9 11:38:47 2022 +0100
Commit: Xisco Fauli
CommitDate: Wed Aug 10 09:11:07 2022 +0200
crashreporting: frequent crash seen in PackedFile::flush
at:
if (osl::File::E_None == osl::FileBase::createTempFile(nullptr, &aHandle,
&aTempURL))
{
if (osl_File_E_None == osl_writeFile(aHandle, ...
createTempFile is returning osl::File::E_None but presumably we are
missing setting a possible error state here
https:
//crashreport.libreoffice.org/stats/crash_details/ea4b4050-dd0f-42b1-b30f-b67612806371
Change-Id: Ib2d0c3c91e40fe985571e79822b91f2faf401471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138022
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index a4c272e57768..5d5d758ce244 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -192,7 +192,7 @@ oslFileError SAL_CALL osl_createTempFile(
if (tmp_name)
{
-osl_createTempFile_impl_(
+osl_error = osl_createTempFile_impl_(
base_directory,
tmp_name,
b_delete_on_close,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sal/osl
sal/osl/w32/tempfile.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0fefdd80d4420d794882e2e4790e4937c2130100
Author: Caolán McNamara
AuthorDate: Tue Aug 9 11:38:47 2022 +0100
Commit: Xisco Fauli
CommitDate: Wed Aug 10 09:10:26 2022 +0200
crashreporting: frequent crash seen in PackedFile::flush
at:
if (osl::File::E_None == osl::FileBase::createTempFile(nullptr, &aHandle,
&aTempURL))
{
if (osl_File_E_None == osl_writeFile(aHandle, ...
createTempFile is returning osl::File::E_None but presumably we are
missing setting a possible error state here
https:
//crashreport.libreoffice.org/stats/crash_details/ea4b4050-dd0f-42b1-b30f-b67612806371
Change-Id: Ib2d0c3c91e40fe985571e79822b91f2faf401471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138021
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index a4c272e57768..5d5d758ce244 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -192,7 +192,7 @@ oslFileError SAL_CALL osl_createTempFile(
if (tmp_name)
{
-osl_createTempFile_impl_(
+osl_error = osl_createTempFile_impl_(
base_directory,
tmp_name,
b_delete_on_close,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sfx2/source
sfx2/source/appl/newhelp.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 08d1ff386546e0926b9fe0d186c565112010fc2b
Author: Caolán McNamara
AuthorDate: Mon Aug 8 17:01:31 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Aug 10 09:09:42 2022 +0200
sfx2: check saved last tab page name exists before restoring it
since GetPage might return nullptr on a nonexisting page
See
https://crashreport.libreoffice.org/stats/signature/SfxHelpIndexWindow_Impl::ActivatePageHdl(rtl::OString%20const%20&)
Change-Id: I26e21f783645e8a87d56cbe76c0126de8947bf3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138014
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 701369f378c7..d9fdc9d0cb59 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1308,7 +1308,11 @@
SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent, w
OString sPageId("index");
SvtViewOptions aViewOpt( EViewType::TabDialog, CONFIGNAME_INDEXWIN );
if ( aViewOpt.Exists() )
-sPageId = aViewOpt.GetPageID();
+{
+OString sSavedPageId = aViewOpt.GetPageID();
+if (m_xTabCtrl->get_page_index(sSavedPageId) != -1)
+sPageId = sSavedPageId;
+}
m_xTabCtrl->set_current_page(sPageId);
ActivatePageHdl(sPageId);
m_xActiveLB->connect_changed(LINK(this, SfxHelpIndexWindow_Impl,
SelectHdl));
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source
sw/source/uibase/app/docstyle.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit ef6fb0eda1d875e1d7975152d966fba33f431c26
Author: Mike Kaganski
AuthorDate: Wed Aug 3 09:47:40 2022 +0300
Commit: Xisco Fauli
CommitDate: Wed Aug 10 09:09:15 2022 +0200
tdf#150241: a blind fix attempt
I can't repro it locally (the report misses clear repro steps), but
the three changed OUString assignment operators use rtl::str::assign
internally, and the unconditional dereference of the value returned
from SwDoc::GetDocPattern (that may return a nullptr) is suspicious,
especially compared to the checks made in SwDocStyleSheet::GetHelpId
later in the same file.
All four calls to GetDocPattern in the file were introduced in commit
7b0b5cdfeed656b279bc32cd929630d5fc25878b
Author Jens-Heiner Rechtien
Date Mon Sep 18 16:15:01 2000 +
initial import
Change-Id: If9d4cff921443e5af71b7d541b79d00ea77e853b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137734
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 4afb80eaa0df58b78e2bfad892f9e7ce5e1bce7a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137961
Reviewed-by: Xisco Fauli
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index efaf6853e0ad..fa53a595f2fd 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1980,8 +1980,10 @@ bool SwDocStyleSheet::FillStyleSheet(
{
nPoolId = m_pDesc->GetPoolFormatId();
nHelpId = m_pDesc->GetPoolHelpId();
-if( m_pDesc->GetPoolHlpFileId() != UCHAR_MAX )
-aHelpFile = *m_rDoc.GetDocPattern( m_pDesc->GetPoolHlpFileId()
);
+if (const OUString* pattern = m_pDesc->GetPoolHlpFileId() !=
UCHAR_MAX
+ ?
m_rDoc.GetDocPattern(m_pDesc->GetPoolHlpFileId())
+ : nullptr)
+aHelpFile = *pattern;
else
aHelpFile.clear();
}
@@ -2009,8 +2011,10 @@ bool SwDocStyleSheet::FillStyleSheet(
{
nPoolId = m_pNumRule->GetPoolFormatId();
nHelpId = m_pNumRule->GetPoolHelpId();
-if( m_pNumRule->GetPoolHlpFileId() != UCHAR_MAX )
-aHelpFile = *m_rDoc.GetDocPattern(
m_pNumRule->GetPoolHlpFileId() );
+if (const OUString* pattern = m_pNumRule->GetPoolHlpFileId() !=
UCHAR_MAX
+ ?
m_rDoc.GetDocPattern(m_pNumRule->GetPoolHlpFileId())
+ : nullptr)
+aHelpFile = *pattern;
else
aHelpFile.clear();
}
@@ -2065,8 +2069,10 @@ bool SwDocStyleSheet::FillStyleSheet(
OSL_ENSURE( m_bPhysical, "Format not found" );
nHelpId = pFormat->GetPoolHelpId();
-if( pFormat->GetPoolHlpFileId() != UCHAR_MAX )
-aHelpFile = *m_rDoc.GetDocPattern( pFormat->GetPoolHlpFileId()
);
+if (const OUString* pattern = pFormat->GetPoolHlpFileId() !=
UCHAR_MAX
+ ?
m_rDoc.GetDocPattern(pFormat->GetPoolHlpFileId())
+ : nullptr)
+aHelpFile = *pattern;
else
aHelpFile.clear();
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - reportdesign/source
reportdesign/source/ui/misc/UITools.cxx | 127 1 file changed, 66 insertions(+), 61 deletions(-) New commits: commit a61f383af95374814f3131c2a3c0247fa312971a Author: Noel Grandin AuthorDate: Fri Aug 5 14:11:41 2022 +0200 Commit: Xisco Fauli CommitDate: Wed Aug 10 09:08:15 2022 +0200 tdf#150222 reporbuilder, set font for a text box crashes regression from commit c4cf2e82e8d0aaef9b1daedc033d6edf647e5284 Author: Samuel Mehrbrodt Date: Mon Jun 13 08:53:22 2022 +0200 tdf#128150 Add OOXML import/export for "use background fill" which modified XATTR_FILL_LAST. Ideally, I would just adjust the ranges for the pool, but I can't do that because we are using static defaults, and the range for static defaults has to be contiguous. Also update the aItemInfos array to avoid a DBG_UTIL check that complains about mapping a SID to itself Change-Id: Ie76bdc83fa0a0ad07b6b2afdb678193889373cb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137867 Tested-by: Julien Nabet Reviewed-by: Julien Nabet Reviewed-by: Noel Grandin (cherry picked from commit 9a444884c3b221c9bd7b0aa4476c160921c7fc35) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137826 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 87062e35c6f6..9e00b4ad57b3 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -120,46 +120,50 @@ #include #include -#define ITEMID_FONT TypedWhichId(XATTR_FILL_LAST + 1) -#define ITEMID_FONTHEIGHT TypedWhichId(XATTR_FILL_LAST + 2) -#define ITEMID_LANGUAGE TypedWhichId(XATTR_FILL_LAST + 3) - -#define ITEMID_POSTURE TypedWhichId(XATTR_FILL_LAST + 4) -#define ITEMID_WEIGHT TypedWhichId(XATTR_FILL_LAST + 5) -#define ITEMID_SHADOWED TypedWhichId(XATTR_FILL_LAST + 6) -#define ITEMID_WORDLINEMODE TypedWhichId(XATTR_FILL_LAST + 7) -#define ITEMID_CONTOUR TypedWhichId(XATTR_FILL_LAST + 8) -#define ITEMID_CROSSEDOUT TypedWhichId(XATTR_FILL_LAST + 9) -#define ITEMID_UNDERLINE TypedWhichId(XATTR_FILL_LAST + 10) - -#define ITEMID_COLOR TypedWhichId(XATTR_FILL_LAST + 11) -#define ITEMID_KERNING TypedWhichId(XATTR_FILL_LAST + 12) -#define ITEMID_CASEMAP TypedWhichId(XATTR_FILL_LAST + 13) - -#define ITEMID_ESCAPEMENT TypedWhichId(XATTR_FILL_LAST + 14) -#define ITEMID_FONTLIST XATTR_FILL_LAST + 15 -#define ITEMID_AUTOKERN TypedWhichId(XATTR_FILL_LAST + 16) -#define ITEMID_COLOR_TABLE TypedWhichId(XATTR_FILL_LAST + 17) -#define ITEMID_BLINK TypedWhichId(XATTR_FILL_LAST + 18) -#define ITEMID_EMPHASISMARK TypedWhichId(XATTR_FILL_LAST + 19) -#define ITEMID_TWOLINES TypedWhichId(XATTR_FILL_LAST + 20) -#define ITEMID_CHARROTATE TypedWhichId(XATTR_FILL_LAST + 21) -#define ITEMID_CHARSCALE_W TypedWhichId(XATTR_FILL_LAST + 22) -#define ITEMID_CHARRELIEF TypedWhichId(XATTR_FILL_LAST + 23) -#define ITEMID_CHARHIDDEN TypedWhichId(XATTR_FILL_LAST + 24) -#define ITEMID_BRUSH TypedWhichId(XATTR_FILL_LAST + 25) -#define ITEMID_HORJUSTIFY TypedWhichId(XATTR_FILL_LAST + 26) -#define ITEMID_VERJUSTIFY TypedWhichId(XATTR_FILL_LAST + 27) -#define ITEMID_FONT_ASIAN TypedWhichId(XATTR_FILL_LAST + 28) -#define ITEMID_FONTHEIGHT_ASIAN TypedWhichId(XATTR_FILL_LAST + 29) -#define ITEMID_LANGUAGE_ASIAN TypedWhichId(XATTR_FILL_LAST + 30) -#define ITEMID_POSTURE_ASIAN TypedWhichId(XATTR_FILL_LAST + 31) -#define ITEMID_WEIGHT_ASIAN TypedWhichId(XATTR_FILL_LAST + 32) -#define ITEMID_FONT_COMPLEX TypedWhichId(XATTR_FILL_LAST + 33) -#define ITEMID_FONTHEIGHT_COMPLEX TypedWhichId(XATTR_FILL_LAST + 34) -#define ITEMID_LANGUAGE_COMPLEX TypedWhichId(XATTR_FILL_LAST + 35) -#define ITEMID_POSTURE_COMPLEX TypedWhichId(XATTR_FILL_LAST + 36) -#define ITEMID_WEIGHT_COMPLEX TypedWhichId(XATTR_FILL_LAST + 37) +/// Note that we deliberately overlap an existing item id, so that we can have contiguous item ids for +/// the static defaults. +#define ITEMID_FIRSTXATTR_FILL_LAST + +#define ITEMID_FONT TypedWhichId(ITEMID_FIRST) +#define ITEMID_FONTHEIGHT TypedWhichId(ITEMID_FIRST + 1) +#define ITEMID_LANGUAGE TypedWhichId(ITEMID_FIRST + 2) + +#define ITEMID_POSTURE TypedWhichId(ITEMID_FIRST + 3) +#define ITEMID_WEIGHT
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source
sc/source/core/data/drwlayer.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 81c8e3a92ba1da28f3c03ff5bcb873d63a1b857f
Author: Noel Grandin
AuthorDate: Thu Aug 4 20:24:31 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Aug 10 09:07:06 2022 +0200
tdf#150219 Crash when cutting trace dependent with precedent on different
sheet
not sure exactly where the real bug is. This only started to show up
when I changed the data structures in
commit 3596c9891e16e108b18bdcdc9909c2f02d0f
Date: Thu Jan 16 12:10:54 2020 +0200
use std::vector in ScMarkArray, instead of re-inventing the wheel
before that it would harmlessly read from adjacent memory because nCol and
nRow are -1.
Change-Id: Iddf109eed04ddc57d5b6743f232eea940e42bd9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137834
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
(cherry picked from commit f705132f20eb9e0cbe57f11f1f9594a287a63900)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137958
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index bd4bd01b6f3e..6302f044eea7 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1658,7 +1658,8 @@ void ScDrawLayer::DeleteObjectsInSelection( const
ScMarkData& rMark )
ScAnchorType aAnchorType =
ScDrawLayer::GetAnchorType(*pObject);
bool bObjectAnchoredToMarkedCell
= ((aAnchorType == SCA_CELL || aAnchorType ==
SCA_CELL_RESIZE)
- && pObjData &&
rMark.IsCellMarked(pObjData->maStart.Col(),
+ && pObjData && pObjData->maStart.IsValid()
+ && rMark.IsCellMarked(pObjData->maStart.Col(),
pObjData->maStart.Row()));
if (bObjectInMarkArea || bObjectAnchoredToMarkedCell)
{
