[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/source
sw/source/core/layout/ftnfrm.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit cb58014691eaa278e4bd19dd0ab65524846c8adc
Author: Michael Stahl
AuthorDate: Tue Mar 8 17:36:41 2022 +0100
Commit: Thorsten Behrens
CommitDate: Sat Mar 19 00:26:03 2022 +0100
tdf#139687 sw: invalidate text frame in footnote when moving it
The problem (which only reproduces here on copy/paste with
SAL_USE_VCLPLUGIN=kf5, not with gtk3) is that on SwTextFrame 2638 in a
footnote on page 19 containing "Saeed, 100–101." there should be a top
margin of 0 but it's actually 144.
The footnote was initially created on a previous page with another
footnote with SwTextFrame 2635 before it, that's how it got this top
margin.
Invalidate the print area in SwFootnoteFrame::Paste(), which is called
when the footnote is moved to a different container.
(somehow regression from commit 723728cd358693b8f4bc9d913541aa4479f2bd48)
Change-Id: I7346fd03fccad3eddccbbcd56c4b50127a337b24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131217
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 86081afc3021fa0ae6c2b32d11b4b20cc8a190a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131201
Reviewed-by: Thorsten Behrens
(cherry picked from commit 3d8533cb894614394f1ecf05b3d6dc60f3bf6dd6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131629
Tested-by: Thorsten Behrens
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 9573944b71d1..425aa5fd0a9e 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -572,10 +572,20 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame*
pSibling )
if(
aRectFnSet.GetWidth(getFrameArea())!=aRectFnSet.GetWidth(pParent->getFramePrintArea())
)
InvalidateSize_();
InvalidatePos_();
+if (SwFrame *const pContent = ContainsContent())
+{ // tdf#139687 invalidate possibly stale top margin (computed from
previous frame)
+pContent->InvalidatePrt_();
+}
SwPageFrame *pPage = FindPageFrame();
InvalidatePage( pPage );
-if ( GetNext() )
-GetNext()->InvalidatePos_();
+if (SwFootnoteFrame *const pNext = static_cast(GetNext()))
+{
+pNext->InvalidatePos_();
+if (SwFrame *const pContent = pNext->ContainsContent())
+{ // tdf#139687 invalidate possibly stale top margin (computed from
previous frame)
+pContent->InvalidatePrt_();
+}
+}
if( aRectFnSet.GetHeight(getFrameArea()) )
pParent->Grow( aRectFnSet.GetHeight(getFrameArea()) );
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/grammar.cxx |3 ++-
hwpfilter/source/lexer.cxx |7 +++
hwpfilter/source/lexer.hxx |6 ++
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit d643f9d5c66cdf8b6c935484e65b8f24b5ef31f0
Author: Caolán McNamara
AuthorDate: Fri Mar 18 20:18:22 2022 +
Commit: Caolán McNamara
CommitDate: Fri Mar 18 22:33:13 2022 +0100
ofz: Direct-leak
Change-Id: I40024334b394e4de6a1766321556689234da86ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131840
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index d2c91860aeb6..fdcdbb139d75 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -1175,12 +1175,13 @@ yyerrhandle:
return 1;
}
-
Node *mainParse(const char *_code)
{
initFlex( _code );
top = nullptr;
yyparse();
+deinitFlex();
+
if( top )
return top;
else
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 5d0cef7e2f9d..191f0bce7419 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -2107,6 +2107,13 @@ void initFlex(const char *_code )
yy_switch_to_buffer( yy_scan_string(_code) );
}
+void deinitFlex()
+{
+// flex faq-memory-leak
+yy_delete_buffer(YY_CURRENT_BUFFER);
+yy_init = 1;
+}
+
int yywrap()
{
yy_delete_buffer( YY_CURRENT_BUFFER );
diff --git a/hwpfilter/source/lexer.hxx b/hwpfilter/source/lexer.hxx
index 0f0c1fe1525e..41835f13b51a 100644
--- a/hwpfilter/source/lexer.hxx
+++ b/hwpfilter/source/lexer.hxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_HWPFILTER_SOURCE_LEXER_HXX
-#define INCLUDED_HWPFILTER_SOURCE_LEXER_HXX
+#pragma once
void initFlex(char const* s);
+void deinitFlex();
int yylex();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 30 ++
sw/source/core/edit/edws.cxx|6 ++
2 files changed, 36 insertions(+)
New commits:
commit a5d474a7393a32a2f82294922940034330255596
Author: Michael Stahl
AuthorDate: Mon Mar 7 19:37:02 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 18 21:37:59 2022 +0100
tdf#147414 sw_redlinehide: fix cursor position after AutoCorrect
Change-Id: Ia06cd4e1a74a21788e4d0ddb5f0481e8a144d863
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131147
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit e2076b31a91d3882f3deeaa5d3d4659da0e4b17c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131134
Reviewed-by: Xisco Fauli
(cherry picked from commit ab0756c1b7509a034d0bb74251c519a090dedc7c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131628
Tested-by: Michael Stahl
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index bc477d2ed42d..bdea12f0370a 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1306,6 +1306,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376)
CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147414)
+{
+SwDoc* const pDoc(createDoc());
+SwWrtShell* const pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwAutoCorrect corr(*SvxAutoCorrCfg::Get().GetAutoCorrect());
+
+pWrtShell->Insert("Abc");
+
+// hide and enable
+lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+lcl_dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+
+CPPUNIT_ASSERT(pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT(
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines());
+
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
+// backspace
+pWrtShell->DelLeft();
+pWrtShell->AutoCorrect(corr, u' ');
+
+// problem was this was 1 i.e. before the deleted "b" while " " was
inserted after
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3),
+
pWrtShell->getShellCursor(false)->GetPoint()->nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL(
+OUString("Ab c"),
+
pWrtShell->getShellCursor(false)->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147310)
{
SwDoc* pDoc = createDoc();
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index dd5381cbb9eb..4991b9376a89 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -265,6 +265,12 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr,
bool bInsert,
// FIXME: this _must_ be called with reference to the actual node text!
SwTextFrame const*const pFrame(static_cast(pTNd->getLayoutFrame(GetLayout(;
TextFrameIndex const nPos(pFrame->MapModelToViewPos(*pCursor->GetPoint()));
+// tdf#147414 sw_redlinehide: if cursor moved backward, it may be at the
+// start of a delete redline - but MapViewToModelPos() always returns end
+// of redline and it will be called when AutoCorrect actually inserts
+// something - so first normalize cursor point to end of redline so that
+// point will then be moved forward when something is inserted.
+*pCursor->GetPoint() = pFrame->MapViewToModelPos(nPos);
OUString const& rMergedText(pFrame->GetText());
rACorr.DoAutoCorrect( aSwAutoCorrDoc,
rMergedText, sal_Int32(nPos),
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 46
sw/source/core/undo/undel.cxx |5 +++
2 files changed, 50 insertions(+), 1 deletion(-)
New commits:
commit edcba0f739bc25b836b991cc4030aa9e2393b994
Author: Michael Stahl
AuthorDate: Mon Mar 7 15:57:09 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 18 21:37:14 2022 +0100
tdf#147310 sw_redlinehide: recreate frames for whole table deleted
SwUndoDelete calls MakeFrames with end being end node of the table, but
it needs to be the following node (with a frame).
(regression from commit 723728cd358693b8f4bc9d913541aa4479f2bd48)
Change-Id: Id0974c8349be5aef9630822738eae9462bbcb4f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131112
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 6f20bcb152948a24dbe40ca2e6c4ecef2bebf853)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131131
Reviewed-by: Xisco Fauli
(cherry picked from commit d65b07c42206476ab471320c8261a96adad4d515)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131627
Tested-by: Michael Stahl
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 82b19fa95c71..bc477d2ed42d 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1306,6 +1306,52 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376)
CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147310)
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+// somehow bug happens only with 2 tables
+SwInsertTableOptions tableOpt(SwInsertTableFlags::DefaultBorder, 0);
+pWrtShell->InsertTable(tableOpt, 1, 1);
+pWrtShell->InsertTable(tableOpt, 1, 1);
+
+pWrtShell->SttEndDoc(/*bStart=*/true);
+
+pWrtShell->DeleteRow(false);
+pWrtShell->DeleteRow(false);
+
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page/body/tab", 0);
+discardDumpedLayout();
+}
+pWrtShell->Undo();
+// this did not create frames for the table
+pWrtShell->Undo();
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// there are 2 tables
+assertXPath(pXmlDoc, "/root/page/body/tab", 2);
+discardDumpedLayout();
+}
+pWrtShell->Redo();
+pWrtShell->Redo();
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page/body/tab", 0);
+discardDumpedLayout();
+}
+pWrtShell->Undo();
+pWrtShell->Undo();
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// there are 2 tables
+assertXPath(pXmlDoc, "/root/page/body/tab", 2);
+}
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf64242_optimizeTable)
{
SwDoc* pDoc = createDoc("tdf64242_optimizeTable.odt");
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 4e55a46196b4..5f8d08168254 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -1135,7 +1135,10 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
// don't include end node in the range: it may have been merged already
// by the start node, or it may be merged by one of the moved nodes,
// but if it isn't merged, its current frame(s) should be good...
-SwNodeIndex const end(rDoc.GetNodes(), m_bDelFullPara ?
delFullParaEndNode : m_nEndNode);
+SwNodeIndex const end(rDoc.GetNodes(), m_bDelFullPara
+? delFullParaEndNode
+// tdf#147310 SwDoc::DeleteRowCol() may delete whole table - end
must be node following table!
+: (m_nEndNode + (rDoc.GetNodes()[m_nSttNode]->IsTableNode() &&
rDoc.GetNodes()[m_nEndNode]->IsEndNode() ? 1 : 0)));
::MakeFrames(&rDoc, start, end);
}
[Libreoffice-commits] core.git: basctl/source cui/source
basctl/source/basicide/baside2.hxx | 10 +-
basctl/source/basicide/baside2b.cxx | 10 +-
cui/source/tabpages/numfmt.cxx |8
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f433d9cf8be6507f0299492794da9ed5d749a6ad
Author: VaibhavMalik4187
AuthorDate: Wed Mar 16 15:50:01 2022 +0530
Commit: Hossein
CommitDate: Fri Mar 18 21:06:56 2022 +0100
tdf#114441 Convert sal_uLong to other types
Change-Id: I5651788dad4386aa325e20fa8bbfc0908dbfa629
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128767
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 8d07cd81ddc1..f43ee79d2c4f 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -94,7 +94,7 @@ private:
virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
-voidImpDoHighlight( sal_uLong nLineOff );
+voidImpDoHighlight( sal_uInt32 nLineOff );
voidImplSetFont();
boolbHighlighting;
@@ -104,7 +104,7 @@ private:
virtual css::uno::Reference< css::awt::XWindowPeer >
GetComponentInterface(bool bCreate = true) override;
CodeCompleteDataCache aCodeCompleteCache;
VclPtr pCodeCompleteWnd;
-OUString GetActualSubName( sal_uLong nLine ); // gets the actual
subroutine name according to line number
+OUString GetActualSubName( sal_uInt32 nLine ); // gets the actual
subroutine name according to line number
void SetupAndShowCodeCompleteWnd(const std::vector< OUString >&
aEntryVect, TextSelection aSel );
void HandleAutoCorrect();
void HandleAutoCloseParen();
@@ -123,7 +123,7 @@ private:
virtual voidLoseFocus() override;
virtual voidRequestHelp( const HelpEvent& rHEvt ) override;
-voidDoSyntaxHighlight( sal_uLong nPara );
+voidDoSyntaxHighlight( sal_uInt32 nPara );
OUStringGetWordAtCursor();
boolImpCanModify();
@@ -138,8 +138,8 @@ public:
voidCreateProgress( const OUString& rText, sal_uInt32 nRange );
voidDestroyProgress();
-voidParagraphInsertedDeleted( sal_uLong nNewPara, bool
bInserted );
-voidDoDelayedSyntaxHighlight( sal_uLong nPara );
+voidParagraphInsertedDeleted( sal_uInt32 nNewPara, bool
bInserted );
+voidDoDelayedSyntaxHighlight( sal_uInt32 nPara );
voidCreateEditEngine();
voidSetScrollBarRanges();
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 00c5dce2f185..e15ccc3ef3ed 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1141,7 +1141,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
}
}
-OUString EditorWindow::GetActualSubName( sal_uLong nLine )
+OUString EditorWindow::GetActualSubName( sal_uInt32 nLine )
{
SbxArrayRef pMethods = rModulWindow.GetSbModule()->GetMethods();
for (sal_uInt32 i = 0; i < pMethods->Count(); i++)
@@ -1195,7 +1195,7 @@ void EditorWindow::InitScrollBars()
}
}
-void EditorWindow::ImpDoHighlight( sal_uLong nLine )
+void EditorWindow::ImpDoHighlight( sal_uInt32 nLine )
{
if ( !bDoSyntaxHighlight )
return;
@@ -1259,7 +1259,7 @@ void EditorWindow::ImplSetFont()
}
}
-void EditorWindow::DoSyntaxHighlight( sal_uLong nPara )
+void EditorWindow::DoSyntaxHighlight( sal_uInt32 nPara )
{
// because of the DelayedSyntaxHighlight it's possible
// that this line does not exist anymore!
@@ -1272,7 +1272,7 @@ void EditorWindow::DoSyntaxHighlight( sal_uLong nPara )
}
}
-void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
+void EditorWindow::DoDelayedSyntaxHighlight( sal_uInt32 nPara )
{
// line is only added to list, processed in TimerHdl
// => don't manipulate breaks while EditEngine is formatting
@@ -1314,7 +1314,7 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Timer *,
void)
bHighlighting = false;
}
-void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted )
+void EditorWindow::ParagraphInsertedDeleted( sal_uInt32 nPara, bool bInserted )
{
if ( pProgress )
pProgress->StepProgress();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 5ef4f7c96b96..63dc3828bb7b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1281,10 +1281,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl,
weld::Button&, rIB, void)
bool SvxNumberFormatTabPage::Click_Impl(const weld::Button& rIB)
{
-sal_uLong nReturn = 0;
-constexpr sal_uLong nReturnChanged = 0x1; // THE boolean return value
-constexpr sal_uLong nReturnAdded= 0x2; // temp: format added
-constexpr sal_uLon
[Libreoffice-commits] core.git: sw/qa vcl/source
sw/qa/extras/ww8export/ww8export3.cxx |2 +-
vcl/source/gdi/region.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fdbda2901080d3638475638f693299eca7c1cd7f
Author: Andrea Gelmini
AuthorDate: Fri Mar 18 19:59:24 2022 +0100
Commit: Andrea Gelmini
CommitDate: Fri Mar 18 20:42:08 2022 +0100
Fix typos
Change-Id: If006b66919dcc7f409e9f9a30e1fe09fa592e698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131838
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 261d74938e70..0ae023416cc5 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -1024,7 +1024,7 @@ CPPUNIT_TEST_FIXTURE(Test, testClearingBreak)
// Then make sure that the clear property of the break is not ignored:
verify();
reload(mpFilter, "clearing-break.doc");
-// Make sure that that the clear property of the break is not ignored
during export:
+// Make sure that the clear property of the break is not ignored during
export:
verify();
}
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 7567bd08d5bf..5293aa52328b 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1574,7 +1574,7 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region&
rRegion)
const auto nPolygons = aNewPoly.Count();
if (nPolygons > 128)
{
-SAL_WARN("vcl.gdi", "suspicously high no of polygons
in clip:" << nPolygons);
+SAL_WARN("vcl.gdi", "suspiciously high no of polygons
in clip:" << nPolygons);
if (utl::ConfigManager::IsFuzzing())
aNewPoly.Clear();
}
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/TypeSerializer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 467c8bc2229f51ef4ca6d9593554a7cf1e7ff7ee Author: Caolán McNamara AuthorDate: Fri Mar 18 16:55:37 2022 + Commit: Caolán McNamara CommitDate: Fri Mar 18 20:38:41 2022 +0100 ofz#45583 Integer-overflow we assert on use of a negative xscale too, so don't allow that either Change-Id: I3420fc3f4568eed187fcccf26067006e064d417e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131835 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/gdi/TypeSerializer.cxx b/vcl/source/gdi/TypeSerializer.cxx index 03d6f6ec90e9..fb054e4748ef 100644 --- a/vcl/source/gdi/TypeSerializer.cxx +++ b/vcl/source/gdi/TypeSerializer.cxx @@ -444,7 +444,7 @@ void TypeSerializer::readMapMode(MapMode& rMapMode) const bool bBogus = !aScaleX.IsValid() || !aScaleY.IsValid() || aScaleX.GetNumerator() == std::numeric_limits::min() || aScaleY.GetNumerator() == std::numeric_limits::min() -|| static_cast(aScaleY) < 0.0; +|| static_cast(aScaleX) < 0.0 || static_cast(aScaleY) < 0.0; SAL_WARN_IF(bBogus, "vcl", "invalid scale"); if (bSimple || bBogus)
[Libreoffice-commits] core.git: include/vcl sfx2/source
include/vcl/customweld.hxx |1 +
sfx2/source/control/charwin.cxx |3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ce3e760f9155ac8d80f60054be036e862df7029a
Author: Andreas Heinisch
AuthorDate: Thu Mar 17 21:14:10 2022 +0100
Commit: Andreas Heinisch
CommitDate: Fri Mar 18 19:57:01 2022 +0100
tdf#111924 - Special characters: don't lose focus on context menu
Don't lose focus on the favorite or recently used items in the special
characters dialog when right-clicking them to show the context menu.
Change-Id: Iaedc4bbc6fb627591b9c0cd9a2c44940312eeb1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131721
Tested-by: Andreas Heinisch
Reviewed-by: Andreas Heinisch
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index a96d8c5522fe..e37555b36777 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -65,6 +65,7 @@ public:
virtual void Hide() { m_pDrawingArea->hide(); }
void GrabFocus() { m_pDrawingArea->grab_focus(); }
bool HasFocus() const { return m_pDrawingArea->has_focus(); }
+bool HasChildFocus() const { return m_pDrawingArea->has_child_focus(); }
bool IsVisible() const { return m_pDrawingArea->get_visible(); }
bool IsReallyVisible() const { return m_pDrawingArea->is_visible(); }
bool IsEnabled() const { return m_pDrawingArea->get_sensitive(); }
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index eb5b5662a817..6b7c8cd8b514 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -189,7 +189,8 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext,
const tools::Rectang
aPoint.setX(-aBoundRect.Left() + (aSize.Width() -
aBoundRect.GetWidth()) / 2);
}
-if (HasFocus())
+// tdf#111924 - don't lose focus on context menu
+if (HasFocus() || HasChildFocus())
{
rRenderContext.SetFillColor(aHighlightColor);
rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize));
built msi file
Good morning, I've been trying to create the msi (microsoft software installer) file for libreoffice but with no success. This is what I have on autogen.input: --enable-debug --enable-symbols --with-external-tar=/cygdrive/c/sources/lo-externalsrc --with-junit=/cygdrive/c/sources/junit-4.10.jar --with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 --enable-pch --disable-ccache --with-visual-studio=2022 --with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot --host=x86_64-pc-cygwin the built is OK with that data, the problem is when I add this line: --with-package-format=msi then the built ended with the next message: : * : ERROR: Reading from filehandle failed at C:/sources/libo-core/solenv/bin/modules/installer/windows/file.pm line 967. : * make[1]: *** [C:/sources/libo-core/instsetoo_native/CustomTarget_install.mk:104: C:/sources/libo-core/workdir/CustomTarget/instsetoo_nati ve/install/install.phony] Error 1 make: *** [Makefile:299: build] Error 2 Anyone knows how to solve that error or how to create the msi in a different way?
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/source
sw/source/core/edit/edlingu.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 383ee369e3e69ac356b2e3a800274241949e791b
Author: Michael Stahl
AuthorDate: Tue Mar 8 13:58:28 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 18 19:38:20 2022 +0100
tdf#147416 sw_redlinehide: fix spell checking popup
The problem is that SwEditShell::GetCorrection() uses the SwTextNode
text without filtering redlines.
Using ExpandMode::ReplaceMode should work as it will replace
CH_TXTATR_INWORD with nothing and CH_TXTATR_BREAKWORD with ZWSP.
Unfortunately there isn't yet a mode that can handle fieldmarks as they
are displayed in the layout.
Change-Id: Ia243d90309fdd7b6ca159c5df2f4d98725400c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131210
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit e07b9c5142af838648a4d03a0bdce76612cf7535)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131198
Reviewed-by: Thorsten Behrens
(cherry picked from commit c29caa41f826e0f3f7850d6276407a937c512957)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131626
Tested-by: Michael Stahl
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 69446dd9b060..8c50eadd8740 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -823,11 +823,16 @@ void SwEditShell::HandleCorrectionError(const OUString&
aText, SwPosition aPos,
SwRect& rSelectRect)
{
// save the start and end positions of the line and the starting point
+SwNode const& rNode(GetCursor()->GetPoint()->nNode.GetNode());
Push();
LeftMargin();
-const sal_Int32 nLineStart = GetCursor()->GetPoint()->nContent.GetIndex();
+const sal_Int32 nLineStart = &rNode ==
&GetCursor()->GetPoint()->nNode.GetNode()
+? GetCursor()->GetPoint()->nContent.GetIndex()
+: 0;
RightMargin();
-const sal_Int32 nLineEnd = GetCursor()->GetPoint()->nContent.GetIndex();
+const sal_Int32 nLineEnd = &rNode ==
&GetCursor()->GetPoint()->nNode.GetNode()
+? GetCursor()->GetPoint()->nContent.GetIndex()
+: rNode.GetTextNode()->Len();
Pop(PopMode::DeleteCurrent);
// make sure the selection build later from the data below does
@@ -909,8 +914,14 @@ uno::Reference< XSpellAlternatives >
if (pWrong->InWrongWord(nBegin, nLen) && !pNode->IsSymbolAt(nBegin))
{
const OUString aText(pNode->GetText().copy(nBegin, nLen));
-OUString aWord =
aText.replaceAll(OUStringChar(CH_TXTATR_BREAKWORD), "")
- .replaceAll(OUStringChar(CH_TXTATR_INWORD),
"");
+// TODO: this doesn't handle fieldmarks properly
+ModelToViewHelper const aConversionMap(*pNode, GetLayout(),
+ExpandMode::ExpandFields | ExpandMode::ExpandFootnote |
ExpandMode::ReplaceMode
+| (GetLayout()->IsHideRedlines() ? ExpandMode::HideDeletions :
ExpandMode(0))
+| (GetViewOptions()->IsShowHiddenChar() ? ExpandMode(0) :
ExpandMode::HideInvisible));
+auto const
nBeginView(aConversionMap.ConvertToViewPosition(nBegin));
+OUString const aWord(aConversionMap.getViewText().copy(nBeginView,
+aConversionMap.ConvertToViewPosition(nBegin+nLen) -
nBeginView));
uno::Reference< XSpellChecker1 > xSpell( ::GetSpellChecker() );
if( xSpell.is() )
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/tools/gradienttools.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 67fcd8f268fd04ca2012470af2257b394b77b8fc
Author: Gautham Krishnan
AuthorDate: Sat Mar 12 21:16:59 2022 +0530
Commit: Hossein
CommitDate: Fri Mar 18 18:46:00 2022 +0100
tdf#147906 used std::hypot for Pythagorean addition
Change-Id: I9bf10374af93cd22e429a112937aaa8828126523
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131504
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/basegfx/source/tools/gradienttools.cxx
b/basegfx/source/tools/gradienttools.cxx
index b4f1f6222f52..c6e716510432 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -136,7 +136,7 @@ namespace basegfx
// add object expansion
if(bCircular)
{
-const double fOriginalDiag(sqrt((fTargetSizeX * fTargetSizeX) +
(fTargetSizeY * fTargetSizeY)));
+const double fOriginalDiag(std::hypot(fTargetSizeX, fTargetSizeY));
fTargetOffsetX -= (fOriginalDiag - fTargetSizeX) / 2.0;
fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
@@ -418,7 +418,7 @@ namespace basegfx
return 0.0;
}
-const double t(1.0 - sqrt(aCoor.getX() * aCoor.getX() +
aCoor.getY() * aCoor.getY()));
+const double t(1.0 - std::hypot(aCoor.getX(), aCoor.getY()));
const sal_uInt32 nSteps(rGradInfo.getSteps());
if(nSteps && t < 1.0)
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx| 11 +++--
sw/qa/extras/uiwriter/uiwriter.cxx |6 ++---
sw/source/core/crsr/crstrvl.cxx | 41 +--
sw/source/uibase/docvw/edtwin.cxx| 14 +--
sw/source/uibase/shells/textfld.cxx |2 -
sw/source/uibase/uitest/uiobject.cxx | 25 +
6 files changed, 80 insertions(+), 19 deletions(-)
New commits:
commit 9a823863f7cc0499282cd62f782437d9e5012187
Author: Michael Stahl
AuthorDate: Fri Mar 4 21:53:38 2022 +0100
Commit: Thorsten Behrens
CommitDate: Fri Mar 18 18:36:43 2022 +0100
sw_redlinehide: more issues with SwEditWin Surrounding functions
.. and SwEditWinUIObject.
These need to work with TextFrameIndex. Add some functions to
SwCursorShell to make it possible.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131042
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 112592ac580108998a2cd99ae9bbf376c80c10d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131109
Reviewed-by: Thorsten Behrens
(cherry picked from commit 26830d91d2f2a2d50f989fa3f36d18d55ea0eafd)
Change-Id: I884c4822a0e7ecf254ea09a893762e1e6d539534
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131625
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 23b3753dd938..2fa79345b240 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -26,6 +26,9 @@
#include
#include
+#ifdef SW_DLLIMPLEMENTATION
+#include
+#endif
#include "IShellCursorSupplier.hxx"
#include "swdllapi.h"
#include "docary.hxx"
@@ -792,8 +795,12 @@ public:
bool GotoINetAttr( const SwTextINetFormat& rAttr );
const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
-bool SelectText( const sal_Int32 nStart,
-const sal_Int32 nEnd );
+bool SelectTextModel(sal_Int32 nStart, sal_Int32 nEnd);
+#ifdef SW_DLLIMPLEMENTATION
+bool SelectTextView(TextFrameIndex nStart, TextFrameIndex nEnd);
+// result is only valid while cursor isn't moved!
+TextFrameIndex GetCursorPointAsViewIndex() const;
+#endif
bool CheckTableBoxContent( const SwPosition* pPos = nullptr );
void SaveTableBoxContent( const SwPosition* pPos = nullptr );
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 252e43bb4e24..74ad9b9c3c14 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3831,7 +3831,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512()
CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pShell->GetCursor(), grf,
&frameSet, &grfSet));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
SvxCharHiddenItem hidden(true, RES_CHRATR_HIDDEN);
-pShell->SelectText(1, 4);
+pShell->SelectTextModel(1, 4);
rIDCO.InsertPoolItem(*pShell->GetCursor(), hidden);
// now we have "\1foo\1" with the "foo" hidden
CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
@@ -3845,7 +3845,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512()
query.ClearItem(RES_CHRATR_HIDDEN);
// delete from the start
-pShell->SelectText(0, 4);
+pShell->SelectTextModel(0, 4);
rIDCO.DeleteAndJoin(*pShell->GetCursor());
CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
@@ -3888,7 +3888,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512()
query.ClearItem(RES_CHRATR_HIDDEN);
// delete from the end
-pShell->SelectText(1, 5);
+pShell->SelectTextModel(1, 5);
rIDCO.DeleteAndJoin(*pShell->GetCursor());
CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0,
RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7df0ce6ff323..2d5898d7f51e 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1930,7 +1930,7 @@ bool SwContentAtPos::IsInRTLText()const
return bRet;
}
-bool SwCursorShell::SelectText( const sal_Int32 nStart,
+bool SwCursorShell::SelectTextModel( const sal_Int32 nStart,
const sal_Int32 nEnd )
{
SET_CURR_SHELL( this );
@@ -1954,6 +1954,43 @@ bool SwCursorShell::SelectText( const sal_Int32 nStart,
return bRet;
}
+TextFrameIndex SwCursorShell::GetCursorPointAsViewIndex() const
+{
+SwPosition const*const pPos(GetCursor()->GetPoint());
+SwTextNode const*const pTextNode(pPos->nNode.GetNode().GetTextNode());
+assert(pTextNode);
+SwTextFrame const*const pFrame(static_cast(pTextNode->getLayoutFrame(GetLayout(;
+assert(pFrame);
+re
[Libreoffice-commits] core.git: sc/source writerfilter/source
sc/source/core/tool/odffmap.cxx|3 +--
writerfilter/source/rtftok/rtfcharsets.cxx |4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit a40ed687a3e2f8e1d17705fcd7d397ba09398cb6
Author: Sinduja Y
AuthorDate: Tue Mar 15 12:39:03 2022 +0100
Commit: Hossein
CommitDate: Fri Mar 18 18:30:38 2022 +0100
tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro
Change-Id: Ifed6b79a4186e3196dc1e9ac179fe8ad0ee4a342
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131655
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index 5cbfdeeb0d7a..112854f4a71c 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -18,7 +18,6 @@
*/
#include
-#include
// ODFF, English, MapDupToInternal when writing ODFF, Programmatical, ODF_11
// functions duplicated to internal when writing ODFF are listed in static
const XclFunctionInfo saFuncTable_4[]
@@ -137,7 +136,7 @@ const ScCompiler::AddInMap ScCompiler::g_aAddInMap[] =
size_t ScCompiler::GetAddInMapCount()
{
-return SAL_N_ELEMENTS(g_aAddInMap);
+return std::size(g_aAddInMap);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx
b/writerfilter/source/rtftok/rtfcharsets.cxx
index 69e416ce8bc5..f7a03ee17dc9 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/writerfilter/source/rtftok/rtfcharsets.cxx
@@ -8,7 +8,7 @@
*/
#include "rtfcharsets.hxx"
-#include
+#include
namespace writerfilter::rtftok
{
@@ -48,7 +48,7 @@ RTFEncoding const aRTFEncodings[] = {
{ 255, 850 }, // OEM
};
-int nRTFEncodings = SAL_N_ELEMENTS(aRTFEncodings);
+int nRTFEncodings = std::size(aRTFEncodings);
} // namespace writerfilter::rtftok
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90020e670e543bbcd54598eb62b43a5e996de0d1 Author: Stanislav Horacek AuthorDate: Fri Mar 18 18:10:23 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 18:10:23 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 72eb5901a18fba63f13f832ac5e2082fd2d1f305 - fix example for SF Menu service Change-Id: I769bb965ea1c8ea836850bdf6f3ba05068ec737a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129925 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b219699612bd..72eb5901a18f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b219699612bd7577c8b8d9e84c2d79a4f16abc33 +Subproject commit 72eb5901a18fba63f13f832ac5e2082fd2d1f305
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_menu.xhp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 72eb5901a18fba63f13f832ac5e2082fd2d1f305
Author: Stanislav Horacek
AuthorDate: Mon Feb 14 21:40:11 2022 +0100
Commit: Olivier Hallot
CommitDate: Fri Mar 18 18:10:20 2022 +0100
fix example for SF Menu service
Change-Id: I769bb965ea1c8ea836850bdf6f3ba05068ec737a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129925
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_menu.xhp
b/source/text/sbasic/shared/03/sf_menu.xhp
index 706b53f00..1798215ef 100644
--- a/source/text/sbasic/shared/03/sf_menu.xhp
+++ b/source/text/sbasic/shared/03/sf_menu.xhp
@@ -97,8 +97,8 @@
def
item_b_listener(args):
bas = CreateScriptService("Basic")
s_args = args.split(",")
-msg = f"Menu item:
{s_args[0]}\n"
-msg += f"Menu
name: {s_args[1]}\n"
+msg = f"Menu name:
{s_args[0]}\n"
+msg += f"Menu
item: {s_args[1]}\n"
msg += f"Item ID:
{s_args[2]}\n"
msg += f"Item
status: {s_args[3]}"
bas.MsgBox(msg)
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b650469c434c59f1076a5130aa5ba58345539e68 Author: Johnny_M AuthorDate: Fri Mar 18 18:07:41 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 18:07:41 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b219699612bd7577c8b8d9e84c2d79a4f16abc33 - tdf#132643 Translate German section IDs Change-Id: I7da83d7d8933af55a1f5a7118c1cb3f4f1946fbd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131417 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 30de8915b7c7..b219699612bd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 30de8915b7c7d25f12a73d1f71af37f627af6355 +Subproject commit b219699612bd7577c8b8d9e84c2d79a4f16abc33
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0404.xhp |4 ++-- source/text/swriter/01/0419.xhp |2 +- source/text/swriter/02/1801.xhp |2 +- source/text/swriter/02/1903.xhp |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit b219699612bd7577c8b8d9e84c2d79a4f16abc33 Author: Johnny_M AuthorDate: Sat Mar 12 11:38:28 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 18:07:38 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I7da83d7d8933af55a1f5a7118c1cb3f4f1946fbd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131417 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0404.xhp b/source/text/swriter/00/0404.xhp index bfe543b44..b79e105d0 100644 --- a/source/text/swriter/00/0404.xhp +++ b/source/text/swriter/00/0404.xhp @@ -288,11 +288,11 @@ Choose Insert - Horizontal Rule - + Choose Insert - Text from File Open Insert toolbar, click - + diff --git a/source/text/swriter/01/0419.xhp b/source/text/swriter/01/0419.xhp index ad4b08020..88e6e05ae 100644 --- a/source/text/swriter/01/0419.xhp +++ b/source/text/swriter/01/0419.xhp @@ -33,7 +33,7 @@ Inserts the contents of another document into the current document at the cursor position. - + To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See insert a section for details. diff --git a/source/text/swriter/02/1801.xhp b/source/text/swriter/02/1801.xhp index da94dae69..a86d2d8e1 100644 --- a/source/text/swriter/02/1801.xhp +++ b/source/text/swriter/02/1801.xhp @@ -59,7 +59,7 @@ UFI: "insert cross reference" hereFile - + AutoText Special Character diff --git a/source/text/swriter/02/1903.xhp b/source/text/swriter/02/1903.xhp index b2efbf5c7..97b4e93df 100644 --- a/source/text/swriter/02/1903.xhp +++ b/source/text/swriter/02/1903.xhp @@ -59,7 +59,7 @@ Insert Document - + Insert Special Character
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 003649cb8229e012fd7dee62b79df39514e38ed8 Author: Johnny_M AuthorDate: Fri Mar 18 18:06:41 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 18:06:41 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 30de8915b7c7d25f12a73d1f71af37f627af6355 - tdf#132643 Translate German section IDs Change-Id: I5d94abb478ab3c11840804365b1299ad123b1172 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131426 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 601640f0d687..30de8915b7c7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 601640f0d687358b494f2e59eeed947e49e32b7d +Subproject commit 30de8915b7c7d25f12a73d1f71af37f627af6355
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0402.xhp |2 +- source/text/swriter/01/0216.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 30de8915b7c7d25f12a73d1f71af37f627af6355 Author: Johnny_M AuthorDate: Sat Mar 12 12:08:55 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 18:06:38 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I5d94abb478ab3c11840804365b1299ad123b1172 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131426 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0402.xhp b/source/text/swriter/00/0402.xhp index b6f99c018..364b0e600 100644 --- a/source/text/swriter/00/0402.xhp +++ b/source/text/swriter/00/0402.xhp @@ -56,7 +56,7 @@ Choose Edit - Footnotes - + Choose Edit - Reference - Index Entry... Open context menu - choose Index Entry diff --git a/source/text/swriter/01/0216.xhp b/source/text/swriter/01/0216.xhp index a4c0bb5bc..8ad7f5d43 100644 --- a/source/text/swriter/01/0216.xhp +++ b/source/text/swriter/01/0216.xhp @@ -38,7 +38,7 @@ To insert an index entry, select a word in the document, and then choose Insert - Table of Contents and Index - Index Entry. - + Selection
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b969544d5a08d1cf581b9e1e4c9940164fe0c813 Author: Johnny_M AuthorDate: Fri Mar 18 18:06:03 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 18:06:03 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 601640f0d687358b494f2e59eeed947e49e32b7d - tdf#132643 Translate German section IDs Change-Id: I09c358047d4dd01f21745268c4618b47faaee4a2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131440 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index af54aee36936..601640f0d687 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit af54aee36936ee0a00ba384b6a2f68b482787103 +Subproject commit 601640f0d687358b494f2e59eeed947e49e32b7d
[Libreoffice-commits] help.git: source/text
source/text/swriter/main0200.xhp |2 +- source/text/swriter/main0216.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 601640f0d687358b494f2e59eeed947e49e32b7d Author: Johnny_M AuthorDate: Sat Mar 12 13:02:09 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 18:05:58 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I09c358047d4dd01f21745268c4618b47faaee4a2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131440 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/main0200.xhp b/source/text/swriter/main0200.xhp index 5210fb8a7..d895fac1b 100644 --- a/source/text/swriter/main0200.xhp +++ b/source/text/swriter/main0200.xhp @@ -49,7 +49,7 @@ - + diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index 8df1b7ff9..195b569a1 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -30,7 +30,7 @@ - + OLE-Object Bar The OLE-Object bar appears when objects are selected, and contains the most important functions for formatting and positioning objects.
[Libreoffice-commits] core.git: editeng/source sal/rtl
editeng/source/items/numitem.cxx |8
sal/rtl/digest.cxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b3bd864f7c05c3c794b431dea2ec91ad459812e7
Author: Deep17
AuthorDate: Mon Mar 14 00:32:10 2022 -0400
Commit: Hossein
CommitDate: Fri Mar 18 16:30:29 2022 +0100
tdf#145614 Convert #define to enum or constexpr
Change-Id: Ie039a828b09aacc68ef2f95f495284d554122940
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131510
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c4220c78a4b5..f6d70cf723ac 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -53,11 +53,11 @@
#include
#include
-#define DEF_WRITER_LSPACE 500 //Standard Indentation
-#define DEF_DRAW_LSPACE 800 //Standard Indentation
+constexpr sal_Int32 DEF_WRITER_LSPACE = 500; //Standard Indentation
+constexpr sal_Int32 DEF_DRAW_LSPACE = 800; //Standard Indentation
-#define NUMITEM_VERSION_030x03
-#define NUMITEM_VERSION_040x04
+constexpr sal_uInt16 NUMITEM_VERSION_03 = 0x03;
+constexpr sal_uInt16 NUMITEM_VERSION_04 = 0x04;
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index ed545ae87bb8..d01e82cfcf38 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -176,8 +176,8 @@ void SAL_CALL rtl_digest_destroy(rtlDigest Digest)
SAL_THROW_EXTERN_C()
pImpl->m_delete(Digest);
}
-#define DIGEST_CBLOCK_MD2 16
-#define DIGEST_LBLOCK_MD2 16
+constexpr sal_uInt8 DIGEST_CBLOCK_MD2 = 16;
+constexpr sal_uInt8 DIGEST_LBLOCK_MD2 = 16;
namespace {
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 48aaca5ba9c27a247ed502c3db827c6ac9f34df9
Author: Lemures Lemniscati
AuthorDate: Thu Mar 17 18:44:39 2022 +0100
Commit: Caolán McNamara
CommitDate: Fri Mar 18 16:16:44 2022 +0100
tdf#148033: Loss of precision in /MediaBox (PDFWriterImpl::emitCatalog())
License statement provided here:
https://bugs.documentfoundation.org/show_bug.cgi?id=148033#c4
Change-Id: I9a17d4a6a266fc25a92abf50c22cb01a2b1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131716
(cherry picked from commit fb48a6408a515057a03c485bf00df5c34706595b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131603
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 0a971622d5bc..e69accc8f6cb 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4539,8 +4539,8 @@ bool PDFWriterImpl::emitCatalog()
aLine.append( getResourceDictObj() );
aLine.append( " 0 R\n" );
-sal_Int32 nMediaBoxWidth = 0;
-sal_Int32 nMediaBoxHeight = 0;
+double nMediaBoxWidth = 0;
+double nMediaBoxHeight = 0;
sal_Int32 nUserUnit = 1;
if( m_aPages.empty() ) // sanity check, this should not happen
{
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/region.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 0f31597dcc144cbb9c7dead9a6f2154ba1c044e6
Author: Caolán McNamara
AuthorDate: Fri Mar 18 11:48:52 2022 +
Commit: Caolán McNamara
CommitDate: Fri Mar 18 16:15:31 2022 +0100
ofz: Timeout in clipPolyPolygonOnPolyPolygon
Change-Id: I4257cd7133b29a2f5ae3407a5284965eb0814462
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131737
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 22f2c3acc885..7567bd08d5bf 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
namespace
{
@@ -1570,6 +1571,13 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region&
rRegion)
{
tools::PolyPolygon aNewPoly;
ReadPolyPolygon(rIStrm, aNewPoly);
+const auto nPolygons = aNewPoly.Count();
+if (nPolygons > 128)
+{
+SAL_WARN("vcl.gdi", "suspicously high no of polygons
in clip:" << nPolygons);
+if (utl::ConfigManager::IsFuzzing())
+aNewPoly.Clear();
+}
rRegion.mpPolyPolygon = aNewPoly;
}
}
[Libreoffice-commits] core.git: stoc/source
stoc/source/typeconv/convert.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 9074f5602a9b0b51349647f29d8537256217ebe7
Author: Stephan Bergmann
AuthorDate: Fri Mar 18 14:12:56 2022 +0100
Commit: Stephan Bergmann
CommitDate: Fri Mar 18 15:33:50 2022 +0100
tdf#148063: Avoid dereferencing potentially bad user-supplied
TypeDescription
...from Basic script
> sub foo
> a = Array()
> oUnoValue = CreateUnoValue( "[]", a )
> end sub
at
> Thread 1 "soffice.bin" received signal SIGSEGV, Segmentation fault.
> 0x7fffc413b2db in stoc_tcv::(anonymous
namespace)::TypeConverter_Impl::convertTo (this=0x3269200,
rVal=uno::Any("[]any": empty uno::Sequence), aDestType=invalid uno::Type) at
stoc/source/typeconv/convert.cxx:537
> 537 reinterpret_cast(aDestTD.get())->pType );
> (gdb) bt
> #0 0x7fffc413b2db in stoc_tcv::(anonymous
namespace)::TypeConverter_Impl::convertTo(com::sun::star::uno::Any const&,
com::sun::star::uno::Type const&) (this=0x3269200, rVal=uno::Any("[]any": empty
uno::Sequence), aDestType=invalid uno::Type) at
stoc/source/typeconv/convert.cxx:537
> #1 0x7fffc413d144 in non-virtual thunk to stoc_tcv::(anonymous
namespace)::TypeConverter_Impl::convertTo(com::sun::star::uno::Any const&,
com::sun::star::uno::Type const&) () at instdir/program/libstocserviceslo.so
> #2 0x74fe0264 in convertAny(com::sun::star::uno::Any const&,
com::sun::star::uno::Type const&) (rVal=uno::Any("[]any": empty uno::Sequence),
aDestType=invalid uno::Type) at basic/source/classes/sbunoobj.cxx:324
> #3 0x74fdfe79 in RTL_Impl_CreateUnoValue(SbxArray&) (rPar=...)
at basic/source/classes/sbunoobj.cxx:4157
> #4 0x7513b1b0 in SbRtl_CreateUnoValue(StarBASIC*, SbxArray&,
bool) (rPar=...) at basic/source/runtime/methods1.cxx:1403
> #5 0x750ea80e in SbiStdObject::Notify(SfxBroadcaster&, SfxHint
const&) (this=0x2003400, rBC=..., rHint=...) at
basic/source/runtime/stdobj.cxx:1059
> #6 0x73decfae in SfxBroadcaster::Broadcast(SfxHint const&)
(this=0x3329e90, rHint=...) at svl/source/notify/SfxBroadcaster.cxx:39
> #7 0x7518e772 in SbxVariable::Broadcast(SfxHintId)
(this=0x31e8f60, nHintId=SfxHintId::BasicDataWanted) at
basic/source/sbx/sbxvar.cxx:151
> #8 0x75186d4f in SbxValue::SbxValue(SbxValue const&)
(this=0x31ff450, vtt=0x751ae718 , r=...) at
basic/source/sbx/sbxvalue.cxx:66
> #9 0x7518d291 in SbxVariable::SbxVariable(SbxVariable const&)
(this=0x31ff450, vtt=0x751ae710 , r=...) at
basic/source/sbx/sbxvar.cxx:45
> #10 0x7517d44a in SbxMethod::SbxMethod(SbxMethod const&)
(this=0x31ff450, r=...) at basic/source/sbx/sbxobj.cxx:838
> #11 0x7510386b in SbiRuntime::FindElement(SbxObject*, unsigned
int, unsigned int, ErrCode, bool, bool) (this=0x2d6f400, pObj=0x2003400,
nOp1=32773, nOp2=9, nNotFound=..., bLocal=false, bStatic=false) at
basic/source/runtime/runtime.cxx:3709
> #12 0x750f5a91 in SbiRuntime::StepRTL(unsigned int, unsigned int)
(this=0x2d6f400, nOp1=32773, nOp2=9) at basic/source/runtime/runtime.cxx:4131
> #13 0x750faef8 in SbiRuntime::Step() (this=0x2d6f400) at
basic/source/runtime/runtime.cxx:830
[...]
Change-Id: I552f0360aaf3f9aa6a499aa5ea6eca9ae37e4614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131739
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 2f87b4f42500..1b50c94494fb 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -527,6 +527,17 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any&
rVal, const Type& aDestTy
TypeDescription aSourceTD( aSourceType );
TypeDescription aDestTD( aDestType );
+// For a sequence type notation "[]...", SequenceTypeDescription in
+// cppuhelper/source/typemanager.cxx resolves the "..." component
type notation part
+// only lazily, so it could happen here that bad user input (e.g.,
"[]" or "[]foo" from
+// a Basic script CreateUnoValue call) leads to a bad but
as-of-yet undetected
+// aDestType, so check it here; this is less likely an issue for
the non-sequence type
+// classes, whose notation is not resolved lazily based on their
syntax:
+if (!aDestTD.is()) {
+throw css::lang::IllegalArgumentException(
+"Bad XTypeConverter::convertTo destination " +
aDestType.getTypeName(),
+static_cast(this), 1);
+}
typelib_TypeDescription * pSourceElementTD = nullptr;
TYPELIB_DANGER_GET(
&pSourceElementTD,
[Libreoffice-commits] core.git: sd/source svx/source sw/source
sd/source/ui/annotations/annotationwindow.cxx |4 +--- svx/source/dialog/weldeditview.cxx|4 +--- sw/source/uibase/docvw/SidebarTxtControl.cxx |2 -- 3 files changed, 2 insertions(+), 8 deletions(-) New commits: commit cfa5489982a84f847d86b8bf8ce49b25e033ed48 Author: Michael Weghorn AuthorDate: Fri Mar 18 14:17:28 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Mar 18 15:28:44 2022 +0100 WeldEditView: Just pass new Size object as param Just pass `aOutputSize` as parameter instead of assigning that to `aSize` again and then passing that one as parameter in `WeldEditView::SetDrawingArea` and overrides in derived classes. `aSize.setHeight(aSize.Height())` can just be dropped as an overly complicated way of keeping the height as it is. In `SidebarTextControl::SetDrawingArea`, `aOutputSize` was already passed as param, so the new value of `aSize` was ignored anyway. Change-Id: I23192d3c5c85e4371a48774b3b8f854beb751b82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131741 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 42ebe77c306f..6c1210575915 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -188,14 +188,12 @@ void AnnotationTextWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) rDevice.SetBackground(aBgColor); Size aOutputSize(rDevice.PixelToLogic(aSize)); -aSize = aOutputSize; -aSize.setHeight(aSize.Height()); EditView* pEditView = GetEditView(); pEditView->setEditViewCallbacks(this); EditEngine* pEditEngine = GetEditEngine(); -pEditEngine->SetPaperSize(aSize); +pEditEngine->SetPaperSize(aOutputSize); pEditEngine->SetRefDevice(&rDevice); pEditView->SetOutputArea(::tools::Rectangle(Point(0, 0), aOutputSize)); diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index d3f3c3f79c9e..42eb22c12223 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -1554,11 +1554,9 @@ void WeldEditView::SetDrawingArea(weld::DrawingArea* pDrawingArea) rDevice.SetBackground(aBgColor); Size aOutputSize(rDevice.PixelToLogic(aSize)); -aSize = aOutputSize; -aSize.setHeight(aSize.Height()); makeEditEngine(); -m_xEditEngine->SetPaperSize(aSize); +m_xEditEngine->SetPaperSize(aOutputSize); m_xEditEngine->SetRefDevice(&rDevice); m_xEditEngine->SetControlWord(m_xEditEngine->GetControlWord() | EEControlBits::MARKFIELDS); diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index fecaf6aafef3..8502601e8b1e 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -107,8 +107,6 @@ void SidebarTextControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) rDevice.SetBackground(aBgColor); Size aOutputSize(rDevice.PixelToLogic(aSize)); -aSize = aOutputSize; -aSize.setHeight(aSize.Height()); EditView* pEditView = GetEditView(); pEditView->setEditViewCallbacks(this);
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - hwpfilter/source lotuswordpro/source
hwpfilter/source/hwpread.cxx |1 + lotuswordpro/source/filter/lwpdrawobj.cxx |6 +- 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 0c5048143054e973f5cb945ddd61d50fa1aac0ab Author: Michael Stahl AuthorDate: Fri Mar 11 17:29:41 2022 +0100 Commit: Michael Stahl CommitDate: Fri Mar 18 15:19:24 2022 +0100 hwpfilter: why isn't that path string null terminated Change-Id: Iaedc23bd91d0d46e34d55dcc65760b73c5772b7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131559 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 4c86ed851bc1c0a2414e254082064760c99437f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131589 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit dc566a7f687a728311490b5f4f624897f0aefd1d) diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index 1ef27f7c243f..7e0564b187a4 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -426,6 +426,7 @@ bool Picture::Read(HWPFile & hwpf) scale[1] = tmp16; hwpf.ReadBlock(picinfo.picun.path, 256); /* Picture File Name: when type is not a Drawing. */ +picinfo.picun.path[255] = 0; // ensure null terminated hwpf.ReadBlock(reserved3, 9); /* Brightness / Contrast / Picture Effect, etc. */ UpdateBBox(this); commit 72090be467eda13587964c25a0c125572f440a1e Author: Caolán McNamara AuthorDate: Sun Mar 13 10:48:47 2022 + Commit: Michael Stahl CommitDate: Fri Mar 18 15:19:18 2022 +0100 ofz#45524 string is presumed to be at least length 1 Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131468 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit eca150aeb9254a3c04d15be5a6278c2c65bf3fb0) diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 742e38f82c24..d1e496481c3d 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1255,7 +1255,11 @@ void LwpDrawTextArt::Read() - (m_aTextArtRec.aPath[1].n*3 + 1)*4; -if (!m_pStream->good() || m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +if (!m_pStream->good()) +throw BadRead(); +if (m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +throw BadRead(); +if (m_aTextArtRec.nTextLen < 1) throw BadRead(); m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 4 commits - fpicker/source hwpfilter/source lotuswordpro/source svtools/source
fpicker/source/office/fileview.cxx | 10 +++---
hwpfilter/source/hwpread.cxx |1 +
lotuswordpro/source/filter/lwpdrawobj.cxx|6 +-
svtools/source/dialogs/ServerDetailsControls.cxx |2 ++
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit a291c5a4912c09fe1e774b8dae104de65a21acb6
Author: Caolán McNamara
AuthorDate: Wed Nov 24 20:27:48 2021 +
Commit: Michael Stahl
CommitDate: Fri Mar 18 15:17:31 2022 +0100
tdf#145842 canceling remote file delete makes file disappear from treeview
we remove the selected entries from the treeview, so the user cancel's
the deletion of an entry we should unselect it from the candidates to
remove.
and...
Related: tdf#145842 fix a crash after deleting an entry
delete an entry in remote files dialog and go one level up and crash,
ownership of the SvtContentEntry is not with the entry, but belongs
to mpImpl->maEntries
Change-Id: Ieb2258960fc647ad15d8f315a18454a0dae8a420
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125793
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 9d13202243b26d507b61eb4a787d1df2ce037e21)
diff --git a/fpicker/source/office/fileview.cxx
b/fpicker/source/office/fileview.cxx
index 5b65eb1295cf..64dee0ee6239 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -636,16 +636,20 @@ void ViewTabListBox_Impl::DeleteEntries()
eResult = aDlg.run();
}
-if ( ( eResult == svtools::QUERYDELETE_ALL ) ||
- ( eResult == svtools::QUERYDELETE_YES ) )
+bool bDeleted = false;
+
+if (eResult == svtools::QUERYDELETE_ALL || eResult ==
svtools::QUERYDELETE_YES)
{
if ( Kill( aURL ) )
{
-delete
reinterpret_cast(mxTreeView->get_id(rCurEntry).toInt64());
mpParent->EntryRemoved( aURL );
+bDeleted = true;
}
}
+if (!bDeleted)
+mxTreeView->unselect(rCurEntry);
+
return false;
});
commit f8870c8a053ea021a4ad8598851a120b02620bb5
Author: Caolán McNamara
AuthorDate: Wed Nov 24 17:07:29 2021 +
Commit: Michael Stahl
CommitDate: Fri Mar 18 15:17:10 2022 +0100
Resolves: tdf#145840 call ToggledDavsHdl on setting checkbox state
Change-Id: Ia2a735255b94fd3a097081950e2145e07b4b3b63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125723
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit b23a16ff513369b6bf1f534a387d911b6336c9c8)
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx
b/svtools/source/dialogs/ServerDetailsControls.cxx
index bfbc2e21593b..b3724f87ee00 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -175,11 +175,13 @@ bool DavDetailsContainer::verifyScheme( const OUString&
rScheme )
{
bValid = true;
m_pDialog->m_xCBDavs->set_active(false);
+ToggledDavsHdl(*m_pDialog->m_xCBDavs);
}
else if ( rScheme == "https://"; )
{
bValid = true;
m_pDialog->m_xCBDavs->set_active(true);
+ToggledDavsHdl(*m_pDialog->m_xCBDavs);
}
return bValid;
}
commit 558b947318caeb97f3ef9a54e0f79fc96cb43187
Author: Michael Stahl
AuthorDate: Fri Mar 11 17:29:41 2022 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 18 15:16:01 2022 +0100
hwpfilter: why isn't that path string null terminated
Change-Id: Iaedc23bd91d0d46e34d55dcc65760b73c5772b7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131559
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 4c86ed851bc1c0a2414e254082064760c99437f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131589
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit dc566a7f687a728311490b5f4f624897f0aefd1d)
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 61c427ad836c..f450a98a6e87 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -453,6 +453,7 @@ bool Picture::Read(HWPFile & hwpf)
scale[1] = tmp16;
hwpf.ReadBlock(picinfo.picun.path, 256); /* Picture File Name: when
type is not a Drawing. */
+picinfo.picun.path[255] = 0; // ensure null terminated
hwpf.ReadBlock(reserved3, 9); /* Brightness / Contrast /
Picture Effect, etc. */
UpdateBBox(this);
commit dd7ee624349218d09ba03f6714d683b6a7d1125f
Author: Caolán McNamara
AuthorDate: Sun Mar 13 10:48:47 2022 +
Commit: Michael Stahl
CommitDate: Fri Mar 18 15:15:57 2022 +0100
ofz#45524 string is presumed to be at least length 1
Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490
Reviewed-on: https://gerrit.libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - qadevOOo/qa
qadevOOo/qa/registrymodifications.xcu |1 + 1 file changed, 1 insertion(+) New commits: commit 58f796e59a6c7301e85d687b99f39c96ff816de2 Author: Andras Timar AuthorDate: Fri Mar 18 15:06:23 2022 +0100 Commit: Andras Timar CommitDate: Fri Mar 18 15:06:54 2022 +0100 Disable ViewPDFAfterExport for unit tests - part 2 (UITests) Change-Id: I39d2be986c99ed107a59fd72a62730ece66c3d1b diff --git a/qadevOOo/qa/registrymodifications.xcu b/qadevOOo/qa/registrymodifications.xcu index 3ac099ff7f1e..f426a02f27f8 100644 --- a/qadevOOo/qa/registrymodifications.xcu +++ b/qadevOOo/qa/registrymodifications.xcu @@ -8,4 +8,5 @@ en-US en en-US +false
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a4f58bcd76c2c5824b014efb35ed818907527b8 Author: Johnny_M AuthorDate: Fri Mar 18 14:55:13 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:55:13 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to af54aee36936ee0a00ba384b6a2f68b482787103 - tdf#132643 Translate German section IDs Change-Id: Ib22f113740fd2b705df3b4338453d325739c20f5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131439 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b19c37e8c418..af54aee36936 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b19c37e8c418e90ae419f596969e4fa897077d7d +Subproject commit af54aee36936ee0a00ba384b6a2f68b482787103
[Libreoffice-commits] help.git: source/text
source/text/swriter/main0200.xhp |2 +- source/text/swriter/main0213.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit af54aee36936ee0a00ba384b6a2f68b482787103 Author: Johnny_M AuthorDate: Sat Mar 12 12:59:23 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:55:12 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ib22f113740fd2b705df3b4338453d325739c20f5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131439 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/main0200.xhp b/source/text/swriter/main0200.xhp index 246c918a3..5210fb8a7 100644 --- a/source/text/swriter/main0200.xhp +++ b/source/text/swriter/main0200.xhp @@ -73,7 +73,7 @@ - + diff --git a/source/text/swriter/main0213.xhp b/source/text/swriter/main0213.xhp index 540487ce8..c59b373e1 100644 --- a/source/text/swriter/main0213.xhp +++ b/source/text/swriter/main0213.xhp @@ -32,7 +32,7 @@ - + Rulers Rulers display the dimensions of the page, and the position of tabs, indents, borders and columns. You can modify all of these on the rulers using the mouse.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8fb1676342cb228f9a3cbfe9603b74555dd7aeee Author: Johnny_M AuthorDate: Fri Mar 18 14:54:15 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:54:15 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b19c37e8c418e90ae419f596969e4fa897077d7d - tdf#132643 Translate German section IDs Change-Id: I9586b4e55c96ed7587246a923524d34ffa26be16 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131438 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2e18bd4f9f40..b19c37e8c418 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2e18bd4f9f40f51745b23ddb9aaa6740d5707771 +Subproject commit b19c37e8c418e90ae419f596969e4fa897077d7d
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |2 +- source/text/swriter/main0215.xhp|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b19c37e8c418e90ae419f596969e4fa897077d7d Author: Johnny_M AuthorDate: Sat Mar 12 12:56:54 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:54:05 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I9586b4e55c96ed7587246a923524d34ffa26be16 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131438 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 81cc8d93f..4ca02f968 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -355,7 +355,7 @@ - + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index a78b2db80..349205342 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -68,7 +68,7 @@ Frame Properties - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7dd3b5c423de3d259fbbfea5acd67784612dc95 Author: Johnny_M AuthorDate: Fri Mar 18 14:53:17 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:53:17 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 2e18bd4f9f40f51745b23ddb9aaa6740d5707771 - tdf#132643 Translate German section IDs Change-Id: I0a6ae497bf145ad4d6c6d30a83d2153a8350ea4a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131436 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14a3f2ff9c37..2e18bd4f9f40 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14a3f2ff9c37fb6899eae197cb94f50e1ffe7ee0 +Subproject commit 2e18bd4f9f40f51745b23ddb9aaa6740d5707771
[Libreoffice-commits] help.git: source/text
source/text/shared/main0204.xhp |2 +- source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/05120500.xhp |2 +- source/text/swriter/main0204.xhp|2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 2e18bd4f9f40f51745b23ddb9aaa6740d5707771 Author: Johnny_M AuthorDate: Sat Mar 12 12:50:08 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:53:13 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I0a6ae497bf145ad4d6c6d30a83d2153a8350ea4a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131436 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp index d51a985d5..74ce6058e 100644 --- a/source/text/shared/main0204.xhp +++ b/source/text/shared/main0204.xhp @@ -60,7 +60,7 @@ Delete Column - + following only optional, ext.help is available: Select Table Select Column Select Row Table Design diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index f812abab8..81cc8d93f 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -322,10 +322,10 @@ - + Choose Table - Delete - Columns. On Table bar, click - + diff --git a/source/text/swriter/01/05120500.xhp b/source/text/swriter/01/05120500.xhp index 843a60ca0..c02e36509 100644 --- a/source/text/swriter/01/05120500.xhp +++ b/source/text/swriter/01/05120500.xhp @@ -38,7 +38,7 @@ This command is only available if the cursor is in a table. - + diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index e0477b318..ff0fb219e 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -60,7 +60,7 @@ Delete Column - + following only optional, ext.help is available: Select Table Select Column Select Row AutoFormat
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be42eeb21d2ae4e11dbfc272fbb900a0ce28bdf4 Author: Johnny_M AuthorDate: Fri Mar 18 14:52:03 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:52:03 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 14a3f2ff9c37fb6899eae197cb94f50e1ffe7ee0 - tdf#132643 Translate German section IDs Change-Id: I14163e5b63027d4c6f4178e9db55369e383425a8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131437 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1cc1e063e407..14a3f2ff9c37 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1cc1e063e4079cd2f1cd8712f68ae546b85521ae +Subproject commit 14a3f2ff9c37fb6899eae197cb94f50e1ffe7ee0
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/0508.xhp |2 +- source/text/swriter/main0216.xhp|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 14a3f2ff9c37fb6899eae197cb94f50e1ffe7ee0 Author: Johnny_M AuthorDate: Sat Mar 12 12:54:07 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:51:58 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I14163e5b63027d4c6f4178e9db55369e383425a8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131437 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index aa9218ecb..f812abab8 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -339,9 +339,9 @@ - + Choose Format - Frame and Object - Properties. - + diff --git a/source/text/swriter/01/0508.xhp b/source/text/swriter/01/0508.xhp index 10e6408d8..b1db1114d 100644 --- a/source/text/swriter/01/0508.xhp +++ b/source/text/swriter/01/0508.xhp @@ -33,7 +33,7 @@ Opens a dialog where you can modify the properties of the selected object, for example, its size and name. - + diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index b1790714a..8df1b7ff9 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -69,7 +69,7 @@ Object Properties - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e8f5f3f57478c157677e8a515d25bd47790ce00 Author: Johnny_M AuthorDate: Fri Mar 18 14:50:52 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:50:52 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 1cc1e063e4079cd2f1cd8712f68ae546b85521ae - tdf#132643 Translate German section IDs Change-Id: I2301032cce30fa40dbaea24f8e90c068586e49e7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131435 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3afad289ad1f..1cc1e063e407 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3afad289ad1faf5b556f724b9ef0c610f5b95264 +Subproject commit 1cc1e063e4079cd2f1cd8712f68ae546b85521ae
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |2 +- source/text/swriter/01/05120400.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 1cc1e063e4079cd2f1cd8712f68ae546b85521ae Author: Johnny_M AuthorDate: Sat Mar 12 12:46:28 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:50:49 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I2301032cce30fa40dbaea24f8e90c068586e49e7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131435 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 06edab27c..aa9218ecb 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -298,7 +298,7 @@ Choose Table - Select - Column. - + Choose Table - Insert - Columns. Choose Table - Insert - Rows. On Table bar, click diff --git a/source/text/swriter/01/05120400.xhp b/source/text/swriter/01/05120400.xhp index 476e7cd77..6c7b8955c 100644 --- a/source/text/swriter/01/05120400.xhp +++ b/source/text/swriter/01/05120400.xhp @@ -38,7 +38,7 @@ Inserts a row or column into the table. This command is only available when the cursor is in a table. - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 890d2166f0966f4b2b60c9b6f8affb4237a58e79 Author: Johnny_M AuthorDate: Fri Mar 18 14:50:18 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 14:50:18 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3afad289ad1faf5b556f724b9ef0c610f5b95264 - tdf#132643 Translate German section IDs Change-Id: I527837a7ac78b411ed61f34e9d4c76b786c0b237 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131434 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7069eb7f582c..3afad289ad1f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7069eb7f582ca21299bfd3cc7f5decfa402725c0 +Subproject commit 3afad289ad1faf5b556f724b9ef0c610f5b95264
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0421.xhp |2 +- source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/05120200.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 3afad289ad1faf5b556f724b9ef0c610f5b95264 Author: Johnny_M AuthorDate: Sat Mar 12 12:43:37 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 14:50:16 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I527837a7ac78b411ed61f34e9d4c76b786c0b237 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131434 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0421.xhp b/source/text/shared/02/0421.xhp index 8ac5fdb67..33f6771fc 100644 --- a/source/text/shared/02/0421.xhp +++ b/source/text/shared/02/0421.xhp @@ -54,7 +54,7 @@ Optimal Column Width - + diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 3ad0907b2..06edab27c 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -263,10 +263,10 @@ In the context menu of a cell, choose Column. In the context menu of a cell, choose Column - Width. - + Choose Table - Autofit - Optimal Column Width. Open Optimize Size toolbar from Table bar, click - + diff --git a/source/text/swriter/01/05120200.xhp b/source/text/swriter/01/05120200.xhp index 02b38962b..47b2b784a 100644 --- a/source/text/swriter/01/05120200.xhp +++ b/source/text/swriter/01/05120200.xhp @@ -36,7 +36,7 @@ The change affects only selected cells. You can adjust multiple cells next to each other if you select the cells together. - +
Re: libreoffice-7.3.2 compile in arm system
On 18/03/2022 05.50, gcxyw1314 wrote: dear all： https://paste.debian.net/1234705/ By now, that says: > Entry not found > The requested entry isn't in our database. That usually means it > expired or has been deleted by the author. Can you paste again, and set the expiration time to 90 days or "never"? Does the same happen with current git master?
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f3f71cc3470b9d15ae5e35eb206040897e74135
Author: Michael Weghorn
AuthorDate: Fri Mar 18 13:29:25 2022 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 18 14:39:37 2022 +0100
gtk3 a11y: Rename drawing_area_get_accessib{ity -> le}
"...get_accessibity" looks like a typo, but
"...get_accessible" fits the naming scheme better
anyway.
Change-Id: Ie71ade5bb2ef58ac23ecff0efa5adaae792a9620
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131738
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a16c6cc7f75f..117c5c88a788 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22437,7 +22437,7 @@ IMPL_LINK_NOARG(GtkInstancePopover,
async_signal_closed, void*, void)
namespace
{
-AtkObject* drawing_area_get_accessibity(GtkWidget *pWidget)
+AtkObject* drawing_area_get_accessible(GtkWidget *pWidget)
{
AtkObject* pDefaultAccessible =
default_drawing_area_get_accessible(pWidget);
void* pData = g_object_get_data(G_OBJECT(pWidget),
"g-lo-GtkInstanceDrawingArea");
@@ -22456,7 +22456,7 @@ void ensure_intercept_drawing_area_accessibility()
gpointer pClass = g_type_class_ref(GTK_TYPE_DRAWING_AREA);
GtkWidgetClass* pWidgetClass = GTK_WIDGET_CLASS(pClass);
default_drawing_area_get_accessible = pWidgetClass->get_accessible;
-pWidgetClass->get_accessible = drawing_area_get_accessibity;
+pWidgetClass->get_accessible = drawing_area_get_accessible;
g_type_class_unref(pClass);
bDone = true;
}
libreoffice-7.3.2 compile in arm system
dear all： https://paste.debian.net/1234705/ 103 / 5,000 翻译结果 I have added template class ::cppu::WeakImplHelper< css::io::XInputStream >;in file xmloff/source/core/xmlimp.cxx help all
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08090c81d84f2cdb846e120305638abf0abdc800 Author: Johnny_M AuthorDate: Fri Mar 18 13:54:44 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:54:44 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 7069eb7f582ca21299bfd3cc7f5decfa402725c0 - tdf#132643 Translate German section IDs Change-Id: If85502fdc918d3b2814231faeb69211ad2d7bc82 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131433 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8d4cb0152bed..7069eb7f582c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8d4cb0152bed3af90c4d2a09e35e472382213dee +Subproject commit 7069eb7f582ca21299bfd3cc7f5decfa402725c0
[Libreoffice-commits] help.git: source/text
source/text/shared/main0204.xhp |2 +- source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/05110500.xhp |2 +- source/text/swriter/main0204.xhp|2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 7069eb7f582ca21299bfd3cc7f5decfa402725c0 Author: Johnny_M AuthorDate: Sat Mar 12 12:39:59 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:54:36 2022 +0100 tdf#132643 Translate German section IDs Change-Id: If85502fdc918d3b2814231faeb69211ad2d7bc82 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131433 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp index 936e829a3..d51a985d5 100644 --- a/source/text/shared/main0204.xhp +++ b/source/text/shared/main0204.xhp @@ -57,7 +57,7 @@ Delete Row - + Delete Column diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 9fbc0d0c1..3ad0907b2 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -244,10 +244,10 @@ Choose Table - Select - Row. - + Choose Table - Delete - Rows. On Table bar, click - + diff --git a/source/text/swriter/01/05110500.xhp b/source/text/swriter/01/05110500.xhp index 1810c3f47..f46d86b04 100644 --- a/source/text/swriter/01/05110500.xhp +++ b/source/text/swriter/01/05110500.xhp @@ -37,7 +37,7 @@ - + diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index 1b9443572..e0477b318 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -57,7 +57,7 @@ Delete Row - + Delete Column
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d30c444314c7fdd36ab5967771c8474f33772f2b Author: Johnny_M AuthorDate: Fri Mar 18 13:53:47 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:53:47 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 8d4cb0152bed3af90c4d2a09e35e472382213dee - tdf#132643 Translate German section IDs Change-Id: Iafd82777eddf78a2d581f40dc7d94fed79929326 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131432 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c88ef67ff090..8d4cb0152bed 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c88ef67ff0902af8446b02529155268a892cd1f1 +Subproject commit 8d4cb0152bed3af90c4d2a09e35e472382213dee
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0421.xhp |2 +- source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/05110200.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8d4cb0152bed3af90c4d2a09e35e472382213dee Author: Johnny_M AuthorDate: Sat Mar 12 12:36:27 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:53:43 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Iafd82777eddf78a2d581f40dc7d94fed79929326 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131432 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0421.xhp b/source/text/shared/02/0421.xhp index be18750fb..8ac5fdb67 100644 --- a/source/text/shared/02/0421.xhp +++ b/source/text/shared/02/0421.xhp @@ -51,7 +51,7 @@ Optimal Height - + Optimal Column Width diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index c6e78eaf2..9fbc0d0c1 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -209,10 +209,10 @@ In the context menu of a cell, choose Row. In the context menu of a cell, choose Row - Height. - + Choose Table - Autofit - Optimal Row Height. Open Optimize Size toolbar from Table bar, click - + diff --git a/source/text/swriter/01/05110200.xhp b/source/text/swriter/01/05110200.xhp index b59428f02..da7745128 100644 --- a/source/text/swriter/01/05110200.xhp +++ b/source/text/swriter/01/05110200.xhp @@ -36,7 +36,7 @@ Optimal Height Automatically adjusts row heights to match the contents of the cells. This is the default setting for new tables. - + This option is only available if the table contains a row with a fixed height.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aeee02a72b508977833ce024420460e9991486ba Author: Johnny_M AuthorDate: Fri Mar 18 13:26:14 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:26:14 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c88ef67ff0902af8446b02529155268a892cd1f1 - tdf#132643 Translate German section IDs Change-Id: I3f57be7c55f9376948f51a316646bf839685bd80 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131431 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e0b454a0e8d1..c88ef67ff090 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e0b454a0e8d1bd824f67a07f53192a700247976f +Subproject commit c88ef67ff0902af8446b02529155268a892cd1f1
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |2 +- source/text/swriter/01/05060700.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c88ef67ff0902af8446b02529155268a892cd1f1 Author: Johnny_M AuthorDate: Sat Mar 12 12:31:32 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:26:10 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I3f57be7c55f9376948f51a316646bf839685bd80 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131431 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 21b56e695..c6e78eaf2 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -154,7 +154,7 @@ Choose Insert - Frame - Frame - Options tab. Choose Format - Image - Properties - Image tab. - + Choose Insert/Format - Image - Properties - Macro tab. Choose Format - Frame and Object - Properties - Macro tab. Choose Tools - AutoText - AutoText (button) - Macro. diff --git a/source/text/swriter/01/05060700.xhp b/source/text/swriter/01/05060700.xhp index ebbcaa156..0d5731518 100644 --- a/source/text/swriter/01/05060700.xhp +++ b/source/text/swriter/01/05060700.xhp @@ -37,7 +37,7 @@ Specifies the macro to run when you click an image, frame, or an OLE object. - + Event
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 318eb8b79d7fa5782da1bc4a502ee119950157ac Author: Johnny_M AuthorDate: Fri Mar 18 13:25:29 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:25:29 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e0b454a0e8d1bd824f67a07f53192a700247976f - tdf#132643 Translate German section IDs Change-Id: Ie8b8cd42cc943a853170531f932273b65e360d6f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131428 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3c08f9ca2f92..e0b454a0e8d1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3c08f9ca2f921f8994aad1e8956b15c525668934 +Subproject commit e0b454a0e8d1bd824f67a07f53192a700247976f
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |4 ++-- source/text/swriter/01/0506.xhp |2 +- source/text/swriter/main0203.xhp|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e0b454a0e8d1bd824f67a07f53192a700247976f Author: Johnny_M AuthorDate: Sat Mar 12 12:23:19 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:25:25 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ie8b8cd42cc943a853170531f932273b65e360d6f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131428 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index b17758e6a..21b56e695 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -112,10 +112,10 @@ Choose Tools - AutoCorrect - Apply. Choose Tools - AutoCorrect - Apply and Edit Changes. Choose Table - AutoFormat Styles (with cursor in a table). - + Choose Format - Image - Properties - Area tab. On the Image bar (when images are selected), click - + diff --git a/source/text/swriter/01/0506.xhp b/source/text/swriter/01/0506.xhp index 6f61d8050..f8cf380da 100644 --- a/source/text/swriter/01/0506.xhp +++ b/source/text/swriter/01/0506.xhp @@ -33,7 +33,7 @@ You can also change some of the properties of the selected image with shortcut keys. - + The Image dialog contains the following tab pages: diff --git a/source/text/swriter/main0203.xhp b/source/text/swriter/main0203.xhp index d09f105ea..5180db61c 100644 --- a/source/text/swriter/main0203.xhp +++ b/source/text/swriter/main0203.xhp @@ -31,6 +31,6 @@ Flip Vertically Flip Horizontally -Graphics Properties +Graphics Properties
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94aedc6aa30a47402d3c49fdb415a56d98957a45 Author: Johnny_M AuthorDate: Fri Mar 18 13:24:26 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:24:26 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3c08f9ca2f921f8994aad1e8956b15c525668934 - tdf#132643 Translate German section IDs Change-Id: I484aaae6574871e5fd4171581318fbc83752b8ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131430 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 71f848d75265..3c08f9ca2f92 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 71f848d75265dbe7604af1b6aa170dc1aee11a89 +Subproject commit 3c08f9ca2f921f8994aad1e8956b15c525668934
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |2 +- source/text/swriter/01/05060900.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3c08f9ca2f921f8994aad1e8956b15c525668934 Author: Johnny_M AuthorDate: Sat Mar 12 12:29:01 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:24:23 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I484aaae6574871e5fd4171581318fbc83752b8ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131430 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index e93438e4e..b17758e6a 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -147,7 +147,7 @@ Choose Format - Frame and Object - Properties - Hyperlink tab. Choose Insert - Frame - Frame - Hyperlink tab. - + Choose Format - Image - Properties - Options tab. Choose Format - Frame and Object - Properties - Options tab. Choose View - Styles -open context menu Modify/New - Options tab. diff --git a/source/text/swriter/01/05060900.xhp b/source/text/swriter/01/05060900.xhp index 4014cac49..74037541a 100644 --- a/source/text/swriter/01/05060900.xhp +++ b/source/text/swriter/01/05060900.xhp @@ -36,7 +36,7 @@ Specifies properties for the selected object, graphic or frame. - + Name Specifies the name of the selected item, and associated links.
[Libreoffice-commits] core.git: 2 commits - chart2/source editeng/source include/vcl sc/source svx/source vcl/source
chart2/source/controller/accessibility/AccessibleBase.cxx | 23 +++-
chart2/source/controller/inc/AccessibleBase.hxx |6 ---
editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 --
include/vcl/unohelp.hxx |1
sc/source/ui/Accessibility/AccessibleContextBase.cxx|4 --
svx/source/accessibility/AccessibleTextHelper.cxx |4 --
vcl/source/app/unohelp.cxx | 19 -
7 files changed, 8 insertions(+), 53 deletions(-)
New commits:
commit dadc8a8771645d475b6287dd4c65b88cdad81d93
Author: Michael Weghorn
AuthorDate: Fri Mar 18 12:01:06 2022 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 18 13:21:12 2022 +0100
a11y: Drop vcl::unohelper::NotifyAccessibleStateEventGlobally
As mentioned in
Change-Id I4681c28c9d18cf1953be5127765f4aa94563662d
("chart a11y: Drop bSendGlobally param from
AccessibleBase::BroadcastAccEvent"),
calling it has no effect, the `fireFocusGained` and
`fireFocusLost` methods of the `XExtendedToolkit`
interface in its only implementation
in `VCLXToolkit` do nothing, so just drop it.
Change-Id: Ie9352a4e4021d7bf0b35de71f55afc660795b906
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131736
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 22576523f9e6..cf605db6c4eb 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -560,10 +560,6 @@ namespace accessibility
AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
-// #102261# Call global queue for focus events
-if( nEventId == AccessibleEventId::STATE_CHANGED )
-vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
-
// #106234# Delegate to EventNotifier
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::addEvent(
getNotifierClientId(),
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 5ba919edd577..c7b9dcc06956 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -37,7 +37,6 @@ namespace vcl::unohelper
{
VCL_DLLPUBLIC css::uno::Reference < css::i18n::XBreakIterator >
CreateBreakIterator();
css::uno::Reference < css::i18n::XCharacterClassification>
CreateCharacterClassification();
-VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const
css::accessibility::AccessibleEventObject& rEventObject );
VCL_DLLPUBLIC float ConvertFontWidth( FontWidth eWidth );
VCL_DLLPUBLIC FontWidth ConvertFontWidth( float f );
VCL_DLLPUBLIC float ConvertFontWeight( FontWeight eWeight );
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 38620240baaf..cdbb5ea71494 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -474,8 +474,6 @@ void ScAccessibleContextBase::CommitFocusGained() const
aEvent.NewValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
-
-vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
void ScAccessibleContextBase::CommitFocusLost() const
@@ -486,8 +484,6 @@ void ScAccessibleContextBase::CommitFocusLost() const
aEvent.OldValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
-
-vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
tools::Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 046fec99224b..3331a88e552c 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1410,10 +1410,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject&
rEvent ) const
{
-// #102261# Call global queue for focus events
-if( rEvent.EventId == AccessibleStateType::FOCUSED )
-vcl::unohelper::NotifyAccessibleStateEventGlobally( rEvent );
-
// #106234# Delegate to EventNotifier
::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
rEvent );
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index f08e54131259..89b526c91ffa 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -45,25 +45,6 @@ uno::Reference < i18n::XCharacterClassification >
vcl::unohelper::CreateCharacte
return i18n::CharacterClassification::create(
comphelper::getProcessComponentContext() );
}
-void vcl::unohelper::N
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38bc4742af4f96d26b81bdc41e0361d83d8f1f66 Author: Johnny_M AuthorDate: Fri Mar 18 13:18:38 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:18:38 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 71f848d75265dbe7604af1b6aa170dc1aee11a89 - tdf#132643 Translate German section IDs Change-Id: Ic2f22070b53266a12fcd2216e3e39ae12a7f11eb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131429 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c629be9e6a24..71f848d75265 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c629be9e6a24d4d73d849ceadd6d7f7cbb838f40 +Subproject commit 71f848d75265dbe7604af1b6aa170dc1aee11a89
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |2 +- source/text/swriter/01/05060100.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 71f848d75265dbe7604af1b6aa170dc1aee11a89 Author: Johnny_M AuthorDate: Sat Mar 12 12:26:04 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:18:33 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ic2f22070b53266a12fcd2216e3e39ae12a7f11eb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131429 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 9ca2138f2..e93438e4e 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -129,7 +129,7 @@ - + Choose Format - Image - Properties - Type tab. Choose Format - Frame and Object - Properties - Type tab.UFI: removed some lines with Format-Object, see #i64150 Choose View - Styles - open context menu Modify/New - Type tab. diff --git a/source/text/swriter/01/05060100.xhp b/source/text/swriter/01/05060100.xhp index 436dbfb87..ca9cad0bb 100644 --- a/source/text/swriter/01/05060100.xhp +++ b/source/text/swriter/01/05060100.xhp @@ -36,7 +36,7 @@ Specifies the size and the position of the selected object or frame on a page. - + Size
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6803a3309e064cda675141a2abb8d7f280e3420b Author: Johnny_M AuthorDate: Fri Mar 18 13:15:43 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:15:43 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c629be9e6a24d4d73d849ceadd6d7f7cbb838f40 - tdf#132643 Translate German section IDs Remove unused. Change-Id: Id8963dbe736314e167313e22e7ccb5513bc338be Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131427 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ab9809abb7b9..c629be9e6a24 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ab9809abb7b9473a33bf8e4b185e1ece10a02bea +Subproject commit c629be9e6a24d4d73d849ceadd6d7f7cbb838f40
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0405.xhp |4 1 file changed, 4 deletions(-) New commits: commit c629be9e6a24d4d73d849ceadd6d7f7cbb838f40 Author: Johnny_M AuthorDate: Sat Mar 12 12:12:32 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:15:41 2022 +0100 tdf#132643 Translate German section IDs Remove unused. Change-Id: Id8963dbe736314e167313e22e7ccb5513bc338be Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131427 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index 37f592a8e..9ca2138f2 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -77,9 +77,7 @@ Choose Insert - Section - Footnotes/Endnotes tab. Choose Format - Sections - Options button Footnotes/Endnotes tab. - Choose View - Styles - open context menu Modify/New (for Paragraph Styles). - @@ -105,9 +103,7 @@ - Choose View - Styles - open context menu Modify/New (for Frame Styles). - Choose View - Styles (Command+TF11) - open context menu Modify/New (for List Styles).
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e4324c0e1a74ef45d1c7602e1e0eb171cc5b614 Author: Johnny_M AuthorDate: Fri Mar 18 13:14:55 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:14:55 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ab9809abb7b9473a33bf8e4b185e1ece10a02bea - tdf#132643 Translate German section IDs Change-Id: Ib28cbc143b0a353bcbb024976a88a7e5823caf00 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131425 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 061aa40ba8f0..ab9809abb7b9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 061aa40ba8f024628eecbb131a8b6b05c2e5dd0a +Subproject commit ab9809abb7b9473a33bf8e4b185e1ece10a02bea
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0004.xhp |2 +- source/text/swriter/main0215.xhp|2 +- source/text/swriter/main0216.xhp|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ab9809abb7b9473a33bf8e4b185e1ece10a02bea Author: Johnny_M AuthorDate: Sat Mar 12 12:06:31 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:14:54 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ib28cbc143b0a353bcbb024976a88a7e5823caf00 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131425 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0004.xhp b/source/text/swriter/00/0004.xhp index dd488a164..c3140db62 100644 --- a/source/text/swriter/00/0004.xhp +++ b/source/text/swriter/00/0004.xhp @@ -65,7 +65,7 @@ - + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index 01c3bb046..a78b2db80 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -44,7 +44,7 @@ Wrap Through You can also define this setting on the Wrap tab page. - + diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index db1ac9da9..b1790714a 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -48,7 +48,7 @@ Wrap Through You can also achieve the same effect through the Wrap tab page. - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f19eae7e54f557b5baf02b36d95448e8ffc4c83f Author: Johnny_M AuthorDate: Fri Mar 18 13:14:12 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:14:12 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 061aa40ba8f024628eecbb131a8b6b05c2e5dd0a - tdf#132643 Translate German section IDs Change-Id: Ie62798486a3178bd341a72d5b4f477a46e6aeab8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131424 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3b60695989e6..061aa40ba8f0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3b60695989e6ad58d83dfebebe132f4914923938 +Subproject commit 061aa40ba8f024628eecbb131a8b6b05c2e5dd0a
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0004.xhp |2 +- source/text/swriter/main0215.xhp|2 +- source/text/swriter/main0216.xhp|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 061aa40ba8f024628eecbb131a8b6b05c2e5dd0a Author: Johnny_M AuthorDate: Sat Mar 12 12:02:59 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:14:09 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ie62798486a3178bd341a72d5b4f477a46e6aeab8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131424 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0004.xhp b/source/text/swriter/00/0004.xhp index a9fb0761e..dd488a164 100644 --- a/source/text/swriter/00/0004.xhp +++ b/source/text/swriter/00/0004.xhp @@ -49,7 +49,7 @@ - + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index 54cb6b5f0..01c3bb046 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -40,7 +40,7 @@ Wrap On This icon represents the Page Wrap option on the Wrap tab page. - + Wrap Through You can also define this setting on the Wrap tab page. diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index ca27ef7e5..db1ac9da9 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -44,7 +44,7 @@ Wrap This icon corresponds to the Page Wrap option on the Wrap tab page. - + Wrap Through You can also achieve the same effect through the Wrap tab page.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddb2764f4d98c043160adf1c29ba102b3ef0ed7e Author: Johnny_M AuthorDate: Fri Mar 18 13:13:23 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:13:23 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3b60695989e6ad58d83dfebebe132f4914923938 - tdf#132643 Translate German section IDs Change-Id: I40bde7ec9b387d337b3dcb2f5cd75f3b4f3d1dc2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131422 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9bc2c3db3313..3b60695989e6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9bc2c3db33139954b323d387e44fbe1374efbf2e +Subproject commit 3b60695989e6ad58d83dfebebe132f4914923938
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0403.xhp |2 +- source/text/swriter/01/0313.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3b60695989e6ad58d83dfebebe132f4914923938 Author: Johnny_M AuthorDate: Sat Mar 12 11:55:50 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:13:20 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I40bde7ec9b387d337b3dcb2f5cd75f3b4f3d1dc2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131422 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0403.xhp b/source/text/swriter/00/0403.xhp index 83454d1f8..a02972dee 100644 --- a/source/text/swriter/00/0403.xhp +++ b/source/text/swriter/00/0403.xhp @@ -101,7 +101,7 @@ - + Choose View - Normalremoved table with icon (was copy/paste error) Choose View - Hidden Paragraphs diff --git a/source/text/swriter/01/0313.xhp b/source/text/swriter/01/0313.xhp index 68a081b63..b486dc8b9 100644 --- a/source/text/swriter/01/0313.xhp +++ b/source/text/swriter/01/0313.xhp @@ -36,7 +36,7 @@ - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe85a53f97ef38d31c84a7f2e182b6cb93fd40be Author: Johnny_M AuthorDate: Fri Mar 18 13:12:44 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 13:12:44 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9bc2c3db33139954b323d387e44fbe1374efbf2e - tdf#132643 Translate German section IDs Change-Id: I4a61d58100e28f8975cac375f982654ce8ea5099 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131423 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 01b8ee4ec654..9bc2c3db3313 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 01b8ee4ec65478ce46ce0f78423a4e55170f9b85 +Subproject commit 9bc2c3db33139954b323d387e44fbe1374efbf2e
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0004.xhp |2 +- source/text/swriter/main0215.xhp|2 +- source/text/swriter/main0216.xhp|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9bc2c3db33139954b323d387e44fbe1374efbf2e Author: Johnny_M AuthorDate: Sat Mar 12 12:00:14 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 13:12:38 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I4a61d58100e28f8975cac375f982654ce8ea5099 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131423 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0004.xhp b/source/text/swriter/00/0004.xhp index 69f5fa2e9..a9fb0761e 100644 --- a/source/text/swriter/00/0004.xhp +++ b/source/text/swriter/00/0004.xhp @@ -33,7 +33,7 @@ To access this function... - + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index 7055cfef1..54cb6b5f0 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -36,7 +36,7 @@ Wrap Off You can also choose this setting on the Wrap tab page. - + Wrap On This icon represents the Page Wrap option on the Wrap tab page. diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index 702dd6976..ca27ef7e5 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -40,7 +40,7 @@ No Wrap You can also choose this setting on the Wrap tab page. - + Wrap This icon corresponds to the Page Wrap option on the Wrap tab page.
[Libreoffice-commits] core.git: sax/source
sax/source/tools/CachedOutputStream.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a717a1bab852656d2e220754632eff384138f735
Author: Noel Grandin
AuthorDate: Fri Mar 18 11:08:26 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 18 12:53:08 2022 +0100
tdf#133603 increase cache size in CachedOutputStream
modern devices require bigger chunks of data to keep them busy
Change-Id: I356327718fc20d937364b6ee726b0e94b4199e0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131734
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sax/source/tools/CachedOutputStream.hxx
b/sax/source/tools/CachedOutputStream.hxx
index c3f442f9d93d..7d9e514c345c 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -30,7 +30,7 @@ public:
class CachedOutputStream
{
/// When buffer hits this size, it's written to mxOutputStream
-static const sal_Int32 mnMaximumSize = 0x1;
+static const sal_Int32 mnMaximumSize = 0x10; // 1Mbyte
/// ForMerge structure is used for sorting elements in Writer
std::shared_ptr< ForMergeBase > mpForMerge;
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx | 75 +
1 file changed, 43 insertions(+), 32 deletions(-)
New commits:
commit d277de1eac9ddc00eff3e5801ab29d8e8a9a3af7
Author: Caolán McNamara
AuthorDate: Thu Mar 17 19:56:27 2022 +
Commit: Caolán McNamara
CommitDate: Fri Mar 18 12:15:57 2022 +0100
ofz#45675 Timeout
Change-Id: Icd893d6e0361f9ffe2c88b20b08eaef32919d01a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131718
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 00c979f8f378..cc724b7fb2fa 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -837,8 +837,49 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt,
const Size& rSz,
maSz( rSz )
{}
+static bool AllowScale(const Size& rSource, const Size& rDest)
+{
+if (utl::ConfigManager::IsFuzzing())
+{
+constexpr int nMaxScaleWhenFuzzing = 1024;
+
+auto nSourceHeight = rSource.Height();
+auto nDestHeight = rDest.Height();
+if (nSourceHeight && nDestHeight > nSourceHeight && nDestHeight /
nSourceHeight > nMaxScaleWhenFuzzing)
+{
+SAL_WARN("vcl", "skipping large vertical scaling: " <<
nSourceHeight << " to " << nDestHeight);
+return false;
+}
+
+if (nDestHeight && nSourceHeight > nDestHeight && nSourceHeight /
nDestHeight > nMaxScaleWhenFuzzing)
+{
+SAL_WARN("vcl", "skipping large vertical scaling: " <<
nSourceHeight << " to " << nDestHeight);
+return false;
+}
+
+auto nSourceWidth = rSource.Width();
+auto nDestWidth = rDest.Width();
+if (nSourceWidth && nDestWidth > nSourceWidth && nDestWidth /
nSourceWidth > nMaxScaleWhenFuzzing)
+{
+SAL_WARN("vcl", "skipping large horizontal scaling: " <<
nSourceWidth << " to " << nDestWidth);
+return false;
+}
+
+if (nDestWidth && nSourceWidth > nDestWidth && nSourceWidth /
nDestWidth > nMaxScaleWhenFuzzing)
+{
+SAL_WARN("vcl", "skipping large horizontal scaling: " <<
nSourceWidth << " to " << nDestWidth);
+return false;
+}
+}
+
+return true;
+}
+
void MetaBmpScaleAction::Execute( OutputDevice* pOut )
{
+if (!AllowScale(maBmp.GetSizePixel(), maSz))
+return;
+
pOut->DrawBitmap( maPt, maSz, maBmp );
}
@@ -951,38 +992,8 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point&
rPt, const Size& rSz,
void MetaBmpExScaleAction::Execute( OutputDevice* pOut )
{
-if (utl::ConfigManager::IsFuzzing())
-{
-constexpr int nMaxScaleWhenFuzzing = 1024;
-
-auto nSourceHeight = maBmpEx.GetSizePixel().Height();
-auto nDestHeight = maSz.Height();
-if (nSourceHeight && nDestHeight > nSourceHeight && nDestHeight /
nSourceHeight > nMaxScaleWhenFuzzing)
-{
-SAL_WARN("vcl", "skipping large vertical scaling: " <<
nSourceHeight << " to " << nDestHeight);
-return;
-}
-
-if (nDestHeight && nSourceHeight > nDestHeight && nSourceHeight /
nDestHeight > nMaxScaleWhenFuzzing)
-{
-SAL_WARN("vcl", "skipping large vertical scaling: " <<
nSourceHeight << " to " << nDestHeight);
-return;
-}
-
-auto nSourceWidth = maBmpEx.GetSizePixel().Width();
-auto nDestWidth = maSz.Width();
-if (nSourceWidth && nDestWidth > nSourceWidth && nDestWidth /
nSourceWidth > nMaxScaleWhenFuzzing)
-{
-SAL_WARN("vcl", "skipping large horizontal scaling: " <<
nSourceWidth << " to " << nDestWidth);
-return;
-}
-
-if (nDestWidth && nSourceWidth > nDestWidth && nSourceWidth /
nDestWidth > nMaxScaleWhenFuzzing)
-{
-SAL_WARN("vcl", "skipping large horizontal scaling: " <<
nSourceWidth << " to " << nDestWidth);
-return;
-}
-}
+if (!AllowScale(maBmpEx.GetSizePixel(), maSz))
+return;
pOut->DrawBitmapEx( maPt, maSz, maBmpEx );
}
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af55f4bdc9c067d7738472382c9a153b25b781e1 Author: Johnny_M AuthorDate: Fri Mar 18 12:02:18 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 12:02:18 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 01b8ee4ec65478ce46ce0f78423a4e55170f9b85 - tdf#132643 Translate German section IDs Change-Id: Ic89725bc9d774f291bff2dada0888abe6d855c0c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131421 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index bddd19a60f42..01b8ee4ec654 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bddd19a60f428195ebf29919fcc5886a93d203c7 +Subproject commit 01b8ee4ec65478ce46ce0f78423a4e55170f9b85
[Libreoffice-commits] help.git: source/text
source/text/shared/main0201.xhp |2 +- source/text/swriter/00/0403.xhp |4 ++-- source/text/swriter/01/0310.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 01b8ee4ec65478ce46ce0f78423a4e55170f9b85 Author: Johnny_M AuthorDate: Sat Mar 12 11:51:52 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 12:02:11 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ic89725bc9d774f291bff2dada0888abe6d855c0c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131421 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 50180f916..e042cec53 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -85,7 +85,7 @@ - + diff --git a/source/text/swriter/00/0403.xhp b/source/text/swriter/00/0403.xhp index fc5895d4e..83454d1f8 100644 --- a/source/text/swriter/00/0403.xhp +++ b/source/text/swriter/00/0403.xhp @@ -42,13 +42,13 @@ Ctrl+F9 - + Choose View - Formatting Marks Command Ctrl+F10 On Standard bar, click - + diff --git a/source/text/swriter/01/0310.xhp b/source/text/swriter/01/0310.xhp index 3ed45c16e..e93b6f3bc 100644 --- a/source/text/swriter/01/0310.xhp +++ b/source/text/swriter/01/0310.xhp @@ -36,7 +36,7 @@ - + When you delete a paragraph mark, the paragraph that is merged takes on the formatting of the paragraph that the cursor is in. To specify which formatting marks are displayed, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then select the options that you want in the Display formatting area.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 071e4b32f8bded89c16acde834035924f4f698e1 Author: Johnny_M AuthorDate: Fri Mar 18 12:01:35 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 12:01:35 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to bddd19a60f428195ebf29919fcc5886a93d203c7 - tdf#132643 Translate German section IDs Change-Id: Ie11d36a733dfa94584306bed9b9d2873bb3ea23a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131420 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c416cf52fad8..bddd19a60f42 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c416cf52fad8a4c5b3995c8ebaeff6fb8ca11f37 +Subproject commit bddd19a60f428195ebf29919fcc5886a93d203c7
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0403.xhp |2 +- source/text/swriter/01/0309.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit bddd19a60f428195ebf29919fcc5886a93d203c7 Author: Johnny_M AuthorDate: Sat Mar 12 11:46:51 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 12:01:32 2022 +0100 tdf#132643 Translate German section IDs Change-Id: Ie11d36a733dfa94584306bed9b9d2873bb3ea23a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131420 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0403.xhp b/source/text/swriter/00/0403.xhp index bf0ba51c5..fc5895d4e 100644 --- a/source/text/swriter/00/0403.xhp +++ b/source/text/swriter/00/0403.xhp @@ -36,7 +36,7 @@ Ctrl+F8 - + Choose View - Field Names Command Ctrl+F9 diff --git a/source/text/swriter/01/0309.xhp b/source/text/swriter/01/0309.xhp index 1d9968d65..a8125574c 100644 --- a/source/text/swriter/01/0309.xhp +++ b/source/text/swriter/01/0309.xhp @@ -36,7 +36,7 @@ - + To change the default field display to field names instead of the field contents, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - View, and then select the Field codes checkbox in the Display area. When you print a document with View - Field Names enabled, you are prompted to include the field names in the print out.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ea7a6fbc333a685283dc8a4409701042d628b9e Author: Johnny_M AuthorDate: Fri Mar 18 12:00:52 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 12:00:52 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c416cf52fad8a4c5b3995c8ebaeff6fb8ca11f37 - tdf#132643 Translate German section IDs Change-Id: I669488bec98e228aa2ad49773e226850dc3d85b8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131419 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 01240c16ba23..c416cf52fad8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 01240c16ba2314ad60d6395d88cf864f99a2776d +Subproject commit c416cf52fad8a4c5b3995c8ebaeff6fb8ca11f37
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0403.xhp |2 +- source/text/swriter/01/0308.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c416cf52fad8a4c5b3995c8ebaeff6fb8ca11f37 Author: Johnny_M AuthorDate: Sat Mar 12 11:44:38 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 12:00:47 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I669488bec98e228aa2ad49773e226850dc3d85b8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131419 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0403.xhp b/source/text/swriter/00/0403.xhp index efb861bb0..bf0ba51c5 100644 --- a/source/text/swriter/00/0403.xhp +++ b/source/text/swriter/00/0403.xhp @@ -30,7 +30,7 @@ Choose View - Rulers - Rulers Choose View - Text Boundaries - + Choose View - Field Shadings Command Ctrl+F8 diff --git a/source/text/swriter/01/0308.xhp b/source/text/swriter/01/0308.xhp index 163850452..23c707f80 100644 --- a/source/text/swriter/01/0308.xhp +++ b/source/text/swriter/01/0308.xhp @@ -36,7 +36,7 @@ - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c46b01f575a3acd50d47f5d8299234218dbd393 Author: Johnny_M AuthorDate: Fri Mar 18 12:00:10 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 12:00:10 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 01240c16ba2314ad60d6395d88cf864f99a2776d - tdf#132643 Translate German section IDs Change-Id: I8ab12229bb36025f93895a807ea2c29b35e63916 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131418 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 73273a276655..01240c16ba23 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 73273a2766552382cdc55f4e953f7af65082de7b +Subproject commit 01240c16ba2314ad60d6395d88cf864f99a2776d
[Libreoffice-commits] help.git: source/text
source/text/shared/main0212.xhp |2 +- source/text/swriter/00/0401.xhp |4 ++-- source/text/swriter/01/0115.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 01240c16ba2314ad60d6395d88cf864f99a2776d Author: Johnny_M AuthorDate: Sat Mar 12 11:41:56 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 12:00:01 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I8ab12229bb36025f93895a807ea2c29b35e63916 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131418 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp index 18380c0c4..506d56dbb 100644 --- a/source/text/shared/main0212.xhp +++ b/source/text/shared/main0212.xhp @@ -87,7 +87,7 @@ Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder Mail Merge Starts the Mail Merge Wizard to create form letters. - + diff --git a/source/text/swriter/00/0401.xhp b/source/text/swriter/00/0401.xhp index 0798aca42..973db9710 100644 --- a/source/text/swriter/00/0401.xhp +++ b/source/text/swriter/00/0401.xhp @@ -42,10 +42,10 @@ Choose File - Send - Create HTML Document - + Insert at least one address database field into a text document, then start printing the document. Answer "Yes" to the question whether you want to print a form letter.i80170 - + diff --git a/source/text/swriter/01/0115.xhp b/source/text/swriter/01/0115.xhp index f6cab9edd..6dd10953f 100644 --- a/source/text/swriter/01/0115.xhp +++ b/source/text/swriter/01/0115.xhp @@ -36,7 +36,7 @@ The Mail Merge dialog helps you in printing and saving form letters. - + During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Field - More Fields.db browser explorer Select a database and table.db browser records
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a6e61fd0c0c461129d0f970ee601bdddc43b46a Author: Johnny_M AuthorDate: Fri Mar 18 11:59:06 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 11:59:06 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 73273a2766552382cdc55f4e953f7af65082de7b - tdf#132643 Translate German section IDs Change-Id: I0f36c3de1612d204ced34fcad5a424f7e13818b1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131416 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 87ab46fd2271..73273a276655 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 87ab46fd2271fcf09ffc8a94bc403c3cf7082752 +Subproject commit 73273a2766552382cdc55f4e953f7af65082de7b
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0404.xhp |4 ++-- source/text/swriter/01/0413.xhp |4 ++-- source/text/swriter/02/1801.xhp |2 +- source/text/swriter/02/1903.xhp |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 73273a2766552382cdc55f4e953f7af65082de7b Author: Johnny_M AuthorDate: Sat Mar 12 11:33:12 2022 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 18 11:59:04 2022 +0100 tdf#132643 Translate German section IDs Change-Id: I0f36c3de1612d204ced34fcad5a424f7e13818b1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131416 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/00/0404.xhp b/source/text/swriter/00/0404.xhp index 483cd10c7..bfe543b44 100644 --- a/source/text/swriter/00/0404.xhp +++ b/source/text/swriter/00/0404.xhp @@ -243,13 +243,13 @@ Choose Insert - Envelope - Printer tab - + Choose Insert - Frame Choose Format - Frame and Object - Properties Open Insert toolbar, click - + diff --git a/source/text/swriter/01/0413.xhp b/source/text/swriter/01/0413.xhp index 06e18db13..30c23bbd4 100644 --- a/source/text/swriter/01/0413.xhp +++ b/source/text/swriter/01/0413.xhp @@ -33,7 +33,7 @@ Inserts a frame that you can use to create a layout of one or more columns of text and objects. - + To edit a frame, click the border to select it, and then choose Format - Frame and Object - Properties. You can also resize or move a selected frame using special shortcut keys. To delete a frame, click the border of the frame, and then press Delete. @@ -53,7 +53,7 @@ Icon on the Insert toolbar: Draws a frame where you drag in the document. Click the arrow next to the icon to select the number of columns for the frame. - + diff --git a/source/text/swriter/02/1801.xhp b/source/text/swriter/02/1801.xhp index ea06f9ac4..da94dae69 100644 --- a/source/text/swriter/02/1801.xhp +++ b/source/text/swriter/02/1801.xhp @@ -43,7 +43,7 @@ Insert Frame Manually - + Floating Frame diff --git a/source/text/swriter/02/1903.xhp b/source/text/swriter/02/1903.xhp index b8137c169..b2efbf5c7 100644 --- a/source/text/swriter/02/1903.xhp +++ b/source/text/swriter/02/1903.xhp @@ -50,7 +50,7 @@ You can select the following functions: Insert single-column frame manually - + From File
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/typemanager.cxx | 45 --
1 file changed, 20 insertions(+), 25 deletions(-)
New commits:
commit 21b17ba1e6ac3eb3c54a6613f5f66a7d5588850b
Author: Mike Kaganski
AuthorDate: Fri Mar 18 12:27:57 2022 +0300
Commit: Mike Kaganski
CommitDate: Fri Mar 18 11:49:54 2022 +0100
Simplify a static array iteration
Change-Id: I7dc4fdcbbaef08c1bc3b23403cd13e2c23585f75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131733
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cppuhelper/source/typemanager.cxx
b/cppuhelper/source/typemanager.cxx
index 7d22994a1767..30c1555de137 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1831,33 +1832,27 @@ cppuhelper::TypeManager::TypeManager():
css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
//TODO: caching? (here or in unoidl::Manager?)
-struct Simple {
-std::u16string_view name;
-css::uno::TypeClass typeClass;
-};
-static Simple const simple[] = {
-{ std::u16string_view(u"void"), css::uno::TypeClass_VOID },
-{ std::u16string_view(u"boolean"), css::uno::TypeClass_BOOLEAN },
-{ std::u16string_view(u"byte"), css::uno::TypeClass_BYTE },
-{ std::u16string_view(u"short"), css::uno::TypeClass_SHORT },
-{ std::u16string_view(u"unsigned short"),
- css::uno::TypeClass_UNSIGNED_SHORT },
-{ std::u16string_view(u"long"), css::uno::TypeClass_LONG },
-{ std::u16string_view(u"unsigned long"),
css::uno::TypeClass_UNSIGNED_LONG },
-{ std::u16string_view(u"hyper"), css::uno::TypeClass_HYPER },
-{ std::u16string_view(u"unsigned hyper"),
- css::uno::TypeClass_UNSIGNED_HYPER },
-{ std::u16string_view(u"float"), css::uno::TypeClass_FLOAT },
-{ std::u16string_view(u"double"), css::uno::TypeClass_DOUBLE },
-{ std::u16string_view(u"char"), css::uno::TypeClass_CHAR },
-{ std::u16string_view(u"string"), css::uno::TypeClass_STRING },
-{ std::u16string_view(u"type"), css::uno::TypeClass_TYPE },
-{ std::u16string_view(u"any"), css::uno::TypeClass_ANY } };
-for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) {
-if (name == simple[i].name) {
+static constexpr std::pair const
simple[] = {
+{ u"void", css::uno::TypeClass_VOID },
+{ u"boolean", css::uno::TypeClass_BOOLEAN },
+{ u"byte", css::uno::TypeClass_BYTE },
+{ u"short", css::uno::TypeClass_SHORT },
+{ u"unsigned short", css::uno::TypeClass_UNSIGNED_SHORT },
+{ u"long", css::uno::TypeClass_LONG },
+{ u"unsigned long", css::uno::TypeClass_UNSIGNED_LONG },
+{ u"hyper", css::uno::TypeClass_HYPER },
+{ u"unsigned hyper", css::uno::TypeClass_UNSIGNED_HYPER },
+{ u"float", css::uno::TypeClass_FLOAT },
+{ u"double", css::uno::TypeClass_DOUBLE },
+{ u"char", css::uno::TypeClass_CHAR },
+{ u"string", css::uno::TypeClass_STRING },
+{ u"type", css::uno::TypeClass_TYPE },
+{ u"any", css::uno::TypeClass_ANY } };
+for (const auto& [ rName, rTypeClass ] : simple) {
+if (name == rName) {
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
-new SimpleTypeDescription(simple[i].typeClass, name));
+new SimpleTypeDescription(rTypeClass, name));
}
}
if (name.startsWith("[]")) {
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - 2 commits - cui/source sw/Module_sw.mk sw/qa sw/source sw/UITest_sw_uibase_shells.mk xmloff/qa xmloff/source
cui/source/tabpages/macroass.cxx | 11 +-
sw/Module_sw.mk |1
sw/UITest_sw_uibase_shells.mk | 16 ++
sw/qa/uitest/data/image-rel-size.fodt | 40 +
sw/qa/uitest/uibase/shells/shells.py | 38 +++
sw/source/uibase/shells/grfsh.cxx | 10 ++
xmloff/qa/unit/text.cxx | 46
xmloff/source/text/txtparae.cxx | 54 +-
8 files changed, 199 insertions(+), 17 deletions(-)
New commits:
commit 9b0f881a15f3128fefcf0f0f0d048f845592f610
Author: Miklos Vajna
AuthorDate: Thu Mar 17 17:36:18 2022 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 18 11:27:35 2022 +0100
sw image dialog: fix fallback width/height for images with relative sizes
Make sure that we work with the up to date layout size of the image in
the dialog, otherwise 80% shows up as 237%.
Also fix SfxMacroTabPage::FillItemSet() to not put anything to the
output item set when the macro table is empty, this way clicking OK in
the image dialog results in an unmodified document when the user doesn't
change anything.
(cherry picked from commit 9e8712ed6f9fb5dbd971e352a5709bd45fadc74f)
Conflicts:
sw/Module_sw.mk
sw/qa/uitest/writer_tests/data/image-rel-size.fodt
Change-Id: I4b987bd3e3818ee737e37ea10861f9043c25bc93
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index df3e47bf489b..accec8992e12 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -156,9 +156,14 @@ bool SfxMacroTabPage::FillItemSet( SfxItemSet* rSet )
SvxMacroItem aItem( GetWhich( aPageRg[0] ) );
const_cast(aItem.GetMacroTable()) = aTbl;
-const SfxPoolItem* pItem;
-if( SfxItemState::SET != GetItemSet().GetItemState( aItem.Which(), true,
&pItem )
-|| aItem != *static_cast(pItem) )
+const SfxPoolItem* pItem = nullptr;
+SfxItemState eState = GetItemSet().GetItemState(aItem.Which(), true,
&pItem);
+if (eState == SfxItemState::DEFAULT && aTbl.empty())
+{
+// Don't touch the item set if there was no input and our table is
empty.
+return false;
+}
+if (SfxItemState::SET != eState || aItem != *static_cast(pItem))
{
rSet->Put( aItem );
return true;
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 50e7d11cd9d9..047b69db1b41 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -171,6 +171,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_librelogo \
UITest_options \
UITest_sw_ui_fmtui \
+ UITest_sw_uibase_shells \
UITest_classification \
UITest_writer_macro_tests \
UITest_writer_dialogs \
diff --git a/sw/UITest_sw_uibase_shells.mk b/sw/UITest_sw_uibase_shells.mk
new file mode 100644
index ..de9cb7c8a9d9
--- /dev/null
+++ b/sw/UITest_sw_uibase_shells.mk
@@ -0,0 +1,16 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,sw_uibase_shells))
+
+$(eval $(call gb_UITest_add_modules,sw_uibase_shells,$(SRCDIR)/sw/qa/uitest,\
+ uibase/shells/ \
+))
+
+$(eval $(call gb_UITest_set_defs,sw_uibase_shells, \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
+))
diff --git a/sw/qa/uitest/data/image-rel-size.fodt
b/sw/qa/uitest/data/image-rel-size.fodt
new file mode 100644
index ..9df285861616
--- /dev/null
+++ b/sw/qa/uitest/data/image-rel-size.fodt
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ iVBORw0KGgoNSUhEUgAAAEBACAQAYLlVBGdBTUEAALGPC/xhBQFz
+ UkdCAK7OHOkgY0hSTQAAeiYAAICEAAD6gOgAAHUwAADqYAAAOpgAABdwnLpRPAAA
+ AAJiS0dEAACqjSMyCW9GRnMGAAAMc1XTCXBIWXMAAA3XAAAN1wFCKJt4
+ CXZwQWcAAABMQACdMTgbAAABzUlEQVRo3u3ZPU/CQBjA8X+Jxs3ESUDj4iK+LA5+
+ BBfjqBE1cXB2MlFAEqMgxvhNNL4sLsK3UPQL6ObkoAETz+FKW2mxCPRYnucWUu76/OC59C49
+ cGOCKqrD9kHRc6ddPv7oW2WCwMh0nF63Myz7Tm8hPTNu0pgHMER3scepTbgK6enJNND83RLn
+ /878yRaPmgBZFDuMsNLeWB9gmFQHP77MIg9gsYciR50NFKvtjIy10yk84pSZA7DYpwR8scmF
+ QQCMuoQMpzbh0iAARrlnVn90CWHTsZcAiHPPdINQAuqsc2MQAAnKDUKWEhZ10twaBEDSJWQo
+ YlFj7S9CzwEegkXWIbQsRAQASFJhpplwbRAACS+hANRJBxMiAkDcJeQ4sQkBhYgMoJ+Ozlwo
+ 2YQ7AJ6CRxyiUGnVy3hVKb0Af9v7hUG2Wy9TEQCUelFTDULB2S+YKYGOMcpM6UIccOQnRA6A
+ cSp6ibfI+wkGADBGpTEd8xz1AaAfTQ7huA8AvUw5hVjuA0D/C5OaMN8XACRZ8F0zCggKAQhA
+ AAIQgAAEIAABCEAAAhCAAAQgAAH4zg3feY4w3Xs44M5+oW0qvCWoGcvaIlM3x/f/ab+O738A
+ hOCNQr34oD4ldEVYdGNyZWF0ZS1kYXRlADIwMTAtMTItMjBUMTc6MDg6MzYrMDE6MDB6
+ 5RscJXRFWHRtb2RpZnktZGF
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xechart.cxx |4 ++--
sc/source/filter/excel/xecontent.cxx |2 +-
sc/source/filter/excel/xehelper.cxx |6 +++---
sc/source/filter/excel/xestring.cxx | 23 +++
sc/source/filter/inc/xechart.hxx |2 +-
sc/source/filter/inc/xehelper.hxx|2 +-
sc/source/filter/inc/xestring.hxx| 12 +---
7 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit fbb41798b86c5ed35eb80aa07a5ee7c9866ac4e8
Author: Noel Grandin
AuthorDate: Fri Mar 18 09:46:52 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 18 11:18:48 2022 +0100
tdf#133603 remove some string copying
Change-Id: I5b9f011d276ec30a50648e7984862b9e5f4b5577
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131729
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/excel/xechart.cxx
b/sc/source/filter/excel/xechart.cxx
index dd82fe980dc9..f42a1448e54e 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -989,7 +989,7 @@ sal_uInt16 XclExpChSourceLink::ConvertStringSequence( const
Sequence< Reference<
// Excel start position of this portion
sal_uInt16 nXclPortionStart = mxString->Len();
// add portion text to Excel string
-XclExpStringHelper::AppendString( *mxString, GetRoot(),
aText.copy( nPortionPos, nPortionEnd - nPortionPos ) );
+XclExpStringHelper::AppendString( *mxString, GetRoot(),
aText.subView( nPortionPos, nPortionEnd - nPortionPos ) );
if( nXclPortionStart < mxString->Len() )
{
// find font index variable dependent on script type
@@ -1039,7 +1039,7 @@ void XclExpChSourceLink::ConvertNumFmt( const
ScfPropertySet& rPropSet, bool bPe
}
}
-void XclExpChSourceLink::AppendString( const OUString& rStr )
+void XclExpChSourceLink::AppendString( std::u16string_view rStr )
{
if (!mxString)
return;
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index fbeedbcaa80b..cde4344b50e5 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1774,7 +1774,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong
nScHandle ) :
sFormulaBuf.append( aToken );
if (nStringIx<0)
break;
-mxString1->Append(OUString(u'\0'));
+mxString1->Append(u"\0");
sFormulaBuf.append( ',' );
sListBuf.append( ',' );
}
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index aeed23121e35..d45bf0c2cf6a 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -387,7 +387,7 @@ XclExpStringRef lclCreateFormattedString(
// Excel start position of this portion
sal_Int32 nXclPortionStart = xString->Len();
// add portion text to Excel string
-XclExpStringHelper::AppendString( *xString, rRoot, rText.copy(
nPortionPos, nPortionEnd - nPortionPos ) );
+XclExpStringHelper::AppendString( *xString, rRoot, rText.subView(
nPortionPos, nPortionEnd - nPortionPos ) );
if( nXclPortionStart < xString->Len() )
{
// insert font into buffer
@@ -541,7 +541,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
return xString;
}
-void XclExpStringHelper::AppendString( XclExpString& rXclString, const
XclExpRoot& rRoot, const OUString& rString )
+void XclExpStringHelper::AppendString( XclExpString& rXclString, const
XclExpRoot& rRoot, std::u16string_view rString )
{
if( rRoot.GetBiff() == EXC_BIFF8 )
rXclString.Append( rString );
@@ -552,7 +552,7 @@ void XclExpStringHelper::AppendString( XclExpString&
rXclString, const XclExpRoo
void XclExpStringHelper::AppendChar( XclExpString& rXclString, const
XclExpRoot& rRoot, sal_Unicode cChar )
{
if( rRoot.GetBiff() == EXC_BIFF8 )
-rXclString.Append( OUString(cChar) );
+rXclString.Append( rtl::OUStringChar(cChar) );
else
rXclString.AppendByte( cChar, rRoot.GetTextEncoding() );
}
diff --git a/sc/source/filter/excel/xestring.cxx
b/sc/source/filter/excel/xestring.cxx
index db85728ef7ef..cb76518e6b41 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -129,9 +129,9 @@ void XclExpString::AssignByte(
// append -
-void XclExpString::Append( const OUString& rString )
+void XclExpString::Append( std::u16string_view rString )
{
-BuildAppend( rString.getStr(), rString.getLength() );
+BuildAppend( rString );
}
void XclExpString::AppendByte( std::u16string_view rSt
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/impex.cxx | 73
1 file changed, 44 insertions(+), 29 deletions(-)
New commits:
commit 6b768542ddd52573bbdb0e7b5b85ce5a9dd4551d
Author: Eike Rathke
AuthorDate: Thu Mar 17 22:44:26 2022 +0100
Commit: Eike Rathke
CommitDate: Fri Mar 18 11:07:26 2022 +0100
Resolves: tdf#148054 Advance offset for all columns, tdf#104927 regression
Regression from
commit 621c189173b35ac7f5ce4c578f57045479c63ab6
CommitDate: Sat Jan 9 05:13:55 2021 +0100
tdf#104927 consider character width for CSV import
that for fixed width introduced a visual count of character widths
for CJK IVS characters but did not advance the character offset
for skipped hidden columns.
Instead of having to ask bDetermineRange three times in the loop,
split off an extra loop for bDetermineRange, advancing the offset
then is straight forward and just only non-skipped columns are
extracted and written to document.
Change-Id: Ib6ab6b68c5fc0f6ff854d629d75742c39ed6ddf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131722
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index c6760535ef30..5efa54703d73 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1620,40 +1620,55 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
bool bMultiLine = false;
if ( bFixed ) // Fixed line length
{
-sal_Int32 nStartIdx = 0;
-// Yes, the check is nCol<=rDoc.MaxCol()+1, +1 because it is
only an
-// overflow if there is really data following to be put behind
-// the last column, which doesn't happen if info is
-// SC_COL_SKIP.
-for ( i=0; i rDoc.MaxCol())
-bOverflowCol = true;// display warning on
import
-else if (!bDetermineRange)
+const sal_uInt8 nFmt = pColFormat[i];
+if (nFmt != SC_COL_SKIP)// otherwise don't
increment nCol either
+{
+if (nCol > rDoc.MaxCol())
+bOverflowCol = true;// display warning on
import
+++nCol;
+}
+}
+}
+else
+{
+sal_Int32 nStartIdx = 0;
+// Same maxcol+1 check reason as above.
+for (i=0; i < nInfoCount && nCol <= rDoc.MaxCol()+1; ++i)
+{
+sal_Int32 nNextIdx = nStartIdx;
+if (i + 1 < nInfoCount)
+CountVisualWidth( aLine, nNextIdx, pColStart[i+1]
- pColStart[i] );
+else
+nNextIdx = nLineLen;
+sal_uInt8 nFmt = pColFormat[i];
+if (nFmt != SC_COL_SKIP)// otherwise don't
increment nCol either
{
-sal_Int32 nNextIdx = nStartIdx;
-if ( i + 1 < nInfoCount )
-CountVisualWidth( aLine, nNextIdx,
pColStart[i+1] - pColStart[i] );
+if (nCol > rDoc.MaxCol())
+bOverflowCol = true;// display warning on
import
else
-nNextIdx = nLineLen;
-
-bool bIsQuoted = false;
-aCell = lcl_GetFixed( aLine, nStartIdx, nNextIdx,
bIsQuoted, bOverflowCell );
-if (bIsQuoted && bQuotedAsText)
-nFmt = SC_COL_TEXT;
-
-bMultiLine |= lcl_PutString(
-aDocImport, !mbOverwriting, nCol, nRow, nTab,
aCell, nFmt,
-&aNumFormatter, bDetectNumFormat,
bEvaluateFormulas, bSkipEmptyCells,
-aTransliteration, aCalendar,
-pEnglishTransliteration.get(),
pEnglishCalendar.get());
-
-nStartIdx = nNextIdx;
+{
+bool bIsQuoted = false;
+aCell = lcl_GetFixed( aLine, nStartIdx,
nNextIdx, bIsQuoted, bOverflowCell );
+if (bIsQuoted && bQuotedAsText)
+nFmt = SC_COL_TEXT;
+
+bMultiLine |= lcl_PutString(
+aDocImport, !mbOverwriting, nCol,
nRow, nTab, aCell, nFmt,
+&aNumFormatter, bDetectNumFormat,
bEvaluateF
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/ww8export3.cxx | 44 +++---
sw/source/filter/ww8/ww8atr.cxx | 10 ++-
2 files changed, 34 insertions(+), 20 deletions(-)
New commits:
commit 0da10420ed6e69384498de7404287e8c936fef14
Author: Miklos Vajna
AuthorDate: Fri Mar 18 10:09:18 2022 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 18 10:53:45 2022 +0100
sw clearing breaks: add DOC export
Map SwLineBreakClear to sprmCLbcCRJ's LBCOperand.
And most importantly, write the newline character: a clearing break was
not "downgraded" to a plain line break previously.
Change-Id: I3bc11a120af09d5c774df992cb17cfc5ee251e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131732
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index e0eb32ee9f1b..261d74938e70 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
class Test : public SwModelTestBase
{
@@ -997,29 +998,34 @@ DECLARE_WW8EXPORT_TEST(testTdf79186_noLayoutInCell,
"tdf79186_noLayoutInCell.odt
CPPUNIT_TEST_FIXTURE(Test, testClearingBreak)
{
+auto verify = [this]() {
+uno::Reference
xParagraph(getParagraph(1), uno::UNO_QUERY);
+uno::Reference xPortions =
xParagraph->createEnumeration();
+xPortions->nextElement();
+xPortions->nextElement();
+// Without the accompanying fix in place, this test would have failed
with:
+// An uncaught exception of type
com.sun.star.container.NoSuchElementException
+// i.e. the first para was just a fly + text portion, the clearing
break was lost.
+uno::Reference xPortion(xPortions->nextElement(),
uno::UNO_QUERY);
+OUString aPortionType;
+xPortion->getPropertyValue("TextPortionType") >>= aPortionType;
+CPPUNIT_ASSERT_EQUAL(OUString("LineBreak"), aPortionType);
+uno::Reference xLineBreak;
+xPortion->getPropertyValue("LineBreak") >>= xLineBreak;
+sal_Int16 eClear{};
+uno::Reference xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
+xLineBreakProps->getPropertyValue("Clear") >>= eClear;
+CPPUNIT_ASSERT_EQUAL(static_cast(SwLineBreakClear::ALL),
eClear);
+};
+
// Given a document with a clearing break:
// When loading that file:
load(mpTestDocumentPath, "clearing-break.doc");
-
// Then make sure that the clear property of the break is not ignored:
-uno::Reference xParagraph(getParagraph(1),
uno::UNO_QUERY);
-uno::Reference xPortions =
xParagraph->createEnumeration();
-xPortions->nextElement();
-xPortions->nextElement();
-// Without the accompanying fix in place, this test would have failed with:
-// An uncaught exception of type
com.sun.star.container.NoSuchElementException
-// i.e. the first para was just a fly + text portion, the clearing break
was lost.
-uno::Reference xPortion(xPortions->nextElement(),
uno::UNO_QUERY);
-OUString aPortionType;
-xPortion->getPropertyValue("TextPortionType") >>= aPortionType;
-CPPUNIT_ASSERT_EQUAL(OUString("LineBreak"), aPortionType);
-uno::Reference xLineBreak;
-xPortion->getPropertyValue("LineBreak") >>= xLineBreak;
-sal_Int16 eClear{};
-uno::Reference xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
-xLineBreakProps->getPropertyValue("Clear") >>= eClear;
-// SwLineBreakClear::ALL
-CPPUNIT_ASSERT_EQUAL(static_cast(3), eClear);
+verify();
+reload(mpFilter, "clearing-break.doc");
+// Make sure that that the clear property of the break is not ignored
during export:
+verify();
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 0cf65abc4553..409b00f196d2 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4183,7 +4183,15 @@ void WW8AttributeOutput::SectionRtlGutter(const
SfxBoolItem& rRtlGutter)
m_rWW8Export.pO->push_back(1);
}
-void WW8AttributeOutput::TextLineBreak(const SwFormatLineBreak&
/*rLineBreak*/) {}
+void WW8AttributeOutput::TextLineBreak(const SwFormatLineBreak& rLineBreak)
+{
+// Write the linebreak itself.
+m_rWW8Export.WriteChar(0x0b);
+
+// sprmCLbcCRJ
+m_rWW8Export.InsUInt16(NS_sprm::CLbcCRJ::val);
+m_rWW8Export.pO->push_back(rLineBreak.GetEnumValue());
+}
void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
{
[Libreoffice-commits] core.git: include/basic
include/basic/sbxvar.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7dd087002816cdde9a5049a36840446765061fb8
Author: Stephan Bergmann
AuthorDate: Fri Mar 18 08:43:49 2022 +0100
Commit: Stephan Bergmann
CommitDate: Fri Mar 18 10:30:56 2022 +0100
Improve a mis-translated comment
...which was the German
// Falls wir ein Schweinezeichen haben, abbrechen!!
until 3d361dbc2d69484657c42852dcfa426c00bc3175 "Translation of Comments to
English"
Change-Id: I655514ec38596d16b15d22a02f38d0cf60b80302
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131726
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 6454e445629f..1f1ac8a8c4fc 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -308,7 +308,7 @@ public:
const auto first6 = aName.substr(0, 6);
for (const auto& c : first6)
{
-// If we have a comment sign break!!
+// If we have a filthy non-ASCII character, break!!
if (c >= 0x80)
return 0;
n = static_cast((n << 3) + rtl::toAsciiUpperCase(c));
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/typedstrdata.hxx |8
sc/source/core/data/column3.cxx | 12 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit cb53cc2a92886b83dcf5f9de762c82b1144f912c
Author: Noel Grandin
AuthorDate: Fri Mar 18 09:22:15 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 18 10:13:18 2022 +0100
tdf#133603 reduce some ref-counting during XLSX save
Change-Id: I02ed854ba57c7f513205f65ec84cb4e08d3b068f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131728
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index c1a3738ce7fe..7918b5501fca 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -25,6 +25,14 @@ public:
Header
};
+ScTypedStrData(
+OUString&& rStr, double fVal = 0.0, double fRVal = 0.0, StringType
nType = Standard, bool bDate = false ) :
+maStrValue(std::move(rStr)),
+mfValue(fVal),
+mfRoundedValue(fRVal),
+meStrType(nType),
+mbIsDate( bDate ) {}
+
ScTypedStrData( const OUString& rStr, double fVal = 0.0, double fRVal =
0.0, StringType eType = Standard,
bool bDate = false );
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9e12ad32cacf..2f4b7a2c0774 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2510,7 +2510,7 @@ class FilterEntriesHandler
if (rCell.hasString())
{
-mrFilterEntries.push_back(ScTypedStrData(aStr));
+mrFilterEntries.push_back(ScTypedStrData(std::move(aStr)));
return;
}
@@ -2532,7 +2532,7 @@ class FilterEntriesHandler
OUString aErr = ScGlobal::GetErrorString(nErr);
if (!aErr.isEmpty())
{
-mrFilterEntries.push_back(ScTypedStrData(aErr));
+
mrFilterEntries.push_back(ScTypedStrData(std::move(aErr)));
return;
}
}
@@ -2568,9 +2568,9 @@ class FilterEntriesHandler
}
// store the formatted/rounded value for filtering
if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0 && !bDate)
-mrFilterEntries.push_back(ScTypedStrData(aStr, fVal,
rColumn.GetDoc().RoundValueAsShown(fVal, nFormat), ScTypedStrData::Value,
bDate));
+mrFilterEntries.push_back(ScTypedStrData(std::move(aStr), fVal,
rColumn.GetDoc().RoundValueAsShown(fVal, nFormat), ScTypedStrData::Value,
bDate));
else
-mrFilterEntries.push_back(ScTypedStrData(aStr, fVal, fVal,
ScTypedStrData::Value, bDate));
+mrFilterEntries.push_back(ScTypedStrData(std::move(aStr), fVal,
fVal, ScTypedStrData::Value, bDate));
}
public:
@@ -2784,7 +2784,7 @@ bool ScColumn::GetDataEntries(
OUString aStr = aItrUp.get();
if (!aStr.isEmpty())
{
-if (rStrings.insert(ScTypedStrData(aStr)).second)
+if (rStrings.insert(ScTypedStrData(std::move(aStr))).second)
bFound = true;
}
@@ -2797,7 +2797,7 @@ bool ScColumn::GetDataEntries(
OUString aStr = aItrDown.get();
if (!aStr.isEmpty())
{
-if (rStrings.insert(ScTypedStrData(aStr)).second)
+if (rStrings.insert(ScTypedStrData(std::move(aStr))).second)
bFound = true;
}
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/fontcfg.hxx |4 ++--
unotools/source/config/fontcfg.cxx | 15 +++
unotools/source/misc/fontdefs.cxx | 19 ++-
3 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7cb91a40e20b0ea405042429a1b497bf3c983e01
Author: Noel Grandin
AuthorDate: Thu Mar 17 15:24:27 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 18 09:59:04 2022 +0100
tdf#133603 cache languagetag in FontSubstConfiguration
speeds up saving XLSX by 10%
Change-Id: I5f48fcd3de44675d27e275c6ff2f4e51a067c750
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131727
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index 99520e39528b..1f77d484531a 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -32,8 +33,6 @@
namespace com::sun::star::container { class XNameAccess; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
-class LanguageTag;
-
enum class DefaultFontType;
// If you think the below concept of classifying a font (typeface) as possibly
being one or several
@@ -156,6 +155,7 @@ private:
std::unordered_map< OUString, LocaleSubst > m_aSubst;
typedef std::unordered_set< OUString > UniqueSubstHash;
mutable UniqueSubstHash maSubstHash;
+LanguageTag maLanguageTag;
void fillSubstVector( const css::uno::Reference<
css::container::XNameAccess >& rFont,
const OUString& rType,
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index ef94981d7746..371084708084 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -299,7 +299,8 @@ FontSubstConfiguration& FontSubstConfiguration::get()
*/
FontSubstConfiguration::FontSubstConfiguration() :
-maSubstHash( 300 )
+maSubstHash( 300 ),
+maLanguageTag("en")
{
if (utl::ConfigManager::IsFuzzing())
return;
@@ -339,6 +340,9 @@ FontSubstConfiguration::FontSubstConfiguration() :
}
SAL_INFO("unotools.config", "config provider: " << m_xConfigProvider.is()
<< ", config access: " << m_xConfigAccess.is());
+
+if( maLanguageTag.isSystemLocale() )
+maLanguageTag = SvtSysLocale().GetUILanguageTag();
}
/*
@@ -1042,13 +1046,8 @@ const FontNameAttr*
FontSubstConfiguration::getSubstInfo( const OUString& rFontN
FontNameAttr aSearchAttr;
aSearchAttr.Name = aSearchFont;
-LanguageTag aLanguageTag("en");
-
-if( aLanguageTag.isSystemLocale() )
-aLanguageTag = SvtSysLocale().GetUILanguageTag();
-
-::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings(
true));
-if (aLanguageTag.getLanguage() != "en")
+::std::vector< OUString > aFallbacks( maLanguageTag.getFallbackStrings(
true));
+if (maLanguageTag.getLanguage() != "en")
aFallbacks.emplace_back("en");
for (const auto& rFallback : aFallbacks)
diff --git a/unotools/source/misc/fontdefs.cxx
b/unotools/source/misc/fontdefs.cxx
index 66bd91363be7..9015f93e9de6 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -545,18 +545,19 @@ OUString GetSubsFontName( const OUString& rName,
SubsFontFlags nFlags )
|| aOrgName == "opensymbol" ) )
return aName;
-const utl::FontNameAttr* pAttr =
utl::FontSubstConfiguration::get().getSubstInfo( aOrgName );
-if ( pAttr && (nFlags & SubsFontFlags::MS) )
+if (nFlags & SubsFontFlags::MS)
{
-for( const auto& rSubstitution : pAttr->MSSubstitutions )
-if( ! ImplIsFontToken( rName, rSubstitution ) )
-{
-ImplAppendFontToken( aName, rSubstitution );
-if( nFlags & SubsFontFlags::ONLYONE )
+const utl::FontNameAttr* pAttr =
utl::FontSubstConfiguration::get().getSubstInfo( aOrgName );
+if (pAttr)
+for( const auto& rSubstitution : pAttr->MSSubstitutions )
+if( ! ImplIsFontToken( rName, rSubstitution ) )
{
-break;
+ImplAppendFontToken( aName, rSubstitution );
+if( nFlags & SubsFontFlags::ONLYONE )
+{
+break;
+}
}
-}
}
return aName;
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porexp.cxx |9 +
sw/source/core/text/porexp.hxx |2 ++
2 files changed, 11 insertions(+)
New commits:
commit f451878ccff475dd263ad67ade5e1896cf9fc734
Author: Miklos Vajna
AuthorDate: Fri Mar 18 08:09:11 2022 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 18 09:20:22 2022 +0100
sw layout xml dump: handle expand portions
Towards adding dumpAsXml() for all portions that have a HandlePortion().
Change-Id: I9cb1f4c1f966e5cfd7ca27e21bf8aa022979f3c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131724
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 6739419484f6..efacc3d5644a 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -38,6 +38,15 @@ void SwExpandPortion::HandlePortion( SwPortionHandler& rPH )
const
rPH.Special( GetLen(), OUString(), GetWhichPor() );
}
+void SwExpandPortion::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+(void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwExpandPortion"));
+
+SwTextPortion::dumpAsXml(pWriter);
+
+(void)xmlTextWriterEndElement(pWriter);
+}
+
SwPosSize SwExpandPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
SwTextSlot aDiffText( &rInf, this, false, false );
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 1ea608c9dfa2..6911c7d9113c 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -33,6 +33,8 @@ public:
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
+
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
/// Non-breaking space or non-breaking hyphen.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source
sc/source/ui/view/cellsh2.cxx | 49 ++
1 file changed, 49 insertions(+)
New commits:
commit 845585103fbde57fe41a969168e3611ebf5efccb
Author: Szymon Kłos
AuthorDate: Mon Mar 14 21:55:59 2022 +0100
Commit: Szymon Kłos
CommitDate: Fri Mar 18 09:06:25 2022 +0100
tdf#147761 record sort command in macros
fixes regression introduced in:
commit 70b81e74d2a14308e1897d840c681404225d328a
author Szymon Kłos Tue Jul 21 11:40:22 2020
+0200
SfxRequest's Done method records the action. It has to be called.
Change-Id: I32529fa11febca3d3829b4afd2cd4e6dd359bf74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131484
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
(cherry picked from commit eca978841816f833616b4c2334e65aa976a9fb61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131601
Tested-by: Szymon Kłos
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 0bed3b16141f..8ff829326597 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -526,6 +526,55 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
// subtotal when needed new
pTabViewShell->UISort( rOutParam );
+
+SfxViewFrame* pViewFrm =
pTabViewShell->GetViewFrame();
+if (pViewFrm)
+{
+SfxRequest aRequest(pViewFrm,
SID_SORT);
+
+if ( rOutParam.bInplace )
+{
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_BYROW,
+rOutParam.bByRow ) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_HASHEADER,
+rOutParam.bHasHeader ) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_CASESENS,
+rOutParam.bCaseSens ) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_NATURALSORT,
+rOutParam.bNaturalSort
) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_INCCOMMENTS,
+
rOutParam.aDataAreaExtras.mbCellNotes ) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_INCIMAGES,
+
rOutParam.aDataAreaExtras.mbCellDrawObjects ) );
+aRequest.AppendItem( SfxBoolItem(
SID_SORT_ATTRIBS,
+
rOutParam.aDataAreaExtras.mbCellFormats ) );
+sal_uInt16 nUser =
rOutParam.bUserDef ? ( rOutParam.nUserIndex + 1 ) : 0;
+aRequest.AppendItem(
SfxUInt16Item( SID_SORT_USERDEF, nUser ) );
+if (
rOutParam.maKeyState[0].bDoSort )
+{
+aRequest.AppendItem(
SfxInt32Item( FN_PARAM_1,
+
rOutParam.maKeyState[0].nField + 1 ) );
+aRequest.AppendItem(
SfxBoolItem( FN_PARAM_2,
+
rOutParam.maKeyState[0].bAscending ) );
+}
+if (
rOutParam.maKeyState[1].bDoSort )
+{
+aRequest.AppendItem(
SfxInt32Item( FN_PARAM_3,
+
rOutParam.maKeyState[1].nField + 1 ) );
+aRequest.AppendItem(
SfxBoolItem( FN_PARAM_4,
+
rOutParam.maKeyState[1].bAscending ) );
+}
+if (
rOutParam.maKeyState[2].bDoSort )
+{
+aRequest.AppendItem(
SfxInt32Item( FN_PARAM_5,
+
rOutParam.maKeyState[2].nField + 1 ) );
+aRequest.AppendItem(
SfxBoolItem( FN_PARAM_6,
+
rOutParam.maKeyState[2].bAscending ) );
+}
+}
+
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9bdc79bf46744d92242c14e9e6978dc590e953ea Author: Mike Kaganski AuthorDate: Fri Mar 18 08:47:35 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 18 08:47:35 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 87ab46fd2271fcf09ffc8a94bc403c3cf7082752 - Fix service name Change-Id: I3f8fcc74afe4ed64c64a5ee8beb41fe289ec7763 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131604 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/helpcontent2 b/helpcontent2 index f5aacf4b1d2b..87ab46fd2271 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f5aacf4b1d2bf97085ecf94becf9e026bfa80f0c +Subproject commit 87ab46fd2271fcf09ffc8a94bc403c3cf7082752
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03132300.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87ab46fd2271fcf09ffc8a94bc403c3cf7082752 Author: Mike Kaganski AuthorDate: Fri Mar 18 08:14:43 2022 +0100 Commit: Mike Kaganski CommitDate: Fri Mar 18 08:47:32 2022 +0100 Fix service name Change-Id: I3f8fcc74afe4ed64c64a5ee8beb41fe289ec7763 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131604 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/source/text/sbasic/shared/03132300.xhp b/source/text/sbasic/shared/03132300.xhp index e405a5a3e..0a490c7a3 100644 --- a/source/text/sbasic/shared/03132300.xhp +++ b/source/text/sbasic/shared/03132300.xhp @@ -39,7 +39,7 @@ The $[officename] API frequently uses the Any type. It is the counterpart of the Variant type known from other environments. The Any type holds one arbitrary Uno type and is used in generic Uno interfaces. oUnoValue = CreateUnoValue( "[]byte", MyBasicValue ) ' to get a byte sequence. -If CreateUnoValue cannot be converted to the specified Uno type, and error occurs. For the conversion, the TypeConverter service is used. +If CreateUnoValue cannot be converted to the specified Uno type, and error occurs. For the conversion, the com.sun.star.script.Converter service is used. This function is intended for use in situations where the default Basic to Uno type converting mechanism is insufficient. This can happen when you try to access generic Any based interfaces, such as XPropertySet::setPropertyValue( Name, Value ) or X???Container::insertBy???( ???, Value ), from $[officename] Basic. The Basic runtime does not recognize these types as they are only defined in the corresponding service. In this type of situation, $[officename] Basic chooses the best matching type for the Basic type that you want to convert. However, if the wrong type is selected, an error occurs. You use the CreateUnoValue() function to create a value for the unknown Uno type. You can also use this function to pass non-Any values, but this is not recommend. If Basic already knows the target type, using the CreateUnoValue() function will only lead to additional converting operations that slow down the Basic execution.
[Libreoffice-commits] core.git: include/xmloff schema/libreoffice sd/source svx/source xmloff/inc xmloff/qa xmloff/source
include/xmloff/xmltoken.hxx |1
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 53 +++-
sd/source/core/stlsheet.cxx | 12 ++
svx/source/table/cell.cxx | 10 ++
svx/source/unodraw/unoshape.cxx | 11 ++
xmloff/inc/enummaps.hxx |1
xmloff/qa/unit/data/refer-to-theme.odp |binary
xmloff/qa/unit/draw.cxx |6 +
xmloff/source/core/xmltoken.cxx |1
xmloff/source/draw/sdpropls.cxx |4
xmloff/source/token/tokens.txt |1
11 files changed, 78 insertions(+), 22 deletions(-)
New commits:
commit 1868dea877b0c956ee34e92afad59920e66cad3f
Author: Miklos Vajna
AuthorDate: Thu Mar 17 20:37:39 2022 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 18 08:07:02 2022 +0100
sd theme: add ODP import/export for shape fill color
Refer to the 12 pre-defined colors by name + don't write the attribute
for the case when there is no theme.
Change-Id: I37c984b3371ec878a0d733977f5c937dce27c440
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131717
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 26b46bf890d6..22e2459387ec 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3445,6 +3445,7 @@ namespace xmloff::token {
XML_THEME,
XML_THEME_COLOR,
+XML_FILL_THEME_COLOR,
XML_DK1,
XML_LT1,
XML_DK2,
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 7b3eff94de1c..63832dbb887f 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -1597,6 +1597,12 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
+
+
+
+
+
+
@@ -2093,29 +2099,10 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
-
+
-
-
- dk1
-
- lt1
-
- dk2
-
- lt2
- accent1
- accent2
- accent3
- accent4
- accent5
- accent6
-
- hlink
-
- folHlink
-
+
@@ -2895,7 +2882,7 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
-
+
@@ -2909,4 +2896,26 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
+
+
+
+ dk1
+
+ lt1
+
+ dk2
+
+ lt2
+ accent1
+ accent2
+ accent3
+ accent4
+ accent5
+ accent6
+
+ hlink
+
+ folHlink
+
+
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 30b4bc38eee8..feff63dbf69a 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1315,6 +1316,17 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState(
const OUString& PropertyN
if( ( pItem == nullptr ) || pItem->GetName().isEmpty() )
eState = PropertyState_DEFAULT_VALUE;
}
+break;
+case XATTR_FILLCOLOR:
+if (pEntry->nMemberId == MID_COLOR_THEME_INDEX)
+{
+const XFillColorItem* pColor =
rStyleSet.GetItem(pEntry->nWID);
+if (pColor->GetThemeColor().GetThemeIndex() == -1)
+{
+eState = PropertyState_DEFAULT_VALUE;
+}
+}
+break;
}
}
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 8f1dbe55ddca..696710da6cd1 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
@@ -1445,6 +1446,15 @@ PropertyState SAL_CALL Cell::getPropertyState( const
OUString& PropertyName )
eState = PropertyState_DEFAULT_VALUE;
}
break;
+case XATTR_FILLCOLOR:
+if (pMap->nMemberId == MID_COLOR_THEME_INDEX)
+{
+const XFillColorItem* pColor =
