[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2704871015233d632ccad8b6472ca52434f2ec1e
Author: Henry Castro
AuthorDate: Fri May 19 15:22:59 2023 -0400
Commit: Szymon Kłos
CommitDate: Mon May 22 08:59:40 2023 +0200
lok: sc: disable Value Highlighting
If the document is saved with the option:
View - Value Highlighting
The online client side does not have implemented yet, otherwise
will not paint the cell background.
Signed-off-by: Henry Castro
Change-Id: I05b1a2ef63602a7bf34f717b87c304d00a8c8efc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152019
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index d55cd50c1384..9514c9cc7d12 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3920,7 +3920,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
if ( rSetting.Value >>= nTemp16 )
maOptions.SetObjMode(VOBJ_TYPE_DRAW, (nTemp16 == 1) ?
VOBJ_MODE_HIDE : VOBJ_MODE_SHOW);
}
-else if ( sName.compareToAscii( SC_UNO_VALUEHIGH ) == 0 )
+else if ( sName.compareToAscii( SC_UNO_VALUEHIGH ) == 0 &&
!comphelper::LibreOfficeKit::isActive())
maOptions.SetOption(VOPT_SYNTAX,
ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value));
else
{
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/GradientStyle.hxx |4 +-
include/xmloff/HatchStyle.hxx |4 +-
xmloff/source/style/GradientStyle.cxx | 50 +-
xmloff/source/style/HatchStyle.cxx| 26 -
4 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit a97374fca86e4073c83a8e539d97462c23dd32b8
Author: Miklos Vajna
AuthorDate: Mon May 22 08:27:57 2023 +0200
Commit: Miklos Vajna
CommitDate: Mon May 22 10:34:57 2023 +0200
sw: prefix members of XMLGradientStyleExport, XMLGradientStyleImport, ...
... XMLHatchStyleExport and XMLHatchStyleImport
See tdf#94879 for motivation.
Change-Id: I2dd4c97c6e234447190e46bd6f6a6354e16911bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152077
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 04ad2832d997..58975644fb3d 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -37,7 +37,7 @@ namespace com::sun::star {
class XMLOFF_DLLPUBLIC XMLGradientStyleImport
{
-SvXMLImport& rImport;
+SvXMLImport& m_rImport;
public:
XMLGradientStyleImport( SvXMLImport& rImport );
@@ -60,7 +60,7 @@ public:
class XMLOFF_DLLPUBLIC XMLGradientStyleExport
{
-SvXMLExport& rExport;
+SvXMLExport& m_rExport;
public:
XMLGradientStyleExport( SvXMLExport& rExport );
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 9ded654e53e2..73c07e643a2c 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -35,7 +35,7 @@ namespace com::sun::star {
class XMLOFF_DLLPUBLIC XMLHatchStyleImport
{
-SvXMLImport& rImport;
+SvXMLImport& m_rImport;
public:
XMLHatchStyleImport( SvXMLImport& rImport );
@@ -48,7 +48,7 @@ public:
class XMLOFF_DLLPUBLIC XMLHatchStyleExport
{
-SvXMLExport& rExport;
+SvXMLExport& m_rExport;
public:
XMLHatchStyleExport( SvXMLExport& rExport );
diff --git a/xmloff/source/style/GradientStyle.cxx
b/xmloff/source/style/GradientStyle.cxx
index 3ab6c422b2c8..fcc371c89ffb 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -52,7 +52,7 @@ SvXMLEnumMapEntry const
pXML_GradientStyle_Enum[] =
// Import
XMLGradientStyleImport::XMLGradientStyleImport(
SvXMLImport& rImp )
-: rImport(rImp)
+: m_rImport(rImp)
{
}
@@ -114,14 +114,14 @@ void XMLGradientStyleImport::importXML(
break;
case XML_ELEMENT(DRAW, XML_GRADIENT_ANGLE):
{
-auto const
cmp12(rImport.GetODFVersion().compareTo(ODFVER_012_TEXT));
+auto const
cmp12(m_rImport.GetODFVersion().compareTo(ODFVER_012_TEXT));
bool const bSuccess =
::sax::Converter::convertAngle(aGradient.Angle,
aIter.toView(),
// tdf#89475 try to detect borked OOo angles
(cmp12 < 0) || (cmp12 == 0
-&&
(rImport.isGeneratorVersionOlderThan(SvXMLImport::AOO_4x, SvXMLImport::LO_7x)
+&&
(m_rImport.isGeneratorVersionOlderThan(SvXMLImport::AOO_4x, SvXMLImport::LO_7x)
// also for AOO 4.x, assume there won't ever
be a 4.2
-|| rImport.getGeneratorVersion() ==
SvXMLImport::AOO_4x)));
+|| m_rImport.getGeneratorVersion() ==
SvXMLImport::AOO_4x)));
SAL_INFO_IF(!bSuccess, "xmloff.style", "failed to import
draw:angle");
}
break;
@@ -139,7 +139,7 @@ void XMLGradientStyleImport::importXML(
if( !aDisplayName.isEmpty() )
{
-rImport.AddStyleDisplayName( XmlStyleFamily::SD_GRADIENT_ID, rStrName,
+m_rImport.AddStyleDisplayName( XmlStyleFamily::SD_GRADIENT_ID,
rStrName,
aDisplayName );
rStrName = aDisplayName;
}
@@ -211,7 +211,7 @@ XMLGradientStopContext::~XMLGradientStopContext()
XMLGradientStyleExport::XMLGradientStyleExport(
SvXMLExport& rExp )
-: rExport(rExp)
+: m_rExport(rExp)
{
}
@@ -236,15 +236,15 @@ void XMLGradientStyleExport::exportXML(
// Name
bool bEncoded = false;
-rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
- rExport.EncodeStyleName( rStrName,
+m_rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
+ m_rExport.EncodeStyleName( rStrName,
&bEncoded ) );
if( bEncoded )
-rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME,
+m_rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME,
rStrName );
aStrValue = aOut.makeStringAndClear();
-rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
+m_rExport.Add
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source
sw/source/core/doc/docnum.cxx | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit d77beaf8bcae20ac72193a0ba767b4a199258dbc
Author: Xisco Fauli
AuthorDate: Fri May 19 10:49:28 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon May 22 11:08:10 2023 +0200
sw: fix crash in GotoNextLayoutTextFrame/GotoPrevLayoutTextFrame
See
https://crashreport.libreoffice.org/stats/signature/sw::GotoPrevLayoutTextFrame(SwNodeIndex%20&,SwRootFrame%20const%20*)
and
https://crashreport.libreoffice.org/stats/signature/sw::GotoNextLayoutTextFrame(SwNodeIndex%20&,SwRootFrame%20const%20*)
Change-Id: I2233078051bd653de5634f1e0dabab9c1f59acb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151994
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 4269977853bd51c4fc7f93e497246da163d71f17)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152030
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b4d32ea25b61..703c15f2187d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1439,11 +1439,16 @@ GotoPrevLayoutTextFrame(SwNodeIndex & rIndex,
SwRootFrame const*const pLayout)
{
if (rIndex.GetNode().IsTextNode())
{
-if (rIndex.GetNode().GetRedlineMergeFlag() != SwNode::Merge::None
&&
-// not a tracked row deletion in Hide Changes mode
-rIndex.GetNode().GetTextNode()->getLayoutFrame(pLayout) )
+if (rIndex.GetNode().GetRedlineMergeFlag() != SwNode::Merge::None)
{
-rIndex =
*static_cast(rIndex.GetNode().GetTextNode()->getLayoutFrame(pLayout))->GetMergedPara()->pFirstNode;
+// not a tracked row deletion in Hide Changes mode
+if (SwContentFrame* pFrame =
rIndex.GetNode().GetTextNode()->getLayoutFrame(pLayout))
+{
+if (sw::MergedPara* pMerged =
static_cast(pFrame)->GetMergedPara())
+{
+rIndex = pMerged->pFirstNode->GetIndex();
+}
+}
}
}
else if (rIndex.GetNode().IsEndNode())
@@ -1471,7 +1476,13 @@ GotoNextLayoutTextFrame(SwNodeIndex & rIndex,
SwRootFrame const*const pLayout)
{
if (rIndex.GetNode().GetRedlineMergeFlag() != SwNode::Merge::None)
{
-rIndex =
*static_cast(rIndex.GetNode().GetTextNode()->getLayoutFrame(pLayout))->GetMergedPara()->pLastNode;
+if (SwContentFrame* pFrame =
rIndex.GetNode().GetTextNode()->getLayoutFrame(pLayout))
+{
+if (sw::MergedPara* pMerged =
static_cast(pFrame)->GetMergedPara())
+{
+rIndex = pMerged->pLastNode->GetIndex();
+}
+}
}
}
else if (rIndex.GetNode().IsTableNode())
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source
sw/source/core/crsr/crsrsh.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8a7fbac52b29da29564e1533030f111ec7e4e9ac Author: Michael Stahl AuthorDate: Wed May 17 14:49:55 2023 +0200 Commit: Xisco Fauli CommitDate: Mon May 22 11:27:32 2023 +0200 tdf#155346 sw: fix crash from changing modal mode When closing the dialog, UpdateCursor() creates a table cursor for ExtendedSelectedAll() because mbSelectAll isn't set. 1 SwShellTableCursor::SwShellTableCursor 2 SwCursorShell::UpdateCursor 3 SwCursorShell::ShowCursor 4 SwView::ShowCursor 5 SfxViewFrame::Enable 6 SfxViewFrame::Notify 7 SfxBroadcaster::Broadcast 8 SfxObjectShell::SetModalMode_Impl 9 SfxViewFrame::SetModalMode (regression from commit d81379db730a163c5ff75d4f3a3cddbd7b5eddda) Change-Id: Ie73f8e42f764f8041288eb0850721a530d106a0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151880 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 1458d2f935c50ab7f3e2f1277d1bc7d1b5b5f894) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151926 Reviewed-by: Xisco Fauli diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 53ccb4a839d3..03cecdbbd8bf 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2661,6 +2661,8 @@ void SwCursorShell::ShowCursor() if( m_bBasicHideCursor ) return; +comphelper::FlagRestorationGuard g(mbSelectAll, StartsWith_() != StartsWith::None && ExtendedSelectedAll()); + m_bSVCursorVis = true; m_pCurrentCursor->SetShowTextInputFieldOverlay( true ); m_pCurrentCursor->SetShowContentControlOverlay(true);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source
sw/qa/extras/htmlexport/data/sub_li_and_ctd.fodt | 33
sw/qa/extras/htmlexport/htmlexport.cxx | 34 +
sw/source/filter/html/htmlatr.cxx|2 -
sw/source/filter/html/htmlnum.cxx| 46 +++
sw/source/filter/html/htmlnum.hxx|6 +--
sw/source/filter/html/htmlnumwriter.cxx | 19 +
sw/source/filter/html/htmltabw.cxx | 10 ++---
7 files changed, 132 insertions(+), 18 deletions(-)
New commits:
commit ebf8b0b0699fe34c86badb3087869d902a4e40a8
Author: Mike Kaganski
AuthorDate: Thu May 18 15:56:46 2023 +0300
Commit: Xisco Fauli
CommitDate: Mon May 22 11:28:06 2023 +0200
tdf#155387: fix list restart and opening/closing conditions
1. List restart flag in the node does not yet mean that the restart
would actually happen: it will be ignored, if the next node is more
nested than the previous one.
2. When writing nested list items, we should not write additional
pairs for current level (previously, only level 0 was
skipped); same for closing.
Change-Id: I5f67e8fa9236e7e2e6dba2e0ec5dffbf0d7b7f8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151958
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152010
diff --git a/sw/qa/extras/htmlexport/data/sub_li_and_ctd.fodt
b/sw/qa/extras/htmlexport/data/sub_li_and_ctd.fodt
new file mode 100644
index ..b4a3977926c6
--- /dev/null
+++ b/sw/qa/extras/htmlexport/data/sub_li_and_ctd.fodt
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ l1
+ l1_ctd1
+
+
+ l2
+
+
+ l2
+
+
+ l1_ctd2
+
+
+
+
+ l3
+
+
+
+
+ l1_ctd3
+
+
+
+
+
\ No newline at end of file
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 710a45c10f3e..b42eef6d83f5 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2459,6 +2459,40 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqIfTransparentTifImg)
CPPUNIT_ASSERT_EQUAL(GraphicFileFormat::TIF, aDescriptor.GetFileFormat());
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155387)
+{
+createSwDoc("sub_li_and_ctd.fodt");
+ExportToReqif();
+
+SvMemoryStream aStream;
+WrapReqifFromTempFile(aStream);
+xmlDocUniquePtr pDoc = parseXmlStream(&aStream);
+// Without the fix in place, this would fail
+CPPUNIT_ASSERT(pDoc);
+
+// Single top-level list
+assertXPath(pDoc, "/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul");
+// Single top-level item
+assertXPath(pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li");
+// 4 top-level paragraphs in the item
+assertXPath(pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p",
4);
+// 2 sublists in the item
+assertXPath(
+pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul",
2);
+// 2 items in the first sublist
+assertXPath(pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[1]/"
+"reqif-xhtml:li",
+2);
+// Check the last (most nested) subitem's text
+assertXPathContent(
+pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:ul[2]/"
+"reqif-xhtml:li/reqif-xhtml:ul/reqif-xhtml:li/reqif-xhtml:p",
+"l3");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 822718763e4d..95db5a76525a 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -982,7 +982,7 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const
SwHTMLTextCollOutputInfo& r
const SwHTMLNumRuleInfo& rNRInfo = rHWrt.GetNumInfo();
if( rNextInfo.GetNumRule() != rNRInfo.GetNumRule() ||
rNextInfo.GetDepth() != rNRInfo.GetDepth() ||
-rNextInfo.IsNumbered() || rNextInfo.IsRestart() )
+rNextInfo.IsNumbered() || rNextInfo.IsRestart(rNRInfo) )
rHWrt.ChangeParaToken( HtmlTokenId::NONE );
OutHTML_NumberBulletListEnd( rHWrt, rNextInfo );
}
diff --git a/sw/source/filter/html/htmlnum.cxx
b/sw/source/filter/html/htmlnum.cxx
index bd8317bb5676..8fa120a630cf 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -44,4 +44,50 @@ void SwHTMLNumRuleInfo::Set(const SwTextNode& rTextNd)
}
}
+// Restart flag is only effective when this level is not below the previous
+bool SwHTMLNumRuleInfo::IsRestart(const S
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a162c4cdc9fd95bdbeb6a71b9b7689f242c2906 Author: Christian Lohmaier AuthorDate: Mon May 22 12:37:25 2023 +0200 Commit: Gerrit Code Review CommitDate: Mon May 22 12:37:25 2023 +0200 Update git submodules * Update translations from branch 'master' to b2e864f9b44f85777d7679cb3696a5a801b8ee97 - update translations for master/7.6 and force-fix errors using pocheck Change-Id: Iec9043ba6ba5c1520fd5906a7ebfc8c7ae94a2c5 diff --git a/translations b/translations index ae42bcbf34f4..b2e864f9b44f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ae42bcbf34f4674bcdb9eaee2117bea67b1dc5cd +Subproject commit b2e864f9b44f85777d7679cb3696a5a801b8ee97
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/qa xmloff/source
chart2/qa/extras/chart2export3.cxx| 27 +++
chart2/qa/extras/data/ods/tdf148142.ods |binary
xmloff/source/chart/SchXMLAxisContext.cxx |1 +
3 files changed, 28 insertions(+)
New commits:
commit 9d7d35718f32fd757f6ce994e6aab0c6f3494b3c
Author: Tünde Tóth
AuthorDate: Wed May 17 13:49:29 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon May 22 13:01:50 2023 +0200
tdf#148142 chart: fix export of modified On/Between tick marks
Reset the MajorOrigin property after import to avoid
of the bad export of the modified document, which reset
the original On tick marks/Between tick marks value.
Follow-up to commit 40d83914d43f60a196dfabddea0b52e2046b333a
"tdf#127792 implement UNO chart attribute MajorOrigin".
Change-Id: I0e3915b7d1b601abd40fbd1ba9d01fc05a8fb7c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151885
Tested-by: László Németh
Reviewed-by: László Németh
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152009
Tested-by: Jenkins
diff --git a/chart2/qa/extras/chart2export3.cxx
b/chart2/qa/extras/chart2export3.cxx
index dd081f8e5b9b..243ea6e234ba 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -74,6 +74,7 @@ public:
void testMultipleAxisXLSX();
void testSecondaryAxisXLSX();
void testBarChartSecondaryAxisXLSX();
+void testTdf148142();
CPPUNIT_TEST_SUITE(Chart2ExportTest3);
CPPUNIT_TEST(testTdf108107);
@@ -120,6 +121,7 @@ public:
CPPUNIT_TEST(testMultipleAxisXLSX);
CPPUNIT_TEST(testSecondaryAxisXLSX);
CPPUNIT_TEST(testBarChartSecondaryAxisXLSX);
+CPPUNIT_TEST(testTdf148142);
CPPUNIT_TEST_SUITE_END();
};
@@ -773,6 +775,31 @@ void Chart2ExportTest3::testBarChartSecondaryAxisXLSX()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId",
"val", YValueIdOf2Barchart);
}
+void Chart2ExportTest3::testTdf148142()
+{
+// The document contains a line chart with "Between tick marks" X axis
position.
+loadFromURL(u"ods/tdf148142.ods");
+Reference xChartDoc = getChartDocFromSheet(0,
mxComponent);
+CPPUNIT_ASSERT(xChartDoc.is());
+Reference xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
+CPPUNIT_ASSERT(xAxis.is());
+chart2::ScaleData aScaleData = xAxis->getScaleData();
+CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition);
+
+// Set the X axis position to "On tick marks".
+aScaleData.ShiftedCategoryPosition = false;
+xAxis->setScaleData(aScaleData);
+
+// Check the X axis position after export.
+saveAndReload("calc8");
+Reference xChartDoc2 = getChartDocFromSheet(0,
mxComponent);
+CPPUNIT_ASSERT(xChartDoc2.is());
+Reference xAxis2 = getAxisFromDoc(xChartDoc2, 0, 0, 0);
+CPPUNIT_ASSERT(xAxis2.is());
+chart2::ScaleData aScaleData2 = xAxis2->getScaleData();
+CPPUNIT_ASSERT(!aScaleData2.ShiftedCategoryPosition);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest3);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/ods/tdf148142.ods
b/chart2/qa/extras/data/ods/tdf148142.ods
new file mode 100644
index ..9b736a06d19a
Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf148142.ods differ
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx
b/xmloff/source/chart/SchXMLAxisContext.cxx
index ad8b187f88e2..ae55da90f8b5 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -547,6 +547,7 @@ void SchXMLAxisContext::CreateAxis()
{
aScaleData.ShiftedCategoryPosition =
rtl::math::approxEqual(fMajorOrigin, 0.5);
xAxis->setScaleData(aScaleData);
+m_xAxisProps->setPropertyValue("MajorOrigin", uno::Any());
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - editeng/source sw/qa
editeng/source/misc/svxacorr.cxx| 102
sw/qa/extras/uiwriter/uiwriter6.cxx | 24
2 files changed, 82 insertions(+), 44 deletions(-)
New commits:
commit 9eae9409a739c21ea27a480f55b434df8e613acd
Author: Mike Kaganski
AuthorDate: Fri May 19 14:01:02 2023 +0300
Commit: Xisco Fauli
CommitDate: Mon May 22 13:02:32 2023 +0200
tdf#155407: fix the second replacement in FnChgToEnEmDash
It was broken from the beginning. The second replacement could
look into a wrong string when checking if the characters around
the "--" are eligible; it could use obsolete indices in the
document, ignoring the previous replacement that changed the
lendth of the text.
This also replaces a use of char* to hold Unicode codepoints to
pass to lcl_IsInAsciiArr, with an array of sal_Unicode (because
all the checked values fit into it).
Change-Id: I949630abc564fc0875be0b92228846497bb1a022
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152002
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152084
Reviewed-by: Michael Stahl
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 1ae3ed49dfd4..054011e2a390 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -100,11 +100,13 @@ constexpr OUStringLiteral pXMLImplWordStart_ExcptLstStr =
u"WordExceptList.xml";
constexpr OUStringLiteral pXMLImplCplStt_ExcptLstStr =
u"SentenceExceptList.xml";
constexpr OUStringLiteral pXMLImplAutocorr_ListStr = u"DocumentList.xml";
-const char
+// tdf#54409 check also typographical quotation marks in the case of skipped
ASCII quotation marks
+// Curious, why these \u0083\u0084\u0089\u0091\u0092\u0093\u0094 are handled
as "begin characters"?
+constexpr std::u16string_view
/* also at these beginnings - Brackets and all kinds of begin characters */
-sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94",
+sImplSttSkipChars =
u"\"'([{\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u0083\u0084\u0089\u0091\u0092\u0093\u0094",
/* also at these ends - Brackets and all kinds of begin characters */
-sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94";
+sImplEndSkipChars =
u"\"')]}\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u0083\u0084\u0089\u0091\u0092\u0093\u0094";
static OUString EncryptBlockName_Imp(std::u16string_view rName);
@@ -171,20 +173,12 @@ static bool lcl_IsSymbolChar( CharClass const & rCC,
const OUString& rTxt,
return false;
}
-static bool lcl_IsInAsciiArr( const char* pArr, const sal_Unicode c )
+static bool lcl_IsInArr(std::u16string_view arr, const sal_uInt32 c)
{
-// tdf#54409 check also typographical quotation marks in the case of
skipped ASCII quotation marks
-if ( 0x2018 <= c && c <= 0x201F && (pArr == sImplSttSkipChars || pArr ==
sImplEndSkipChars) )
-return true;
-
-bool bRet = false;
-for( ; *pArr; ++pArr )
-if( *pArr == c )
-{
-bRet = true;
-break;
-}
-return bRet;
+for (const auto c1 : arr)
+if (c1 == c)
+return true;
+return false;
}
SvxAutoCorrDoc::~SvxAutoCorrDoc()
@@ -311,6 +305,8 @@ ACFlags SvxAutoCorrect::GetDefaultFlags()
constexpr sal_Unicode cEmDash = 0x2014;
constexpr sal_Unicode cEnDash = 0x2013;
+constexpr OUStringLiteral sEmDash(u"\u2014");
+constexpr OUStringLiteral sEnDash(u"\u2013");
constexpr sal_Unicode cApostrophe = 0x2019;
constexpr sal_Unicode cLeftDoubleAngleQuote = 0xAB;
constexpr sal_Unicode cRightDoubleAngleQuote = 0xBB;
@@ -484,10 +480,10 @@ bool SvxAutoCorrect::FnChgOrdinalNumber(
CharClass& rCC = GetCharClass(eLang);
for (; nSttPos < nEndPos; ++nSttPos)
-if (!lcl_IsInAsciiArr(sImplSttSkipChars, rTxt[nSttPos]))
+if (!lcl_IsInArr(sImplSttSkipChars, rTxt[nSttPos]))
break;
for (; nSttPos < nEndPos; --nEndPos)
-if (!lcl_IsInAsciiArr(sImplEndSkipChars, rTxt[nEndPos - 1]))
+if (!lcl_IsInArr(sImplEndSkipChars, rTxt[nEndPos - 1]))
break;
@@ -557,6 +553,7 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
// rTxt may refer to the frame text that will change in the calls to
rDoc.Delete / rDoc.Insert;
// keep a local copy for later use
OUString aOrigTxt = rTxt;
+sal_Int32 nFirstReplacementTextLengthChange = 0;
// replace " - " or " --" with "enDash"
if( 1 < nSttPos && 1 <= nEndPos - nSttPos )
@@ -569,7 +566,7 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
'-' == rTxt[ nSttPos+1 ])
{
sal_Int32 n;
-for( n = nSttPos+2; n < nEndPos && lcl_IsInAsciiArr(
+for( n = nSttPos+2; n < nEndPos && lcl_IsInArr(
sImplSttSkipChars,(cCh = rTxt
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/colorscale.hxx |2 +
sc/qa/unit/ucalc_condformat.cxx| 51 +
sc/source/core/data/colorscale.cxx | 35 +
3 files changed, 88 insertions(+)
New commits:
commit 8af6c46a9c0e86bbbd908e96ff236ad1d6c4ddab
Author: Tibor Nagy
AuthorDate: Wed May 17 08:40:43 2023 +0200
Commit: László Németh
CommitDate: Mon May 22 13:32:56 2023 +0200
tdf#155319 sc: fix conditional format data bar after copying
This is a follow up to commit I064fb3fe0443705553c6bbfcc34f2d717e0f6bd6
(tdf#154906 tdf#129813 tdf#129814 sc: fix conditional format color
scale)
Change-Id: Iacc1f5af762e1f6a40ecd13c33384e4a3340822a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151860
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 90a973391995..6652e224fe67 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -313,6 +313,8 @@ public:
const ScDataBarFormatData* GetDataBarData() const;
ScDataBarFormatData* GetDataBarData();
+bool IsEqual(const ScFormatEntry& r, bool bIgnoreSrcPos) const override;
+
virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override;
virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
override;
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
override;
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index bfece1515a89..78978daec33a 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -268,6 +268,57 @@ CPPUNIT_TEST_FIXTURE(TestCondformat,
testCondFormatInsertDeleteSheets)
m_pDoc->DeleteTab(0);
}
+CPPUNIT_TEST_FIXTURE(TestCondformat, testDataBarCondCopyPaste)
+{
+m_pDoc->InsertTab(0, "Test");
+
+auto pFormat = std::make_unique(1, m_pDoc);
+ScRange aCondFormatRange(0, 0, 0, 2, 0, 0);
+ScRangeList aRangeList(aCondFormatRange);
+pFormat->SetRange(aRangeList);
+
+ScDataBarFormat* pDatabar = new ScDataBarFormat(m_pDoc);
+ScDataBarFormatData* pFormatData = new ScDataBarFormatData();
+pFormatData->meAxisPosition = databar::AUTOMATIC;
+pFormatData->maPositiveColor = COL_BLUE;
+pFormatData->mxNegativeColor = COL_GREEN;
+pFormatData->mbGradient = true;
+
+pDatabar->SetDataBarData(pFormatData);
+pFormat->AddEntry(pDatabar);
+
+sal_uLong nIndex = m_pDoc->AddCondFormat(std::move(pFormat), 0);
+
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+copyToClip(m_pDoc, aCondFormatRange, &aClipDoc);
+
+ScRange aTargetRange(0, 3, 0, 2, 3, 0);
+pasteFromClip(m_pDoc, aTargetRange, &aClipDoc);
+
+// Pasting the same conditional format must modify existing format, making
its range
+// combined of previous range and newly pasted range having the
conditional format.
+// No new conditional formats must be created.
+CPPUNIT_ASSERT_EQUAL(size_t(1), m_pDoc->GetCondFormList(0)->size());
+aRangeList.Join(aTargetRange);
+for (SCCOL nCol = 0; nCol < 3; ++nCol)
+{
+ScConditionalFormat* pPastedFormat = m_pDoc->GetCondFormat(nCol, 3, 0);
+CPPUNIT_ASSERT(pPastedFormat);
+CPPUNIT_ASSERT_EQUAL(aRangeList, pPastedFormat->GetRange());
+
+sal_uLong nPastedKey = pPastedFormat->GetKey();
+CPPUNIT_ASSERT_EQUAL(nIndex, nPastedKey);
+
+const SfxPoolItem* pItem = m_pDoc->GetAttr(nCol, 3, 0,
ATTR_CONDITIONAL);
+const ScCondFormatItem* pCondFormatItem = static_cast(pItem);
+CPPUNIT_ASSERT(pCondFormatItem);
+CPPUNIT_ASSERT_EQUAL(size_t(1),
pCondFormatItem->GetCondFormatData().size());
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(nIndex),
pCondFormatItem->GetCondFormatData().front());
+}
+
+m_pDoc->DeleteTab(0);
+}
+
CPPUNIT_TEST_FIXTURE(TestCondformat, testColorScaleCondCopyPaste)
{
m_pDoc->InsertTab(0, "Test");
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 7fd48f47305d..1d713c447c5b 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -802,6 +802,41 @@ ScFormatEntry::Type ScDataBarFormat::GetType() const
return Type::Databar;
}
+bool ScDataBarFormat::IsEqual(const ScFormatEntry& rOther, bool
/*bIgnoreSrcPos*/) const
+{
+if (GetType() != rOther.GetType())
+return false;
+
+const ScDataBarFormat& r = static_cast(rOther);
+
+bool bEq =
(mpFormatData->maAxisColor.IsRGBEqual(r.mpFormatData->maAxisColor)
+&&
mpFormatData->maPositiveColor.IsRGBEqual(r.mpFormatData->maPositiveColor)
+&& mpFormatData->mxNegativeColor ==
r.mpFormatData->mxNegativeColor
+&& mpFormatData->meAxisPosition ==
r.mpFormatData->meAxisPosition
+&& mpFormatData->mbGradient == r.mpFormatData->mbGradient
+&& mpFormatData->mbOnlyBar == r.mpFormatData->mbOnlyB
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa sw/source
sw/qa/core/layout/data/floattable-tab-join-legacy.docx |binary
sw/qa/core/layout/flycnt.cxx | 30 +
sw/source/core/layout/fly.cxx | 10 +
3 files changed, 39 insertions(+), 1 deletion(-)
New commits:
commit 44700d4e74e38068713b9570a81ac7f188d933cf
Author: Miklos Vajna
AuthorDate: Fri May 19 15:09:18 2023 +0200
Commit: Miklos Vajna
CommitDate: Mon May 22 13:46:47 2023 +0200
sw floattable: fix legacy max height of split flys with negative vert offset
A reduced bugdoc from tdf#155002 had 2 floating tables, the one on the
2nd page was split to two fly frames, so the first and the second row
overlapped.
This is similar to what was fixed in commit
4cb6e54a3dcdd771ef76bd98b58f0bf1c4be4c45 (sw floattable: fix missing
table join when moving master fly to next page, 2023-05-18), but here we
are in the legacy layout mode, which allows floating tables outside the
body frame, somewhat. The exact detail here is that the vertical offset
of the floating table is -179 twips, and Word also splits the table to 2
floating frames in case there is no such vertical offset.
Fix the problem by ignoring the part of the fly frame that is
overlapping with the top margin area, this way the 2nd floating table
fits the 2nd page and our layout matches Word.
The crash with the original tdf#155002 bugdoc needs more work, still.
(cherry picked from commit 632f36cc972116cd8da8245590f74014c22532db)
Change-Id: I61ac54116480904320c7fa7cc557e0fcaf792739
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152078
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/core/layout/data/floattable-tab-join-legacy.docx
b/sw/qa/core/layout/data/floattable-tab-join-legacy.docx
new file mode 100644
index ..f4056bf21f5c
Binary files /dev/null and
b/sw/qa/core/layout/data/floattable-tab-join-legacy.docx differ
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 8aec18461bee..3c6a061cb962 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -855,6 +855,36 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTabJoin)
CPPUNIT_ASSERT(pPage3);
CPPUNIT_ASSERT(!pPage3->GetSortedObjs());
}
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTabJoinLegacy)
+{
+// Given a document with 3 pages and 2 tables: table on first and second
page, 3rd page has no
+// table (Word 2010 mode):
+createSwDoc("floattable-tab-join-legacy.docx");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure that all pages have the expected amount of fly frames:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage2 = dynamic_cast(pPage1->GetNext());
+CPPUNIT_ASSERT(pPage2);
+const SwSortedObjs& rPage2Objs = *pPage2->GetSortedObjs();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 2
+// i.e. the 2nd page had 2 fly frames, hosting a split table, instead of
joining that table and
+// having 1 fly frame (even after the non-legacy case was fixed already).
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage2Objs.size());
+auto pPage3 = dynamic_cast(pPage2->GetNext());
+CPPUNIT_ASSERT(pPage3);
+CPPUNIT_ASSERT(!pPage3->GetSortedObjs());
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c5ee8815a71b..b598346216ee 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -107,11 +107,19 @@ SwTwips GetFlyAnchorBottom(SwFlyFrame* pFly, const
SwFrame& rAnchor)
// See if the fly height would fit at least the page height, ignoring
the vertical offset.
SwTwips nFlyHeight = aRectFnSet.GetHeight(pFly->getFrameArea());
SwTwips nPageHeight = aRectFnSet.GetHeight(pPage->getFramePrintArea());
+SwTwips nFlyTop = aRectFnSet.GetTop(pFly->getFrameArea());
+SwTwips nBodyTop = aRectFnSet.GetTop(pBody->getFrameArea());
+if (nFlyTop < nBodyTop)
+{
+// Fly frame overlaps with the top margin area, ignore that part
of the fly frame for
+// top/height purposes.
+nFlyHeight -= nBodyTop - nFlyTop;
+nFlyTop = nBodyTop;
+}
if (nFlyHeight <= nPageHeight)
{
// Yes, it would fit: allow overlap if there is no problematic
vertical offset.
SwTwips nDeadline = aRectFnSet.GetBottom(pPage->getFrameArea());
-SwTwips nFlyTop = aRectFnSet.GetTop(pFly->getFra
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_Services.xba |3
wizards/source/scriptforge/python/scriptforge.py | 26 +
wizards/source/sfdialogs/SF_Dialog.xba | 46 +++-
wizards/source/sfdialogs/SF_Register.xba | 118 +--
4 files changed, 177 insertions(+), 16 deletions(-)
New commits:
commit 0a1022b04c90d36e16dee121923ca4111386585b
Author: Jean-Pierre Ledure
AuthorDate: Sun May 21 17:06:05 2023 +0200
Commit: Jean-Pierre Ledure
CommitDate: Mon May 22 14:08:20 2023 +0200
ScriptForge (SFDialogs: create dialogs on-the-fly
A dialog service is returned by next statement
dialog = CreateScriptService("newdialog", dialogname, place)
All properties and methods applicable to predefined
dialogs are available for such new dialogs.
In particular the series of CreateXXX() methods for the addition
of ne dialog controls.
The functionality is available from Basic and Python user
scripts.
An update of the SFDialogs.SF_Dialog help page is required.
A display rendering unstability (flickerings, delays, ..) has
been observed when (all conditions must be met)
- the user script is run from Python
- from inside the LibreOffice process
- the dialog is non-modal
Change-Id: Id3f311cd04497fd79712ce712bdb2724b5caa861
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152071
Tested-by: Jean-Pierre Ledure
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/SF_Services.xba
b/wizards/source/scriptforge/SF_Services.xba
index f5e0545546e6..f00ad9e94b21 100644
--- a/wizards/source/scriptforge/SF_Services.xba
+++ b/wizards/source/scriptforge/SF_Services.xba
@@ -128,7 +128,8 @@ Try:
Select Case LCase(sService)
Case "document", "calc",
"writer", "base", "formdocument",
"documentevent", "formevent"
sLibrary = "SFDocuments"
- Case "dialog", "dialogevent"
: sLibrary = "SFDialogs"
+ Case "dialog", "dialogevent",
"newdialog"
+
sLibrary = "SFDialogs"
Case "database", "datasheet"
: sLibrary = "SFDatabases"
Case "unittest"
: sLibrary = "SFUnitTests"
Case "menu", "popupmenu",
"toolbar", "toolbarbutton"
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index 1b094c4711be..8b3a67fe2f60 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -1987,6 +1987,32 @@ class SFDialogs:
def Terminate(self):
return self.ExecMethod(self.vbMethod, 'Terminate')
+# #
+# SF_NewDialog CLASS
+# #
+class SF_NewDialog(SFServices):
+"""
+Pseudo service never returned from the Basic world. A SF_Dialog
instance is returned instead.
+Main purpose: manage the arguments of CreateScritService() for the
creation of a dialog from scratch
+"""
+# Mandatory class properties for service registration
+serviceimplementation = 'basic'
+servicename = 'SFDialogs.NewDialog'
+servicesynonyms = ('newdialog', 'sfdialogs.newdialog')
+serviceproperties = dict()
+
+@classmethod
+def ReviewServiceArgs(cls, dialogname = '', place = (0, 0, 0, 0)):
+"""
+Transform positional and keyword arguments into positional only
+Add the XComponentContext as last argument
+"""
+outsideprocess = len(ScriptForge.hostname) > 0 and
ScriptForge.port > 0
+if outsideprocess:
+return dialogname, place, ScriptForge.componentcontext
+else:
+return dialogname, place
+
# #
# SF_DialogControl CLASS
# #
diff --git a/wizards/source/sfdialogs/SF_Dialog.xba
b/wizards/source/sfdialogs/SF_Dialog.xba
index 20f1e81dc650..4979fa82a681 100644
--- a/wizards/source/sfdialogs/SF_Dialog.xba
+++ b/wizards/source/sfdialogs/SF_Dialog.xba
@@ -14,18 +14,22 @@ Option Explicit
'
''' SF_Dialog
''' =
-''' Management of dialogs defined with the Basic IDE
+'''
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source
sc/source/ui/view/viewfunc.cxx | 29 -
1 file changed, 20 insertions(+), 9 deletions(-)
New commits:
commit 9494b7d3602aeccec0e434219c71a8b0223dfe82
Author: Noel Grandin
AuthorDate: Sun May 21 21:18:58 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon May 22 14:08:39 2023 +0200
tdf#155368 Can't toggle Wrap Text on all cells if cell already has
The problem is not so much that we cannot toggle, it is that we
cannot unset a toggle property.
And the reason for that, is that the state of the toggle never
goes off because the view state as computed by
ScViewFunc::GetSelectionPattern is different
from the state that is seen in ScViewFunc::ApplySelectionPattern
where we apply the pattern.
So make the same shrink-data-area adjustment in GetSelectionPattern.
Change-Id: Ic56145ee98ead931278767851f74e0ce7422a150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152074
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 8cc51cf9886a1e2f185c3824b71c960c08a9bf2e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152092
Reviewed-by: Xisco Fauli
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 6e15f9b3e0f8..b5953bbf26f0 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -904,17 +904,25 @@ SvtScriptType ScViewFunc::GetSelectionScriptType()
return nScript;
}
+static void ShrinkToDataArea(ScMarkData& rFuncMark, ScDocument& rDoc);
+
const ScPatternAttr* ScViewFunc::GetSelectionPattern()
{
// Don't use UnmarkFiltered in slot state functions, for performance
reasons.
// The displayed state is always that of the whole selection including
filtered rows.
-const ScMarkData& rMark = GetViewData().GetMarkData();
+ScMarkData aMark = GetViewData().GetMarkData();
ScDocument& rDoc = GetViewData().GetDocument();
-if ( rMark.IsMarked() || rMark.IsMultiMarked() )
+
+// tdf#155368 if the selection is the whole sheet, we need to shrink the
mark area, otherwise
+// we will not return a consistent result
+// (consistent compared to what happens in
ScViewFunc::ApplySelectionPattern)
+ShrinkToDataArea( aMark, rDoc );
+
+if ( aMark.IsMarked() || aMark.IsMultiMarked() )
{
// MarkToMulti is no longer necessary for rDoc.GetSelectionPattern
-const ScPatternAttr* pAttr = rDoc.GetSelectionPattern( rMark );
+const ScPatternAttr* pAttr = rDoc.GetSelectionPattern( aMark );
return pAttr;
}
else
@@ -923,9 +931,9 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern()
SCROW nRow = GetViewData().GetCurY();
SCTAB nTab = GetViewData().GetTabNo();
-ScMarkData aTempMark( rMark ); // copy sheet selection
-aTempMark.SetMarkArea( ScRange( nCol, nRow, nTab ) );
-const ScPatternAttr* pAttr = rDoc.GetSelectionPattern( aTempMark );
+// copy sheet selection
+aMark.SetMarkArea( ScRange( nCol, nRow, nTab ) );
+const ScPatternAttr* pAttr = rDoc.GetSelectionPattern( aMark );
return pAttr;
}
}
@@ -1181,11 +1189,14 @@ void ScViewFunc::ApplyPatternLines( const
ScPatternAttr& rAttr, const SvxBoxItem
StartFormatArea();
}
+// tdf#147842 if the marked area is the entire sheet, then shrink it to the
data area.
+// Otherwise ctrl-A, perform-action, will take a very long time as it tries to
modify
+// cells that we are not using.
static void ShrinkToDataArea(ScMarkData& rFuncMark, ScDocument& rDoc)
{
-// tdf#147842 if the marked area is the entire sheet, then shrink it to
the data area.
-// Otherwise ctrl-A, perform-action, will take a very long time as it
tries to modify
-// cells then we are not using.
+// do not make it marked if it is not already marked
+if (!rFuncMark.IsMarked())
+return;
if (rFuncMark.IsMultiMarked())
return;
ScRange aMarkArea = rFuncMark.GetMarkArea();
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/property/property.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c4c220b56c25a5a78106b9d0fc06280968ccdb28
Author: Noel Grandin
AuthorDate: Wed May 10 11:36:27 2023 +0200
Commit: Noel Grandin
CommitDate: Mon May 22 14:16:08 2023 +0200
improve logging when we get an exception in copyProperties
Change-Id: Id37ad92df93667536efaac86db3765da98847184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152086
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/property/property.cxx
b/comphelper/source/property/property.cxx
index 0627e71436f5..7d57baeb39cb 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#if OSL_DEBUG_LEVEL > 0
#include
@@ -87,6 +88,8 @@ void copyProperties(const Reference& _rxSource,
catch (Exception&)
{
#if OSL_DEBUG_LEVEL > 0
+TOOLS_WARN_EXCEPTION("comphelper", "Caught exception copying
properties");
+
OUStringBuffer aBuffer(
"::comphelper::copyProperties: could not copy property
'"
+ rSourceProp.Name
[Libreoffice-commits] core.git: sfx2/source starmath/qa
sfx2/source/doc/objmisc.cxx |3 ++-
starmath/qa/cppunit/test_cursor.cxx |1 +
starmath/qa/cppunit/test_node.cxx |1 +
starmath/qa/cppunit/test_nodetotextvisitors.cxx |1 +
4 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e7e9991fd06ba2e0484ae5e6b6acc323ab8bf66b
Author: Samuel Mehrbrodt
AuthorDate: Mon May 8 15:41:27 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon May 22 14:30:10 2023 +0200
tdf#146547 Mark read-only docs as modified
when an editable section is changed.
Change-Id: I588b09f160974d3a3833bfa011fd07f2ee496616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151535
Tested-by: Samuel Mehrbrodt
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6b86e2163ccb..dd639c36900d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -247,7 +247,8 @@ void SfxObjectShell::EnableSetModified( bool bEnable )
bool SfxObjectShell::IsEnableSetModified() const
{
-return pImpl->m_bEnableSetModified && !IsReadOnly();
+// Don't allow when user explicitly requested read only (IsLoadReadonly()
or IsOriginallyLoadedReadOnlyMedium())
+return pImpl->m_bEnableSetModified && ! (IsLoadReadonly() ||
IsOriginallyLoadedReadOnlyMedium());
}
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
index 56c673c1bd22..5f4c551675a1 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -58,6 +58,7 @@ void Test::setUp()
SmGlobals::ensure();
xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
+xDocShRef->DoInitNew();
}
void Test::tearDown()
diff --git a/starmath/qa/cppunit/test_node.cxx
b/starmath/qa/cppunit/test_node.cxx
index f16f195aa8bc..af9ff177f38f 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -53,6 +53,7 @@ void NodeTest::setUp()
mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+mxDocShell->DoInitNew();
}
void NodeTest::tearDown()
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 6f714321de82..11ef5affcc4c 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -91,6 +91,7 @@ void Test::setUp()
SmGlobals::ensure();
xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
+xDocShRef->DoInitNew();
}
void Test::tearDown()
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source
sw/source/uibase/utlui/navipi.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 09c40d669cac5f167fa68cb5c6ad94a6a9e2a844 Author: Attila Szűcs AuthorDate: Thu May 18 10:36:38 2023 +0200 Commit: Szymon Kłos CommitDate: Mon May 22 15:26:34 2023 +0200 LOK: Navigator: headings expanded by default Called an expand_row for the first element of the contetnTree in the navigator constructor. Right now contructor is called every time when navigator is opened, it may change later. (desktop app do it only if navigator opens in a new window, not on sidebar) Change-Id: Ibe4b71e6a6ddb573269178f83c295b0c2cbd53b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151939 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 99f87a13a055..61ada3408bbc 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -692,6 +692,12 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent, m_xGlobalBox->hide(); m_xGlobalToolBox->hide(); m_xGlobalTree->HideTree(); + +//Open Headings by default +auto& pTreeView = m_xContentTree->get_widget(); +std::unique_ptr itEntry(pTreeView.make_iterator()); +pTreeView.get_iter_first(*itEntry); +pTreeView.expand_row(*itEntry); } }
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/tdf155368.ods |binary
sc/qa/unit/subsequent_export_test.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit e34bb6e67aefde2fa1e7e12635a016a2076a11bd
Author: Xisco Fauli
AuthorDate: Mon May 22 13:53:19 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon May 22 15:48:28 2023 +0200
tdf#155368: sc_subsequent_export: Add unittest
Change-Id: Ie177342720df50d160600cf133b87bdf3411203d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152114
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf155368.ods
b/sc/qa/unit/data/ods/tdf155368.ods
new file mode 100644
index ..69442e8ca122
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf155368.ods differ
diff --git a/sc/qa/unit/subsequent_export_test.cxx
b/sc/qa/unit/subsequent_export_test.cxx
index fc894f5d9e9f..76459e765347 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -2217,6 +2217,27 @@ CPPUNIT_TEST_FIXTURE(ScExportTest, testCellBordersXLSX)
testExcelCellBorders("Calc Office Open XML");
}
+CPPUNIT_TEST_FIXTURE(ScExportTest, testTdf155368)
+{
+createScDoc("ods/tdf155368.ods");
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:WrapText", {});
+
+save("Calc Office Open XML");
+
+xmlDocUniquePtr pStyles = parseExport("xl/styles.xml");
+CPPUNIT_ASSERT(pStyles);
+
+assertXPath(pStyles, "/x:styleSheet/x:cellXfs/x:xf[1]/x:alignment",
"wrapText", "false");
+
+// Without the fix in place, this test would have failed with
+// - Expected: false
+// - Actual : true
+assertXPath(pStyles, "/x:styleSheet/x:cellXfs/x:xf[2]/x:alignment",
"wrapText", "false");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/filter/inc/condformatbuffer.hxx |3 +--
sc/source/filter/oox/condformatbuffer.cxx |2 +-
sc/source/filter/oox/condformatcontext.cxx |5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d695f76f23bbdf072fffa48b3a49604287109d47
Author: Henry Castro
AuthorDate: Fri Apr 14 14:26:32 2023 -0400
Commit: Henry Castro
CommitDate: Mon May 22 15:53:46 2023 +0200
sc: filter: oxx: insert more rules same range
If there are rules with the same range to preserve
priority order.
"GO"
NOT(ISERROR(SEARCH("R",E11)))
NOT(ISERROR(SEARCH("R",E11)))
Signed-off-by: Henry Castro
Change-Id: Ibb98953f0a50140dbde4d52a79fde968095881d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150436
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151980
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index 81961151beb8..9d3cc83fc953 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -168,7 +168,6 @@ public:
/** Returns the priority of this rule. */
sal_Int32getPriority() const { return maModel.mnPriority; }
-ColorScaleRule* getCurColorScale() const { return mpColor.get(); }
ColorScaleRule* getColorScale();
DataBarRule*getDataBar();
@@ -312,7 +311,7 @@ public:
static sal_Int32convertToApiOperator( sal_Int32 nToken );
static ScConditionMode convertToInternalOperator( sal_Int32 nToken );
voidfinalizeImport();
-boolinsertColorScale(CondFormatRef const & xCondFmt,
CondFormatRuleRef const & xRule);
+boolinsertRule(CondFormatRef const & xCondFmt,
CondFormatRuleRef const & xRule);
private:
CondFormatRef createCondFormat();
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 4b5ad187daa6..1d5e55fdbc1b 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1208,7 +1208,7 @@ void CondFormatBuffer::updateImport(const
ScDataBarFormatData* pTarget)
}
}
-bool CondFormatBuffer::insertColorScale(CondFormatRef const & xCondFmt,
CondFormatRuleRef const & xRule)
+bool CondFormatBuffer::insertRule(CondFormatRef const & xCondFmt,
CondFormatRuleRef const & xRule)
{
CondFormatRef xFoundFmt;
ScRangeList aRanges = xCondFmt->getRanges();
diff --git a/sc/source/filter/oox/condformatcontext.cxx
b/sc/source/filter/oox/condformatcontext.cxx
index a28b7b12453d..5da1f721ffc6 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -205,8 +205,9 @@ void CondFormatContext::onEndElement()
case XLS_TOKEN( cfRule ):
if (mxCondFmt && mxRule)
{
-if (!mxRule->getCurColorScale() ||
-!getCondFormats().insertColorScale(mxCondFmt, mxRule))
+ScRangeList aRanges = mxCondFmt->getRanges();
+if ((aRanges.size() == 1 && aRanges.GetCellCount() == 1) ||
+!getCondFormats().insertRule(mxCondFmt, mxRule))
mxCondFmt->insertRule(mxRule);
}
break;
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/data/floattable-object-formatter.docx |binary
sw/qa/core/layout/flycnt.cxx| 25
sw/source/core/layout/fly.cxx | 22 +-
3 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit b47401e12d9c45386899df0aa26653bd26c9abd4
Author: Miklos Vajna
AuthorDate: Mon May 22 15:07:16 2023 +0200
Commit: Miklos Vajna
CommitDate: Mon May 22 17:11:35 2023 +0200
sw floattable: fix assert fail when object formatter gets the wrong anchor
A subset of the tdf#155002 bugdoc hit an assertion failure in
SwObjectFormatterTextFrame::DoFormatObj() for multi-page floating
tables.
What happens is that a section frame wants to format its content, calls
CalcContent(), which assumes that the text frame's all draw objects are
also on the same page, as long as they are at-para anchored. This is
true for at-para anchored images, but not for split flys.
Fix the problem by using FindAnchorCharFrame() to know if the anchored
object should be inside the master anchor or a follow anchor: that
allows invoking SwObjectFormatter::FormatObj() with the correct anchor
and page frames, so we don't hit the assertion failure.
The hang with the original tdf#155002 bugdoc needs more work, still.
Change-Id: I2b4d88ccb2ff251c0b0811c31d2aa85053143443
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152116
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/layout/data/floattable-object-formatter.docx
b/sw/qa/core/layout/data/floattable-object-formatter.docx
new file mode 100644
index ..2582af0eb863
Binary files /dev/null and
b/sw/qa/core/layout/data/floattable-object-formatter.docx differ
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 8896b2813a8f..f849fa330ac4 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -885,6 +885,31 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTabJoinLegacy)
CPPUNIT_ASSERT(pPage3);
CPPUNIT_ASSERT(!pPage3->GetSortedObjs());
}
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyObjectFormatter)
+{
+// Given a document with 3 pages and 2 tables: table on first and second
page, 3rd page has no
+// table:
+createSwDoc("floattable-object-formatter.docx");
+
+// When calculating the layout:
+calcLayout();
+
+// Then make sure we don't crash and also that all pages have the expected
amount of fly frames:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage2 = dynamic_cast(pPage1->GetNext());
+CPPUNIT_ASSERT(pPage2);
+const SwSortedObjs& rPage2Objs = *pPage2->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage2Objs.size());
+auto pPage3 = dynamic_cast(pPage2->GetNext());
+CPPUNIT_ASSERT(pPage3);
+CPPUNIT_ASSERT(!pPage3->GetSortedObjs());
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 1d0bd35e1c40..253e858ea210 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1680,7 +1680,27 @@ void CalcContent( SwLayoutFrame *pLay, bool bNoColl )
// anchored objects.
//pAnchoredObj->InvalidateObjPos();
SwRect aRect( pAnchoredObj->GetObjRect() );
-if ( !SwObjectFormatter::FormatObj( *pAnchoredObj,
pFrame, pPageFrame ) )
+
+SwFrame* pAnchorFrame = pFrame;
+SwPageFrame* pAnchorPageFrame = pPageFrame;
+if (SwFlyFrame* pFlyFrame =
pAnchoredObj->DynCastFlyFrame())
+{
+if (pFlyFrame->IsFlySplitAllowed())
+{
+// Split flys are at-para anchored, but the
follow fly's anchor char
+// frame is not the master frame but can be
also a follow of pFrame.
+SwTextFrame* pAnchorCharFrame =
pFlyFrame->FindAnchorCharFrame();
+if (pAnchorCharFrame)
+{
+// Found an anchor char frame, update the
anchor frame and the
+// anchor page frame accordingly.
+pAnchorFrame = pAnchorCharFrame;
+pAnchorPageFrame =
pAnchorCharFrame->FindPageFrame();
+}
+}
+}
+
+if (
[Libreoffice-commits] core.git: schema/libreoffice sc/qa
sc/qa/unit/scshapetest.cxx |8 ---
sc/qa/unit/uicalc/uicalc.cxx|4 ---
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 13
3 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 1d2830b936d02ed0882d9cc1234ddafb3bb7e8dd
Author: Regina Henschel
AuthorDate: Mon May 22 15:57:38 2023 +0200
Commit: Regina Henschel
CommitDate: Mon May 22 19:40:45 2023 +0200
tdf#155271 add drawooo:display to libreoffice-schema
Commit 33ef17ed had introduced attribute drawooo:display at 2010-03-02.
The entry in libreoffice-schema.rng was missing and therefore
validation in unit tests fails, when this attribute occures.
The attribute is written in case an object in Calc is hidden by hiding
the cell to which it is anchored, for example. The attribute belongs to
properties 'Visibile' and 'Printable' in 'Shape Service' in API.
Change-Id: Id3d2e7984aed146fca9e2819eb183d7d7bfaf701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152119
Reviewed-by: Michael Stahl
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index b658e44f03d5..b5083544f114 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -890,10 +890,6 @@ CPPUNIT_TEST_FIXTURE(ScShapeTest, testTdf115655_HideDetail)
pViewShell->GetViewData().GetDispatcher().Execute(SID_OUTLINE_HIDE);
CPPUNIT_ASSERT_MESSAGE("Collapse: Image should not be visible",
!pObj->IsVisible());
-// FIXME: validation fails with
-// Error: unexpected attribute "drawooo:display"
-skipValidation();
-
// Save and reload
saveAndReload("calc8");
@@ -1191,10 +1187,6 @@ CPPUNIT_TEST_FIXTURE(ScShapeTest,
testTdf154821_shape_in_group)
pViewShell->GetViewData().SetCurY(1);
pViewShell->GetViewData().GetDispatcher().Execute(SID_OUTLINE_HIDE);
-// Save and reload
-// FIXME: validation fails with
-// Error: unexpected attribute "drawooo:display"
-skipValidation();
saveAndReload("calc8");
// Expand the lower group
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index fae0b389584e..daccc08c2600 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -904,10 +904,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf144244)
CPPUNIT_ASSERT_EQUAL(OUString("x"), pDoc->GetString(ScAddress(0, 0, 0)));
-// FIXME: validation fails with
-// Error: unexpected attribute "drawooo:display"
-skipValidation();
-
// Without the fix in place, this test would have crashed
saveAndReload("calc8");
pModelObj = comphelper::getFromUnoTunnel(mxComponent);
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 0436448644bb..2466b797933c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3620,4 +3620,17 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
+
+
+
+
+
+ always
+ screen
+ printer
+ none
+
+
+
+
[Libreoffice-commits] core.git: wizards/source
wizards/source/sfdialogs/SF_Dialog.xba |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fba847a7fc515b271b60c1a3fe54254cc4424423 Author: Andrea Gelmini AuthorDate: Mon May 22 17:49:14 2023 +0200 Commit: Julien Nabet CommitDate: Mon May 22 20:44:05 2023 +0200 Fix typo Change-Id: I6fab6b5c40eb9668df72ea01a2d158eabdc99f86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152121 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/wizards/source/sfdialogs/SF_Dialog.xba b/wizards/source/sfdialogs/SF_Dialog.xba index 4979fa82a681..9eb72d1a2d94 100644 --- a/wizards/source/sfdialogs/SF_Dialog.xba +++ b/wizards/source/sfdialogs/SF_Dialog.xba @@ -14,7 +14,7 @@ Option Explicit ' ''' SF_Dialog ''' = -''' Management of dialogs. They may bedefined with the Basic IDE or built from scratch +''' Management of dialogs. They may be defined with the Basic IDE or built from scratch ''' Each instance of the current class represents a single dialog box displayed to the user ''' ''' A dialog box can be displayed in modal or in non-modal modes @@ -2971,4 +2971,4 @@ Private Function _Repr() As String End Function ' SFDialogs.SF_Dialog._Repr REM END OF SFDIALOGS.SF_DIALOG - \ No newline at end of file +
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/python/scriptforge.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60489faa6c4dff83abcf63d615a16c71a412b856 Author: Andrea Gelmini AuthorDate: Mon May 22 17:50:03 2023 +0200 Commit: Julien Nabet CommitDate: Mon May 22 20:45:22 2023 +0200 Fix typo Change-Id: Ic3f79113f09be10f6ff33183b09f80e269f77f93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152122 Reviewed-by: Jean-Pierre Ledure Tested-by: Julien Nabet diff --git a/wizards/source/scriptforge/python/scriptforge.py b/wizards/source/scriptforge/python/scriptforge.py index 8b3a67fe2f60..66d69238a16c 100644 --- a/wizards/source/scriptforge/python/scriptforge.py +++ b/wizards/source/scriptforge/python/scriptforge.py @@ -1993,7 +1993,7 @@ class SFDialogs: class SF_NewDialog(SFServices): """ Pseudo service never returned from the Basic world. A SF_Dialog instance is returned instead. -Main purpose: manage the arguments of CreateScritService() for the creation of a dialog from scratch +Main purpose: manage the arguments of CreateScriptService() for the creation of a dialog from scratch """ # Mandatory class properties for service registration serviceimplementation = 'basic'
[Libreoffice-commits] help.git: source/text
source/text/scalc/guide/multi_tables.xhp | 53 --- source/text/scalc/guide/multitables.xhp | 44 ++--- 2 files changed, 47 insertions(+), 50 deletions(-) New commits: commit f412e2dadeeba74aa71293d010d9a6d092d38e64 Author: Olivier Hallot AuthorDate: Mon May 22 12:08:54 2023 -0300 Commit: Olivier Hallot CommitDate: Mon May 22 21:26:08 2023 +0200 tdf#140091 Precisions for the (+) button in sheet tabs bar. Change-Id: I6c125b5fa230690f598399b68e1f310f4cbc25d5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152129 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/guide/multi_tables.xhp b/source/text/scalc/guide/multi_tables.xhp index 8639535346..7c00793ef5 100644 --- a/source/text/scalc/guide/multi_tables.xhp +++ b/source/text/scalc/guide/multi_tables.xhp @@ -1,7 +1,4 @@ - - - - - - + -Navigating Through Sheets Tabs +Navigating Through Sheets Tabs /text/scalc/guide/multi_tables.xhp - - - -sheets; showing multiple + + +sheets; showing multiple sheet tabs;using views;multiple sheets +sheet navigation bar +sheets; jump to - Navigating Through Sheet Tabs - - By default $[officename] displays three sheets "Sheet1" to "Sheet3", in each new spreadsheet. You can switch between sheets in a spreadsheet using the sheet tabs at the bottom of the screen. - -Sheet Tabs - + Navigating Through Sheet Tabs +By default %PRODUCTNAME displays one sheet "Sheet1" in each new spreadsheet document. You can add sheets using the (+) button at the bottom of the screen and switch between sheets in a spreadsheet using the sheet tabs. +If the sheet tabs are not visible, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - View - Sheet tabs to display them at the bottom of the screen. + +Sheet Tabs - - - -Icon + +Sheet navigation buttons - Use the navigation buttons to display all the sheets belonging to your document. Clicking the button on the far left or the far right displays, respectively, the first or last sheet tab. The middle buttons allow the user to scroll forward and backward through all sheet tabs. To display the sheet itself click on the sheet tab. + The navigation buttons are enabled when the number of sheets in the document is greater that the number of sheets displayed in the sheet navigation bar. + Use the navigation buttons to display all the sheets belonging to your document. Clicking the button on the far left or the far right displays, respectively, the first or last sheet tab. The middle buttons allow the user to scroll forward and backward through all sheet tabs. To display the sheet itself click on the sheet tab. + + + + + Icon New Sheet + + + +Left click: Adds a new empty sheet to the right of the current sheet. +Right click: Opens a sub menu with all sheets not marked hidden. Click on a sheet name to jump to it. Hidden sheets are not listed in the sub menu. + + + - - diff --git a/source/text/scalc/guide/multitables.xhp b/source/text/scalc/guide/multitables.xhp index 326194ce9a..4bc09eccee 100644 --- a/source/text/scalc/guide/multitables.xhp +++ b/source/text/scalc/guide/multitables.xhp @@ -22,12 +22,12 @@ - Applying Multiple Sheets + Applying Multiple Sheets /text/scalc/guide/multitables.xhp -sheets; inserting +sheets; inserting inserting; sheets sheets; selecting multiple appending sheets @@ -35,39 +35,31 @@ multiple sheets calculating;multiple sheets MW moved "sheets;simultaneous.." to edit_multitables.xhp, transferred 2 entries from there and added "calculating;" -Applying Multiple Sheets - +Applying Multiple Sheets Inserting a Sheet - - -Choose Insert - Sheet to insert a new sheet or an existing sheet from another file. - - + Choose Insert - Sheet to insert a new sheet or an existing sheet from another file. -Sheet Events -Opens a dialog box where you can assign macros to sheet events. +Sheet Events +Opens a dialog box where you can assign macros to sheet events. -Tab Color - -Opens a window where you can assign a color to the sheet tab. +Tab Color + +Opens a window where you can assign a color to the sheet tab. - -Click to select all sheets in the document. - -Click to deselect all sheets in the document, except the current sheet. + +Click to select all sheets in the document. + +Click to deselect all sheets in the document, except the current sheet. Selecting Multiple Sheets - The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selecte
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46a238dcf262a48c9c92f20cab30bf6590868f12 Author: Olivier Hallot AuthorDate: Mon May 22 16:26:08 2023 -0300 Commit: Gerrit Code Review CommitDate: Mon May 22 21:26:08 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to f412e2dadeeba74aa71293d010d9a6d092d38e64 - tdf#140091 Precisions for the (+) button in sheet tabs bar. Change-Id: I6c125b5fa230690f598399b68e1f310f4cbc25d5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152129 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8322f7d3b512..f412e2dadeeb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8322f7d3b512cbd1a548a1b37d07d5614e3bb3c6 +Subproject commit f412e2dadeeba74aa71293d010d9a6d092d38e64
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk |4 ++ source/text/scalc/00/sheet_menu.xhp | 26 +++-- source/text/scalc/01/0217.xhp| 22 +-- source/text/scalc/01/0218.xhp|7 ++- source/text/scalc/01/0221.xhp| 16 +++- source/text/scalc/01/0405.xhp| 61 --- source/text/scalc/01/05050100.xhp| 33 source/text/scalc/01/05050300.xhp| 30 +-- source/text/scalc/01/06060100.xhp|4 +- source/text/scalc/01/duplicate_sheet.xhp | 34 + source/text/scalc/01/hide_sheet.xhp | 37 ++ source/text/scalc/01/sheet_tab_color.xhp | 31 +++ source/text/scalc/guide/multitables.xhp | 19 +++-- source/text/scalc/main0103.xhp |3 + source/text/scalc/main0116.xhp |6 +-- source/text/shared/01/0209.xhp |2 - 16 files changed, 223 insertions(+), 112 deletions(-) New commits: commit 033dc1a727a6cb48419a08990a2b737058afd99f Author: Olivier Hallot AuthorDate: Mon May 22 16:24:23 2023 -0300 Commit: Olivier Hallot CommitDate: Mon May 22 21:28:30 2023 +0200 Calc Sheet Tab Navigator help page Change-Id: Ie79a7e1b6e3383d52660e48d145bec5ca7ca89af Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152130 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 0019a72dce..87956ac0c1 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -192,6 +192,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/data_provider \ helpcontent2/source/text/scalc/01/databar_more_options \ helpcontent2/source/text/scalc/01/default_number_formats \ +helpcontent2/source/text/scalc/01/duplicate_sheet \ helpcontent2/source/text/scalc/01/ex_data_stat_func \ helpcontent2/source/text/scalc/01/format_graphic \ helpcontent2/source/text/scalc/01/formula2value \ @@ -283,9 +284,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_workday \ helpcontent2/source/text/scalc/01/func_year \ helpcontent2/source/text/scalc/01/func_yearfrac \ +helpcontent2/source/text/scalc/01/hide_sheet \ helpcontent2/source/text/scalc/01/live_data_stream \ helpcontent2/source/text/scalc/01/recalculate_hard \ helpcontent2/source/text/scalc/01/shared_spreadsheet \ +helpcontent2/source/text/scalc/01/sheet_tab_color \ helpcontent2/source/text/scalc/01/solver \ helpcontent2/source/text/scalc/01/solver_options \ helpcontent2/source/text/scalc/01/solver_options_algo \ @@ -423,6 +426,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/guide/webquery \ helpcontent2/source/text/scalc/guide/wildcards \ helpcontent2/source/text/scalc/guide/year2000 \ +helpcontent2/source/text/scalc/menu/sheet_tab_menu \ helpcontent2/source/text/scalc/main \ helpcontent2/source/text/scalc/main0100 \ helpcontent2/source/text/scalc/main0101 \ diff --git a/source/text/scalc/00/sheet_menu.xhp b/source/text/scalc/00/sheet_menu.xhp index 875b1b2c6b..6541dcec90 100644 --- a/source/text/scalc/00/sheet_menu.xhp +++ b/source/text/scalc/00/sheet_menu.xhp @@ -20,22 +20,26 @@ -Sheet Menu +Sheet Menu /text/scalc/00/sheet_menu.xhp Sheet Menu -Choose Sheet - Insert Rows - Rows Above. -Choose Sheet - Insert Rows - Rows Below. -Choose Sheet - Insert Columns - Columns Before. -Choose Sheet - Insert Columns - Columns After. -Choose Sheet - Insert Page Break. -Choose Sheet - Insert Page Break - Row Break. -Choose Sheet - Insert Page Break - Column Break. -Choose Sheet - Delete Page Break. -Choose Sheet - Delete Page Break - Row Break. -Choose Sheet - Delete Page Break - Column Break. +Choose Sheet - Duplicate Sheet. +Choose Sheet - Sheet Tab Color. +Choose Sheet - Hide Sheet. +Choose Sheet - Show Sheet. +Choose Sheet - Insert Rows - Rows Above. +Choose Sheet - Insert Rows - Rows Below. +Choose Sheet - Insert Columns - Columns Before. +Choose Sheet - Insert Columns - Columns After. +Choose Sheet - Insert Page Break. +Choose Sheet - Insert Page Break - Row Break. +Choose Sheet - Insert Page Break - Column Break. +Choose Sheet - Delete Page Break. +Choose Sheet - Delete Page Break - Row Break. +Choose Sheet - Delete Page Break - Column Break. Choose Sheet - Cell Comments - Edit Comment Choose Sheet - Cell Comments - Hide Comment diff --git a/source/text/scalc/01/0217.xhp b/source/text/scalc/01/0217.xhp index 77c0fbacf2..229c85636d 100644 --- a/source/text/scalc/01/0217.xhp +++ b/source/text/scalc/01/0217.xhp @@ -1,6 +1,4 @@ - - - -Delete Sheet +Delete Sheet /text/scalc/01/0217.xhp @@ -30,21 +27,22 @@ -spreadsheets; deleting +spreadshee
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c244e0a3017ede5e913420f6d57b51ce2d61dd4e Author: Olivier Hallot AuthorDate: Mon May 22 16:28:30 2023 -0300 Commit: Gerrit Code Review CommitDate: Mon May 22 21:28:30 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 033dc1a727a6cb48419a08990a2b737058afd99f - Calc Sheet Tab Navigator help page Change-Id: Ie79a7e1b6e3383d52660e48d145bec5ca7ca89af Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152130 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f412e2dadeeb..033dc1a727a6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f412e2dadeeba74aa71293d010d9a6d092d38e64 +Subproject commit 033dc1a727a6cb48419a08990a2b737058afd99f
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sfx2/source
sfx2/source/doc/iframe.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 43ed66f2c964e2a1de1c6f8e61318cb11abac6e8
Author: Caolán McNamara
AuthorDate: Tue Apr 11 10:13:37 2023 +0100
Commit: Andras Timar
CommitDate: Mon May 22 21:43:45 2023 +0200
set Referer on loading IFrames
so tools, options, security, options,
"block any links from document not..."
applies to their contents.
Change-Id: I04839aea6b07a4a76ac147a85045939ccd9c3c79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150221
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150751
Reviewed-by: Stephan Bergmann
(cherry picked from commit acff9ca0579333b45d10ae5f8cd48172f563)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152088
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 80e0c4e68457..050d5c3f9e0f 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -165,14 +166,19 @@ sal_Bool SAL_CALL IFrameObject::load(
uno::Reference < util::XURLTransformer > xTrans(
util::URLTransformer::create( mxContext ) );
xTrans->parseStrict( aTargetURL );
+uno::Reference xParentFrame =
xFrame->getCreator();
+SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
+
if (INetURLObject(aTargetURL.Complete).GetProtocol() ==
INetProtocol::Macro)
{
-uno::Reference xParentFrame =
xFrame->getCreator();
-SfxObjectShell* pDoc =
SfxMacroLoader::GetObjectShell(xParentFrame);
if (pDoc && !pDoc->AdjustMacroMode())
return false;
}
+OUString sReferer;
+if (pDoc && pDoc->HasName())
+sReferer = pDoc->GetMedium()->GetName();
+
DBG_ASSERT( !mxFrame.is(), "Frame already existing!" );
VclPtr pParent = VCLUnoHelper::GetWindow(
xFrame->getContainerWindow() );
VclPtr pWin = VclPtr::Create(
pParent, maFrmDescr.IsFrameBorderOn() );
@@ -197,7 +203,8 @@ sal_Bool SAL_CALL IFrameObject::load(
uno::Sequence < beans::PropertyValue > aProps{
comphelper::makePropertyValue("PluginMode", sal_Int16(2)),
-comphelper::makePropertyValue("ReadOnly", true)
+comphelper::makePropertyValue("ReadOnly", true),
+comphelper::makePropertyValue("Referer", sReferer)
};
uno::Reference < frame::XDispatch > xDisp = mxFrame->queryDispatch(
aTargetURL, "_self", 0 );
if ( xDisp.is() )
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - embeddedobj/source include/svx sc/source sfx2/source svx/source sw/inc sw/source xmloff/source
embeddedobj/source/commonembedding/embedobj.cxx | 60 +- embeddedobj/source/commonembedding/specialobject.cxx |9 + embeddedobj/source/inc/commonembobj.hxx |3 embeddedobj/source/inc/specialobject.hxx |6 + include/svx/svdoole2.hxx | 17 ++- include/svx/unoshape.hxx |2 sc/source/ui/docshell/documentlinkmgr.cxx|9 + sfx2/source/doc/iframe.cxx | 55 ++ svx/source/svdraw/svdoole2.cxx | 104 +++ svx/source/unodraw/shapeimpl.hxx |5 svx/source/unodraw/unoshap4.cxx | 23 +++- sw/inc/ndole.hxx |4 sw/source/core/ole/ndole.cxx | 89 ++-- xmloff/source/draw/ximpshap.cxx | 29 - xmloff/source/draw/ximpshap.hxx |2 15 files changed, 331 insertions(+), 86 deletions(-) New commits: commit b4cedeb0dfd71aa7d9a00269b51273ac8d3e294a Author: Caolán McNamara AuthorDate: Thu Apr 13 11:31:17 2023 +0100 Commit: Andras Timar CommitDate: Mon May 22 21:44:03 2023 +0200 put floating frames under managed links control like we do for sections and ole objects that link to their content individual commits in trunk are: extract a OCommonEmbeddedObject::SetInplaceActiveState for reuse no behaviour change intended Change-Id: Ia1d12aa5c9afdc1347f6d4364bc6a0b7f41ee168 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150341 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit 183e34a3f8c429c0698951e24c17844e416a3825) use parent window as dialog parent it makes no odds, but is more convenient for upcoming modification Change-Id: Ibc5333b137d2da089b3b701ff615c6ddf43063d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150342 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit f93edf343658abd489bde3639d2ffaefd50c0f99) adjust IFrameObject so it could reuse mxFrame for a reload of content Change-Id: I7eec3132a23faafd9a2878215a0a117a67bc9bf2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150343 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit 3a727d26fd9eb6fa140bc3f5cadf3db079d42206) query getUserAllowsLinkUpdate for the case of content in a floating frame similarly to how it works for the more common "normal" embedded objects Change-Id: I83e38dfa2f84907c2de9680e91f779d34864a9ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149971 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 52aa46468531918eabfa2031dedf50377ae72cf7) add a route to get writer Floating Frame links under 'manage links' Change-Id: If90ff71d6a96342574799312f764badaf97980eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150349 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 8b8a2844addbd262befb1a2d193dfb590dfa20be) allow SvxOle2Shape::resetModifiedState to survive having no SdrObject Change-Id: Iea059262c124e3f44249e49b4189732310d28156 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150538 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 02379929bd0e1d1676635f0ca1920422702ebb7c) create the FloatingFrameShape in a separate step to inserting it this is derived from the path taken by the AddShape(const OUString&) function for this case. No change in behavior is intended. Change-Id: Id09ae0c65a55a37743ad7c184070fb8dd97d8a7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150526 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit bafec47847a0b9697b3bbe9358e53f8118af3024) add a route to get calc Floating Frame links under 'manage links' much harder than writer because the organization and ordering of properties and object activation etc is different. This ended up ugly, but functions. We set FrameURL before AddShape, we have to do it again later because it gets cleared when the SdrOle2Obj is attached to the XShape. But we want FrameURL to exist when AddShape triggers SetPersistName which itself triggers SdrOle2Obj::CheckFileLink_Impl and at that point we want to know what URL will end up being used. So bodge this by setting FrameURL to the temp pre-SdrOle2Obj attached properties and we can smuggle it eventually into SdrOle2Obj::SetPersistName at the right point after PersistName is set but before SdrOle2Obj::CheckFileLink_Impl is called in order to inform the link manager that this is an I
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/indexentry.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 098e9426ad0b66b3da873a519c10047cb3955b0f Author: Seth Chaiklin AuthorDate: Mon May 1 00:53:56 2023 +0200 Commit: Seth Chaiklin CommitDate: Mon May 22 22:52:06 2023 +0200 tdf#154186 change "OK" to "Apply" and rearrange button position Some buttons are sorted automatically. As a result, the "close" button appears in the desired position, after the label change. Change-Id: I67ce06825a642fa34086f97a99cde8ac2acb1ff6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151195 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 5a70ad727db6..916e2a3b865a 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -60,6 +60,7 @@ True True True +Close dialog without saving non-applied changes. True @@ -104,7 +105,7 @@ -_OK +_Apply True True True
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/swriter.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 23a41c919602828acb88a477f3f073154d9388ec Author: Seth Chaiklin AuthorDate: Thu May 4 09:55:53 2023 +0200 Commit: Seth Chaiklin CommitDate: Mon May 22 22:53:01 2023 +0200 tdf#155065 hide .uno:PageOffsetDialog from Customize dialog Change-Id: Iad95d757ed09921403f41ed3c757b34149ec8c47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151285 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Seth Chaiklin diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index b765d861e34a..dda1dc187f55 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5011,9 +5011,9 @@ SfxUInt16Item PageOffsetDialog FN_CHANGE_PAGENUM RecordPerSet; Asynchron; -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = SfxGroupId::Options; ]
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 ++ 1 file changed, 6 insertions(+) New commits: commit 343fbe76d5122aed28c3ec6e72ff8629a4f95f1d Author: Seth Chaiklin AuthorDate: Wed May 3 16:29:55 2023 +0200 Commit: Seth Chaiklin CommitDate: Mon May 22 22:54:47 2023 +0200 tdf#155065 change label for "Page Number" -> "Page Number Field" Change-Id: I80b646857311e9fa910f3384e49ea965a1a7fb7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151284 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 617901255c4b..27c029f254a1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1080,8 +1080,14 @@ + ~Page Number Field + + ~Page Number + + Insert Page Number + 1
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/04120221.xhp | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) New commits: commit ed9181c7a7b65f1de07c809b5ac515e4dfc73b7b Author: Seth Chaiklin AuthorDate: Mon May 22 23:15:16 2023 +0200 Commit: Seth Chaiklin CommitDate: Mon May 22 23:48:47 2023 +0200 tdf#153561 add to hyperlink, update hyperlink description remove from bookmarks Change-Id: Ia29f026c9e40a58633c4428066ba9c8269cfe88c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152098 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/01/04120221.xhp b/source/text/swriter/01/04120221.xhp index 1e28df7172..03d70b5675 100644 --- a/source/text/swriter/01/04120221.xhp +++ b/source/text/swriter/01/04120221.xhp @@ -20,7 +20,7 @@ -Entries (table of contents) +Entries (table of contents) /text/swriter/01/04120221.xhp @@ -44,7 +44,7 @@ Structure and formatting The Structure line defines how the entries in the index are composed. To change the appearance of an entry you can enter codes or text in the empty boxes on this line. You can also click in an empty box or on a code, and then click a code button.this line also appears for bibliographic index - + Displays the remainder of the Structure line.UFI: see #i27934# @@ -62,67 +62,68 @@ - + Numbering (N#) Inserts the heading number or list number of the entry. To enable heading numbering, choose Tools - Heading Numbering. - + Entry text (E) Inserts the text of the selected entry. - + Tab stop (T) Inserts a tab stop. To add leader dots to the tab stop, select a character in the Fill character box. To change the position of the tab stop, enter a value in the Tab stop position box, or select the Align right check box. - + Page number (#) Inserts the page number of the entry. - - + + Hyperlink (LS and LE) -Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the Structure line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents. - +Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the Structure line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. + + All Applies the current settings to all levels without closing the dialog. - + Character Style Specify a character style for the selected icon in the Structure. - + Edit Opens a dialog where you can edit the selected character style. - + The next three options are available when the T icon is selected. Fill character Select the tab leader that you want use. - + Tab stop position Enter the distance to leave between the left page margin and the tab stop. - + Align right Aligns the tab stop to the right page margin. The next two options are available when the N# icon is selected. - + Format Only visible when you click the N# button in the Structure line. Select to show the heading number with or without separator. @@ -131,7 +132,7 @@ Format - + Tab position relative to Paragraph Style indent Positions the tab stop relative to the "indent from left" value defined in the paragraph style selected on the Styles tab. Otherwise the tab stop is positioned relative to the left text margin.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6df5db55a78281e5a92441e6d125eb7f1d340800 Author: Seth Chaiklin AuthorDate: Mon May 22 23:48:48 2023 +0200 Commit: Gerrit Code Review CommitDate: Mon May 22 23:48:48 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ed9181c7a7b65f1de07c809b5ac515e4dfc73b7b - tdf#153561 add to hyperlink, update hyperlink description remove from bookmarks Change-Id: Ia29f026c9e40a58633c4428066ba9c8269cfe88c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152098 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 033dc1a727a6..ed9181c7a7b6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 033dc1a727a6cb48419a08990a2b737058afd99f +Subproject commit ed9181c7a7b65f1de07c809b5ac515e4dfc73b7b
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4864bc29dade0c3eedd3192476e7c206dc4eedff
Author: Henry Castro
AuthorDate: Fri May 19 15:22:59 2023 -0400
Commit: Henry Castro
CommitDate: Mon May 22 23:49:48 2023 +0200
lok: sc: disable Value Highlighting
If the document is saved with the option:
View - Value Highlighting
The online client side does not have implemented yet, otherwise
will not paint the cell background.
Signed-off-by: Henry Castro
Change-Id: I05b1a2ef63602a7bf34f717b87c304d00a8c8efc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152019
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152135
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 29161ac7e01b..8970606face0 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3944,7 +3944,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
if ( rSetting.Value >>= nTemp16 )
maOptions.SetObjMode(VOBJ_TYPE_DRAW, (nTemp16 == 1) ?
VOBJ_MODE_HIDE : VOBJ_MODE_SHOW);
}
-else if ( sName == SC_UNO_VALUEHIGH )
+else if ( sName == SC_UNO_VALUEHIGH &&
!comphelper::LibreOfficeKit::isActive() )
maOptions.SetOption(VOPT_SYNTAX,
ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value));
else
{
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/04120222.xhp | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit 6d37d30f9474ae437544ce04cfdcbc4ba4119303 Author: Seth Chaiklin AuthorDate: Tue May 23 00:16:45 2023 +0200 Commit: Seth Chaiklin CommitDate: Tue May 23 00:24:52 2023 +0200 tdf#153561 add for heading info section remove from bookmarks Change-Id: I75d1e5b2882816a66fc9859a881ae34381c969dd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152100 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/01/04120222.xhp b/source/text/swriter/01/04120222.xhp index eb1cc350f4..9fdb9ca0cb 100644 --- a/source/text/swriter/01/04120222.xhp +++ b/source/text/swriter/01/04120222.xhp @@ -37,7 +37,7 @@ - + Heading info (HI) Inserts heading information such as heading number or heading contents. Click on the HI icon to select what information to display. @@ -45,23 +45,24 @@ - +The next two options are available when the HI icon is selected. + Heading info Select the heading information to include in the index entry. - + Show up to level Enter the maximum number of levels to show of the heading number. For example, select “3” to show up to three levels. If the heading number has fewer than three levels, then the actual number is shown. - + Character Style for main entries Specify the formatting style for the main entries in the alphabetical index. To convert an index entry into a main entry, click in front of the index field in the document and then choose Edit - Index Entry. - + Alphabetical delimiter Uses the initial letters of the alphabetically arranged index entries as section headings. - + Key separated by commas Arranges the index entries on the same line, separated by commas.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1497d5c8dd97df0559cf718b5a78678aa5788eb1 Author: Seth Chaiklin AuthorDate: Tue May 23 00:24:52 2023 +0200 Commit: Gerrit Code Review CommitDate: Tue May 23 00:24:52 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6d37d30f9474ae437544ce04cfdcbc4ba4119303 - tdf#153561 add for heading info section remove from bookmarks Change-Id: I75d1e5b2882816a66fc9859a881ae34381c969dd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152100 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index ed9181c7a7b6..6d37d30f9474 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ed9181c7a7b65f1de07c809b5ac515e4dfc73b7b +Subproject commit 6d37d30f9474ae437544ce04cfdcbc4ba4119303
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/drawsh.sdi |1 +
sc/sdi/drtxtob.sdi|1 +
sc/source/ui/drawfunc/drawsh.cxx | 10 --
sc/source/ui/drawfunc/drtxtob.cxx | 13 -
4 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 0a74b5fcfbfa68ad1cab228d74f08e8c35bc6820
Author: Maxim Monastirsky
AuthorDate: Fri Apr 28 11:48:25 2023 +0300
Commit: Maxim Monastirsky
CommitDate: Tue May 23 00:43:06 2023 +0200
sc drawstyles: Enable the clear DF command
.uno:StandardTextAttributes works for shape formatting already
(despite its name), but it's a different command than Format >
Clear DF. So let's connect the regular Clear DF command to the
same code.
Also includes a workaround for comments to maintain their size.
Changing the size (because of the "Fit height to text" setting)
is probably confusing for other shapes as well, but for comments
this requires an extra step to undo, as comments can't be resized
unless they're shown permanently. And manually resizing each
comment back will also result with inconsistency in their size.
Change-Id: I7c158523ecc4be18d17479632eaf9fd2a51dca12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151161
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 13f1d6b150df..668608c549ab 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -37,6 +37,7 @@ interface TableDraw
SID_DRAW_CHART [ StateMethod = StateDisableItems; ]
SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; ]
+SID_CELL_FORMAT_RESET [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; ]
SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; ]
// Slot-IDs for Objectbar:
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 4670d216fba2..a4df9af69108 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -47,6 +47,7 @@ interface TableDrawText
SID_THESAURUS [ ExecMethod = Execute; StateMethod = GetState; ]
// attribute:
SID_TEXT_STANDARD [ ExecMethod = ExecuteAttr; StateMethod =
GetState; ]
+SID_CELL_FORMAT_RESET [ ExecMethod = ExecuteAttr; StateMethod =
GetState; ]
SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecuteAttr; StateMethod =
GetState; ]
SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod =
GetAttrState; ]
SID_ATTR_CHAR_FONTHEIGHT[ ExecMethod = ExecuteAttr; StateMethod =
GetAttrState; ]
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 291ec3e236bc..52ec9d9d438a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -161,9 +161,15 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
}
break;
-case SID_TEXT_STANDARD: // delete hard text attributes
+case SID_CELL_FORMAT_RESET:
+case SID_TEXT_STANDARD:
{
-SfxItemSetFixed
aEmptyAttr(GetPool());
+SfxItemSetFixed aEmptyAttr(GetPool());
+
+if (ScDrawLayer::IsNoteCaption(pSingleSelectedObj))
+aEmptyAttr.Put(pView->GetAttrFromMarked(true));
+
pView->SetAttributes(aEmptyAttr, true);
}
break;
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index f428465936b3..79f2bd1a588c 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -791,7 +791,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
{
switch ( nSlot )
{
-case SID_TEXT_STANDARD: // delete hard text attributes
+case SID_CELL_FORMAT_RESET:
+case SID_TEXT_STANDARD:
{
OutlinerView* pOutView = pView->IsTextEdit() ?
pView->GetTextEditOutlinerView() : nullptr;
@@ -799,8 +800,18 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
pOutView->Paint( tools::Rectangle() );
SfxItemSetFixed aEmptyAttr(
*aEditAttr.GetPool() );
+SfxItemSetFixed aSizeAttr(*aEditAttr.GetPool());
+
+aSizeAttr.Put(pView->GetAttrFromMarked(true));
pView->SetAttributes( aEmptyAttr, true );
+if (IsNoteEdit())
+{
+pView->SetAttributes(aSizeAttr, false);
+
pView->GetTextEditObject()->AdjustTextFrameWidthAndHeight();
+}
+
if ( pOutView )
{
lcl_RemoveFields( *pOutView );
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/04120223.xhp | 13 + source/text/swriter/01/04120224.xhp | 17 + source/text/swriter/01/04120225.xhp | 17 + source/text/swriter/01/04120226.xhp | 17 + 4 files changed, 36 insertions(+), 28 deletions(-) New commits: commit 26a379d7f2c21de638bbeb1e7d4032896ac326d4 Author: Seth Chaiklin AuthorDate: Mon May 22 23:50:14 2023 +0200 Commit: Seth Chaiklin CommitDate: Tue May 23 00:49:54 2023 +0200 tdf#153561 embed sections: remove Change-Id: Ia8aa894ffc112d7ec16991cbcc44ab963903fc52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152099 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/01/04120223.xhp b/source/text/swriter/01/04120223.xhp index e9b5523f09..da3494e94b 100644 --- a/source/text/swriter/01/04120223.xhp +++ b/source/text/swriter/01/04120223.xhp @@ -20,24 +20,29 @@ -Entries (table of figures) +Entries (table of figures) /text/swriter/01/04120223.xhp -Entries (table of figures) -Specify the format for the Table of Figures index entries. +Entries (table of figures) +Specify the format for the Table of Figures index entries. -Table of Figures has only one index level. +Table of Figures has only one index level. + + + + + diff --git a/source/text/swriter/01/04120224.xhp b/source/text/swriter/01/04120224.xhp index 77e2818a97..024ff388f8 100644 --- a/source/text/swriter/01/04120224.xhp +++ b/source/text/swriter/01/04120224.xhp @@ -1,7 +1,5 @@ - - - + - - -Entries (index of tables) +Entries (index of tables) /text/swriter/01/04120224.xhp Entries (index of tables) -Specify the format for the entries in an Index of Tables. +Specify the format for the entries in an Index of Tables. -An Index of Tables only has one index level. +An Index of Tables only has one index level. + + + + + diff --git a/source/text/swriter/01/04120225.xhp b/source/text/swriter/01/04120225.xhp index ae495bdcca..315d6e5b2e 100644 --- a/source/text/swriter/01/04120225.xhp +++ b/source/text/swriter/01/04120225.xhp @@ -1,7 +1,5 @@ - - - + - - -Entries (user-defined index) +Entries (user-defined index) /text/swriter/01/04120225.xhp Entries (user-defined index) -Specify the format for the entries in a user-defined index. +Specify the format for the entries in a user-defined index. -User-defined indexes do not support sub-keys. +User-defined indexes do not support sub-keys. + + + + + diff --git a/source/text/swriter/01/04120226.xhp b/source/text/swriter/01/04120226.xhp index dd3339d62a..c6ddc21d46 100644 --- a/source/text/swriter/01/04120226.xhp +++ b/source/text/swriter/01/04120226.xhp @@ -1,7 +1,5 @@ - - - + - - -Entries (table of objects) +Entries (table of objects) /text/swriter/01/04120226.xhp Entries (table of objects) -Specify the format for the entries in a Table of Objects. +Specify the format for the entries in a Table of Objects. -A Table of Objects only has one index level. +A Table of Objects only has one index level. + + + + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13c4a7e1700b60e595e86b864d4feeb9cc383961 Author: Seth Chaiklin AuthorDate: Tue May 23 00:49:55 2023 +0200 Commit: Gerrit Code Review CommitDate: Tue May 23 00:49:55 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 26a379d7f2c21de638bbeb1e7d4032896ac326d4 - tdf#153561 embed sections: remove Change-Id: Ia8aa894ffc112d7ec16991cbcc44ab963903fc52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152099 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 6d37d30f9474..26a379d7f2c2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6d37d30f9474ae437544ce04cfdcbc4ba4119303 +Subproject commit 26a379d7f2c21de638bbeb1e7d4032896ac326d4
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/04120227.xhp | 58 1 file changed, 27 insertions(+), 31 deletions(-) New commits: commit 017955e2322d86929802db5ebcbce65889345528 Author: Seth Chaiklin AuthorDate: Tue May 23 00:40:51 2023 +0200 Commit: Seth Chaiklin CommitDate: Tue May 23 00:50:14 2023 +0200 remove xml-lang, formatting clean-up, no i10n consequences Change-Id: I7ce3f3722c6a3f52f89623f39683d0a23daa8f36 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152101 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/01/04120227.xhp b/source/text/swriter/01/04120227.xhp index c534f6b94d..060dbbb62b 100644 --- a/source/text/swriter/01/04120227.xhp +++ b/source/text/swriter/01/04120227.xhp @@ -1,7 +1,5 @@ - - - + - - -Entries (bibliography) +Entries (bibliography) /text/swriter/01/04120227.xhp Entries (bibliography) -Specify the format for bibliography entries. +Specify the format for bibliography entries. Type -The types that are displayed depend on the different literature sources. +The types that are displayed depend on the different literature sources. -Type -Lists the available bibliography entries. To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click Insert. Use the Define Bibliography Entry dialog to add new entries. -Insert -Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button. -Remove -Removes the selected reference code from the Structure line. +Type +Lists the available bibliography entries. To add an entry to the Structure line, click the entry, click in an empty box on the Structure line, and then click Insert. Use the Define Bibliography Entry dialog to add new entries. +Insert +Adds the reference code for the selected bibliography entry to the Structure line. Select an entry in the list, click in an empty box, and then click this button. +Remove +Removes the selected reference code from the Structure line. Sort by -Specify the sorting options for the bibliography entries. -Document position -Sorts the bibliography entries according to the position of their references in the document. Select this option if you want to use automatically numbered references. -Content -Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication. +Specify the sorting options for the bibliography entries. +Document position +Sorts the bibliography entries according to the position of their references in the document. Select this option if you want to use automatically numbered references. +Content +Sorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication. Sort keys - - -1, 2 or 3 -Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area. - - -AZ -Sorts the bibliography entries in ascending alphanumerical order. - - -ZA -Sorts the bibliography entries in a descending alphanumerical order. + + +1, 2 or 3 +Select the entry by which to sort the bibliography entries. This option is only available if you select the Content radio button in the Sort by area. + + +AZ +Sorts the bibliography entries in ascending alphanumerical order. + + +ZA +Sorts the bibliography entries in a descending alphanumerical order.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e3ac3b79cd535e940495d911fcd9305356729369 Author: Seth Chaiklin AuthorDate: Tue May 23 00:50:14 2023 +0200 Commit: Gerrit Code Review CommitDate: Tue May 23 00:50:14 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 017955e2322d86929802db5ebcbce65889345528 - remove xml-lang, formatting clean-up, no i10n consequences Change-Id: I7ce3f3722c6a3f52f89623f39683d0a23daa8f36 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152101 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 26a379d7f2c2..017955e2322d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 26a379d7f2c21de638bbeb1e7d4032896ac326d4 +Subproject commit 017955e2322d86929802db5ebcbce65889345528
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/filter/inc/condformatbuffer.hxx |1 +
sc/source/filter/oox/condformatbuffer.cxx | 18 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 805c4cddd82d08e803fb921728f3f0b6a1b30ee9
Author: Henry Castro
AuthorDate: Tue Mar 28 17:55:17 2023 -0400
Commit: Henry Castro
CommitDate: Tue May 23 01:01:45 2023 +0200
sc: filter: oox: only insert conditional format if has items
Otherwise, the empty conditional format will exists.
Signed-off-by: Henry Castro
Change-Id: I99d83bd50ce4c12ef9be6924cba31b8847c0ad07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149720
Reviewed-by: Andras Timar
Tested-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151978
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index 9d3cc83fc953..e62917678b9a 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -202,6 +202,7 @@ class CondFormat final : public WorksheetHelper
friend class CondFormatBuffer;
public:
explicitCondFormat( const WorksheetHelper& rHelper );
+~CondFormat();
/** Imports settings from the conditionalFormatting element. */
voidimportConditionalFormatting( const AttributeList&
rAttribs );
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 1d5e55fdbc1b..c83f4676ba54 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1099,6 +1099,12 @@ CondFormat::CondFormat( const WorksheetHelper& rHelper )
:
{
}
+CondFormat::~CondFormat()
+{
+if (!mbReadyForFinalize && mpFormat)
+delete mpFormat;
+}
+
void CondFormat::importConditionalFormatting( const AttributeList& rAttribs )
{
getAddressConverter().convertToCellRangeList( maModel.maRanges,
rAttribs.getString( XML_sqref, OUString() ), getSheetIndex(), true );
@@ -1137,10 +1143,16 @@ void CondFormat::finalizeImport()
ScDocument& rDoc = getScDocument();
mpFormat->SetRange(maModel.maRanges);
maRules.forEachMem( &CondFormatRule::finalizeImport );
-SCTAB nTab = maModel.maRanges.GetTopLeftCorner().Tab();
-sal_Int32 nIndex =
getScDocument().AddCondFormat(std::unique_ptr(mpFormat),
nTab);
-rDoc.AddCondFormatData( maModel.maRanges, nTab, nIndex );
+if (mpFormat->size() > 0)
+{
+SCTAB nTab = maModel.maRanges.GetTopLeftCorner().Tab();
+sal_Int32 nIndex =
getScDocument().AddCondFormat(std::unique_ptr(mpFormat),
nTab);
+
+rDoc.AddCondFormatData( maModel.maRanges, nTab, nIndex );
+}
+else
+mbReadyForFinalize = false;
}
CondFormatRuleRef CondFormat::createRule()
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - include/LibreOfficeKit libreofficekit/source sfx2/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |8
libreofficekit/source/gtk/lokdocview.cxx |1 +
sfx2/source/dialog/dinfdlg.cxx |9 +
3 files changed, 18 insertions(+)
New commits:
commit 88db520407ed5786466513c9486ebb633ce140df
Author: Jaume Pujantell
AuthorDate: Wed May 10 23:19:04 2023 +0200
Commit: Ashod Nakashian
CommitDate: Tue May 23 04:21:52 2023 +0200
notify async password change
Change-Id: I2d16c9804e65f093239e810d466de35286b28dee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151789
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 0094b94de559..7e1110089e52 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -907,6 +907,12 @@ typedef enum
* "file:///tmp/hello-world.pdf"
*/
LOK_CALLBACK_EXPORT_FILE = 59,
+
+/**
+ * Informs that the document password has been succesfully changed.
+ * The payload contains the the new password and the type.
+*/
+LOK_CALLBACK_DOCUMENT_PASSWORD_RESET = 62
}
LibreOfficeKitCallbackType;
@@ -1055,6 +1061,8 @@ static inline const char* lokCallbackTypeToString(int
nType)
return "LOK_CALLBACK_MEDIA_SHAPE";
case LOK_CALLBACK_EXPORT_FILE:
return "LOK_CALLBACK_EXPORT_FILE";
+case LOK_CALLBACK_DOCUMENT_PASSWORD_RESET:
+return "LOK_CALLBACK_DOCUMENT_PASSWORD_RESET";
}
assert(!"Unknown LibreOfficeKitCallbackType type.");
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index ce5b059a9006..c12067a483e1 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1487,6 +1487,7 @@ callback (gpointer pData)
case LOK_CALLBACK_FONTS_MISSING:
case LOK_CALLBACK_MEDIA_SHAPE:
case LOK_CALLBACK_EXPORT_FILE:
+case LOK_CALLBACK_DOCUMENT_PASSWORD_RESET:
{
// TODO: Implement me
break;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 799d8fbd3168..71eeafc6ff6f 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -38,6 +38,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -70,6 +72,7 @@
#include
#include
#include
+#include
#include
#include
@@ -789,6 +792,12 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl,
weld::Button&, void)
{
sfx2::SetPassword(pFilter, pMedSet,
m_xPasswordDialog->GetPasswordToOpen(),
m_xPasswordDialog->GetPasswordToOpen(),
true);
+tools::JsonWriter payloadJson;
+payloadJson.put("password",
m_xPasswordDialog->GetPasswordToOpen());
+payloadJson.put("isToModify", false);
+pShell->GetViewShell()->libreOfficeKitViewCallback(
+LOK_CALLBACK_DOCUMENT_PASSWORD_RESET,
+payloadJson.extractAsOString().getStr());
pShell->SetModified();
}
m_xPasswordDialog->disposeOnce();
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/source
sd/source/ui/unoidl/unomodel.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit cfa1fc9be9831a61fba736d428c2c2e56fbf7617
Author: Miklos Vajna
AuthorDate: Mon May 22 09:15:50 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue May 23 05:21:19 2023 +0200
sd: fix crash in SdXImpressDocument::postMouseEvent()
Crashreport signature:
program/libsdlo.so
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)
sd/source/ui/unoidl/unomodel.cxx:2615
program/libmergedlo.so
doc_postMouseEvent
desktop/source/lib/init.cxx:5007
Change-Id: I321f39b284f5917048925bf45c9a6417ac9cb2ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152079
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8e02660f628f..eac9ad74385b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2612,6 +2612,11 @@ void SdXImpressDocument::postMouseEvent(int nType, int
nX, int nY, int nCount, i
SdrPageView* pPageView = pDrawView->GetSdrPageView();
SdrPage* pPage = pPageView->GetPage();
::sd::Window* pActiveWin = pViewShell->GetActiveWindow();
+if (!pActiveWin)
+{
+return;
+}
+
if (LokControlHandler::postMouseEvent(pPage, pDrawView, *pActiveWin,
nType, aPointHMM, nCount, nButtons, nModifier))
return;
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/filter/ww8/data/3endnotes.doc |binary
sw/qa/filter/ww8/ww8.cxx| 27 +++
sw/source/core/inc/ftnboss.hxx |2 +-
sw/source/filter/ww8/ww8par.cxx |7 +++
sw/source/filter/ww8/ww8scan.hxx|1 +
5 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit dc11f5b151e1a2ea2623fc8cf806a400763955d9
Author: Miklos Vajna
AuthorDate: Mon May 22 20:06:08 2023 +0200
Commit: Miklos Vajna
CommitDate: Tue May 23 08:11:45 2023 +0200
tdf#143445 DOC import: limit the usage of the CONTINUOUS_ENDNOTES compat
flag
The bugdoc has 72 endnotes and not all of them were listed at the end
of the document, since commit 4814e8caa5f06c4fe438dfd7d7315e4a2410ea18
(tdf#124601 sw: add ContinuousEndnotes layout compat option,
2019-09-30).
The problem is that for simple documents the strategy to just place the
endnotes (in the form of footnotes) on the last page works, but this
approach breaks when the document is growing, since nobody moves the
endnotes from the former last page to the new last page. Additionally,
it's not trivial to know what the effective last page is, once you have
enough endnotes that the end of the body text is not on the last page.
Fix the problem by restricting when the DOC import sets this compat
flag. The limit is picked to be 2 endnotes, just because that keeps the
use-cases for continuous endnotes working.
A future solution would be to create a layout-level section at the end
of the document for such endnotes: that would allow them to be inline,
and we know how to keep endnotes inside a section & know how to keep a
section at the end of the document. But that would be a bit of a feature
work, let's keep this regression fix simple.
Change-Id: Ideea1c52f4e31ded3e28e9441aace2bc3857079e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152127
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/filter/ww8/data/3endnotes.doc
b/sw/qa/filter/ww8/data/3endnotes.doc
new file mode 100644
index ..fca1cb123812
Binary files /dev/null and b/sw/qa/filter/ww8/data/3endnotes.doc differ
diff --git a/sw/qa/filter/ww8/ww8.cxx b/sw/qa/filter/ww8/ww8.cxx
index b732a37eff40..d9eaff9fd82e 100644
--- a/sw/qa/filter/ww8/ww8.cxx
+++ b/sw/qa/filter/ww8/ww8.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
namespace
{
@@ -278,6 +279,32 @@ CPPUNIT_TEST_FIXTURE(Test, testWrapThroughLayoutInCell)
// i.e. layoutInCell was disabled, leading to bad layout in Word.
assertXPath(pXmlDoc, "//wp:anchor", "layoutInCell", "1");
}
+
+CPPUNIT_TEST_FIXTURE(Test, test3Endnotes)
+{
+// Given a DOC file with 3 endnotes:
+createSwDoc("3endnotes.doc");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure that all 3 endnotes are on the last page, like in Word:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+SwPageFrame* pPage = pLayout->GetLastPage();
+SwFootnoteContFrame* pFootnoteCont = pPage->FindFootnoteCont();
+int nEndnotes = 0;
+for (SwFrame* pLower = pFootnoteCont->GetLower(); pLower; pLower =
pLower->GetNext())
+{
+++nEndnotes;
+}
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3
+// - Actual : 1
+// i.e. only 1 endnote was on the last page, the other 2 was not moved to
the end of the
+// document, which is incorrect.
+CPPUNIT_ASSERT_EQUAL(3, nEndnotes);
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index e60ff97de1a9..109c9df74e29 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -46,7 +46,7 @@ enum class SwNeighbourAdjust {
typedef std::vector SwFootnoteFrames;
-class SAL_DLLPUBLIC_RTTI SwFootnoteBossFrame: public SwLayoutFrame
+class SW_DLLPUBLIC SwFootnoteBossFrame: public SwLayoutFrame
{
// for private footnote operations
friend class SwFrame;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b57678ec9495..348d95d5cea0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5175,6 +5175,13 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const
*pGloss)
if( m_xWDop->nEdn )
aInfo.m_nFootnoteOffset = m_xWDop->nEdn - 1;
m_rDoc.SetEndNoteInfo( aInfo );
+
+if (m_xSBase->GetEndnoteCount() > 2)
+{
+// This compatibility flag only works in easy cases, disable it
for anything non-trivial
+// for now.
+
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONTINUOUS_ENDNOTES,
false);
+}
}
if (m_xWwFib->m_lcbPlcfhdd)
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index
