[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoTable.hxx |2 +-
sw/source/core/undo/untbl.cxx|8 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit e782937228479054336b564a4c34697a12530469
Author: Miklos Vajna
AuthorDate: Thu Mar 18 20:59:36 2021 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 19 08:08:14 2021 +0100
Related: tdf#133933 sw: fix assertion failure in the SwIndexReg dtor
Make sure that by the time we delete a text node, no SwIndexes point to
us.
Change-Id: I9248a2ebe529e5a0aab0e37bf676e669b9bddb1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112698
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 15bb1dc85bea..472f9fdd65d5 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -273,7 +273,7 @@ class SwUndoTableCpyTable : public SwUndo
//b6341295: When redlining is active, PrepareRedline has to create the
//redlining attributes for the new and the old table cell content
static std::unique_ptr PrepareRedline( SwDoc* pDoc, const
SwTableBox& rBox,
-const SwPosition& rPos, bool& rJoin, bool bRedo );
+SwPosition& rPos, bool& rJoin, bool bRedo );
public:
SwUndoTableCpyTable(const SwDoc& rDoc);
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index b15a8db09331..fdc8b25b0631 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2493,7 +2493,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext
& rContext)
// Otherwise aInsIdx has been moved during the Undo operation
if( pEntry->bJoin )
{
-SwPaM const& rLastPam =
+SwPaM& rLastPam =
rContext.GetCursorSupplier().GetCurrentShellCursor();
pUndo = PrepareRedline( &rDoc, rBox, *rLastPam.GetPoint(),
pEntry->bJoin, true );
@@ -2608,7 +2608,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox&
rBox, const SwNodeIndex
// rJoin is true if Redo() is calling and the content has already been merged
std::unique_ptr SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc,
const SwTableBox& rBox,
-const SwPosition& rPos, bool& rJoin, bool bRedo )
+SwPosition& rPos, bool& rJoin, bool bRedo )
{
std::unique_ptr pUndo;
// b62341295: Redline for copying tables
@@ -2632,6 +2632,10 @@ std::unique_ptr
SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const
if( !bRedo && rPos.nNode.GetNode().GetTextNode() )
{ // Try to merge, if not called by Redo()
rJoin = true;
+
+// Park this somewhere else so nothing points to the
to-be-deleted node.
+rPos.nContent.Assign(pText, 0);
+
pText->JoinNext();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: oox import/export of custom shape extrusion
Hi Regina, On Thu, Mar 18, 2021 at 04:24:38PM +0100, Regina Henschel wrote: > I want to work on getting oox import/export of custom shape extrusion. Great, much appreciated. > In case a grabBag exists, it will be necessary to merge values from the > internal "extrusion" property with values from the grabBag on export. In > case no grabBag exists, writing OOXML from the internal properties is > needed. In case no internal "extrusion" property exists, the current > solution of writing the gragBag is OK. > > Should I use separate solutions for the three cases? Advantage would be, > that the development can be done without interfering the current solution > for "only grabBag". But a solution for "merge" would be able to solve the > situation "no grabBag" and "only grabBag" too, so doing only that might > avoid code duplication. The motivation bethind grab-bag is to preserve properties from OOXML, which is not handled by libreoffice core. So in case there is a grab-bag attached to a shape and you use the UI to modify the shape, it's perfectly valid to just empty the grab-bag. This is predictable behavior and you will never have to handle a mix of real document model and grab-bag for the same shape. As an example, we store smartart data in the shape grab-bag. But once you edit the shape text, we empty the grab-bag, so your text edits are not lost on save (since commit a01ae07740e5c311fcc37f2ac2e2a0a2a1935920). Does that help? Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: emfio/qa emfio/source
emfio/qa/cppunit/emf/EmfImportTest.cxx | 30 +++---
emfio/source/reader/emfreader.cxx | 17 ++---
2 files changed, 21 insertions(+), 26 deletions(-)
New commits:
commit 54a8aefa3372dce3da7cf0ad846d55d1b7b92467
Author: Bartosz Kosiorek
AuthorDate: Wed Mar 17 18:16:04 2021 +0100
Commit: Bartosz Kosiorek
CommitDate: Fri Mar 19 09:00:11 2021 +0100
tdf#35986 tdf#140271 EMF Fix line width of CREATEPEN record
According to [MS-EMF] documentation:
"If the pen type in the PenStyle field is
PS_COSMETIC, this value MUST be 0x0001."
Unfortunately based on observation of EMF import,
it seems that it is not true. As a result the implementation
must be partially reversed.
Change-Id: I0c2ec5e26b710e1a12d5196b6c8be4709f26dc4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112651
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 85450a2e67a3..f587135e1b1e 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -312,7 +312,7 @@ void Test::TestEnglishMapMode()
void Test::TestCreatePen()
{
// Check import of EMF image with records: RESTOREDC, SAVEDC, MOVETOEX,
LINETO, POLYLINE16, EXTTEXTOUTW with DxBuffer
-// The CREATEPEN record is used with PS_COSMETIC line style, which will be
displayed as solid hairline
+// The CREATEPEN record is used with PS_COSMETIC line style, which
sometimes will be displayed as solid hairline
Primitive2DSequence aSequence =
parseEmf(u"/emfio/qa/cppunit/emf/data/TestCreatePen.emf");
CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
drawinglayer::Primitive2dXmlDump dumper;
@@ -321,24 +321,24 @@ void Test::TestCreatePen()
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygon",
"path", "m0 0h31250v18192h-31250z");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke", 3);
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/polygon", "17898,5693
20172,5693");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line", "color",
"#008000");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line", "width", "3");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke", 748);
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/polygon", "27875,16523
27875,1453");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line", "color",
"#ff");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line", "width", "6");
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/polygon", "17898,6959
20172,6959");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line", "color",
"#80");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line", "width", "3");
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/polygon", "27975,16453
27875,16453");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line", "color",
"#ff");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line", "width", "6");
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[3]/polygon", "17898,7381
20172,7381");
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[3]/polygon", "27925,16078
27875,16078");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[3]/line", "color",
"#ff");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[3]/line", "width", "3");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[3]/line", "width", "6");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline", 755);
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline[10]", "color", "#ff");
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline[10]/polygon",
"27925,14180 27875,14180");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline[100]", "color",
"#008000");
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline[100]/polygon",
"26100,14414 26050,14414");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline", 10);
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonhairline[5]", "color", "#008000");
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/p
[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfimport.mk sw/qa sw/source
sw/CppunitTest_sw_odfimport.mk |2
sw/qa/extras/odfimport/data/vmerge-cell-border.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 24
sw/source/filter/xml/xmltbli.cxx | 58 -
sw/source/filter/xml/xmltbli.hxx | 10 +++
5 files changed, 93 insertions(+), 1 deletion(-)
New commits:
commit 1001dbaef4dec2b51c25ed8343bab6910f1219e1
Author: Miklos Vajna
AuthorDate: Fri Mar 19 08:42:35 2021 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 19 09:41:10 2021 +0100
ODT import: handle style name of covered cells
Similar to commit 66ac8e60896f6306bed8fbb34606fd14474f19ce (sw: fix
unwanted long vertical border around vertically merged Word cell,
2021-03-04), but that one was for the DOCX import / rendering.
Change-Id: I394a4f062544a9774b9b40ec757cb37e72220561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112696
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 61a1547dd473..dabab5254279 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -19,11 +19,13 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sw_odfimport, \
$(eval $(call gb_CppunitTest_use_libraries,sw_odfimport, \
comphelper \
+editeng \
cppu \
cppuhelper \
sal \
svt \
sfx \
+ svl \
sw \
swqahelper \
test \
diff --git a/sw/qa/extras/odfimport/data/vmerge-cell-border.odt
b/sw/qa/extras/odfimport/data/vmerge-cell-border.odt
new file mode 100644
index ..bf387bcb183e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/vmerge-cell-border.odt
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 6ab87d07a3de..ac7e34a9ebdd 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -43,6 +43,7 @@
#include
#include
+#include
#include
#include
@@ -54,6 +55,7 @@
#include
#include
#include
+#include
typedef std::map >
AllBordersMap;
typedef std::pair >
StringSequencePair;
@@ -1158,5 +1160,27 @@ CPPUNIT_TEST_FIXTURE(Test,
testPasteFirstParaDirectFormat)
getProperty(xParagraph, "ParaAdjust"));
}
+CPPUNIT_TEST_FIXTURE(Test, testVerticallyMergedCellBorder)
+{
+// Given a document with two cells, vertically merged, when loading the
document:
+SwDoc* pDoc = createSwDoc(mpTestDocumentPath, "vmerge-cell-border.odt");
+
+// Then make sure that the first cell has a right border while the second
has no right border:
+SwDocShell* pDocShell = pDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/1);
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(/*bBlock=*/false);
+SwStartNode* pA1 =
pShellCursor->Start()->nNode.GetNode().StartOfSectionNode();
+const SwAttrSet& rA1Set =
pA1->GetTableBox()->GetFrameFormat()->GetAttrSet();
+CPPUNIT_ASSERT(rA1Set.GetBox().GetRight());
+SwNodeIndex aA2(*pA1->EndOfSectionNode(), 1);
+const SwAttrSet& rA2Set =
aA2.GetNode().GetTableBox()->GetFrameFormat()->GetAttrSet();
+
+// Without the accompanying fix in place, this test would have failed, as
the A2 cell also had a
+// right border, even if
explicitly disabled
+// it.
+CPPUNIT_ASSERT(!rA2Set.GetBox().GetRight());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index e1deda38e2fa..041784f15ef7 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -127,6 +127,7 @@ public:
sal_uInt32 GetRowSpan() const { return nRowSpan; }
void SetRowSpan( sal_uInt32 nSet ) { nRowSpan = nSet; }
sal_uInt32 GetColSpan() const { return nColSpan; }
+void SetStyleName(const OUString& rStyleName) { aStyleName = rStyleName; }
const OUString& GetStyleName() const { return aStyleName; }
const OUString& GetFormula() const { return sFormula; }
double GetValue() const { return dValue; }
@@ -333,6 +334,36 @@ public:
SwXMLImport& GetSwImport() { return
static_cast(GetImport()); }
};
+/// Handles .
+class SwXMLCoveredTableCellContext : public SvXMLImportContext
+{
+public:
+SwXMLCoveredTableCellContext(SwXMLImport& rImport,
+ const
Reference& xAttrList,
+ SwXMLTableContext& rTable);
+};
+
+SwXMLCoveredTableCellContext::SwXMLCoveredTableCellContext(
+SwXMLImport& rImport, const Reference&
xAttrList,
+SwXMLTableContext& rTable)
+: SvXMLImportContext(rImport)
+{
+OUString aStyleName;
+for (auto& rIter : sax_fastparser::castToFastAttributeList(xAttrList))
+{
+switch (rIter.getToken())
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svl svl/source sw/source xmlsecurity/inc xmlsecurity/source
include/svl/sigstruct.hxx | 32 + svl/source/crypto/cryptosign.cxx | 16 sw/source/core/edit/edfcol.cxx|3 xmlsecurity/inc/biginteger.hxx|3 xmlsecurity/inc/xmlsignaturehelper.hxx| 12 xmlsecurity/inc/xsecctl.hxx | 14 xmlsecurity/source/component/documentdigitalsignatures.cxx| 54 +-- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx| 15 xmlsecurity/source/helper/documentsignaturehelper.cxx | 63 ++- xmlsecurity/source/helper/documentsignaturemanager.cxx| 12 xmlsecurity/source/helper/ooxmlsecexporter.cxx| 22 - xmlsecurity/source/helper/ooxmlsecparser.cxx | 22 + xmlsecurity/source/helper/pdfsignaturehelper.cxx |8 xmlsecurity/source/helper/xmlsignaturehelper.cxx | 161 ++ xmlsecurity/source/helper/xsecctl.cxx | 80 ++-- xmlsecurity/source/helper/xsecparser.cxx | 144 xmlsecurity/source/helper/xsecsign.cxx| 30 + xmlsecurity/source/helper/xsecverify.cxx | 124 ++- xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 47 ++ xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx|2 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 25 + xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx|3 22 files changed, 678 insertions(+), 214 deletions(-) New commits: commit a1cf770c2d7ca3e153e0b1f01ddcc313bc2bed7f Author: Michael Stahl AuthorDate: Thu Feb 25 14:17:48 2021 +0100 Commit: Caolán McNamara CommitDate: Fri Mar 19 09:56:51 2021 +0100 xmlsecurity: improve handling of multiple X509Data elements Combine everything related to a certificate in a new struct X509Data. The CertDigest is not actually written in the X509Data element but in xades:Cert, so try to find the matching entry in XSecController::setX509CertDigest(). There was a confusing interaction with PGP signatures, where ouGpgKeyID was used for import, but export wrote the value from ouCertDigest instead - this needed fixing. The main point of this is enforcing a constraint from xmldsig-core 4.5.4: All certificates appearing in an X509Data element MUST relate to the validation key by either containing it or being part of a certification chain that terminates in a certificate containing the validation key. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111254 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 9e82509b09f5fe2eb77bcdb8fd193c71923abb67) xmlsecurity: improve handling of multiple certificates per X509Data It turns out that an X509Data element can contain an arbitrary number of each of its child elements. How exactly certificates of an issuer chain may or should be distributed across multiple X509Data elements isn't terribly obvious. One thing that is clear is that any element that refers to or contains one particular certificate has to be a child of the same X509Data element, although in no particular order, so try to match the 2 such elements that the parser supports in XSecController::setX509Data(). Presumably the only way it makes sense to have multiple signing certificates is if they all contain the same key but are signed by different CAs. This case isn't handled currently; CheckX509Data() will complain there's not a single chain and validation of the certificates will fail. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111500 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 5af5ea893bcb8a8eb472ac11133da10e5a604e66) xmlsecurity: add EqualDistinguishedNames() Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111545 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 1d3da3486d827dd5e7a3bf1c7a533f5aa9860e42) xmlsecurity: avoid exception in DigitalSignaturesDialog::getCertificate() Fallback to PGP if there's no X509 signing certificate because CheckX509Data() failed prevents the dialog from popping up. To avoid confusing the user in this situation, the dialog should show no certificate, which is already the case. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111664 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 90b725675c2964f4a151d802d9afedd8bc2ae1a7) xmlsecurity: fix crash in DocumentDigitalSignatures::isAuthorTrusted() If the argume
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-2' - basic/qa basic/source
basic/qa/basic_coverage/test_string_replace.vb |6 ++
basic/source/runtime/methods.cxx |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit d3f425c85d4664069f5b7e5d380a407631070da7
Author: Andreas Heinisch
AuthorDate: Mon Mar 15 13:41:58 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Mar 19 09:58:23 2021 +0100
tdf#141045 - fixed copy paste error in the replace function
Change-Id: Id68670fed89e4cc700c5eea395139914bebdb657
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112509
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
(cherry picked from commit ac0b6fb3842201e438950ea99a55ad334f8521ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112512
Reviewed-by: Xisco Fauli
(cherry picked from commit fde29198bd8e345c9a61a9f4d4671a3022a84cf9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112520
Reviewed-by: Michael Stahl
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basic/qa/basic_coverage/test_string_replace.vb
b/basic/qa/basic_coverage/test_string_replace.vb
index 99eafdba6b14..e2e9ce35962b 100644
--- a/basic/qa/basic_coverage/test_string_replace.vb
+++ b/basic/qa/basic_coverage/test_string_replace.vb
@@ -23,6 +23,12 @@ Function verify_stringReplace() As String
retStr = Replace("АБВабв", "б", "*")
TestLog_ASSERT retStr, "А*Ва*в", "case-insensitive non-ASCII: " & retStr
+' tdf#141045 - different length of search and replace string. It is
important
+' that the search string starts with the original string in order to test
the error.
+' Without the fix in place, the string index calculations result in a
crash.
+retStr = Replace("a", "abc", "ab")
+TestLog_ASSERT retStr, "a", "different length of search and replace
string: " & retStr
+
result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
verify_stringReplace = result
End Function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1fbcdd9680e2..1a598490d68a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1286,7 +1286,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
const css::lang::Locale& rLocale =
Application::GetSettings().GetUILanguageTag().getLocale();
css::uno::Reference < i18n::XCharacterClassification > xCharClass =
vcl::unohelper::CreateCharacterClassification();
aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(),
rLocale);
-aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(),
rLocale);
+aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(),
rLocale);
}
// Note: the result starts from lStartPos, removing everything to the
left. See i#94895.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
-> ESC agenda
Hi Lubos, Julian, all, I'd really like to encourage you not to pre-emptively give up on the governance that we do have =) It seems clear that some people object to this change; and it seems clear that there was not a full discussion that reflected that at the ESC: On 18/03/2021 18:17, julien2412 wrote: > No need to come since it's easier for me to write (no schedule > constraints for example) and the migration will be done anyway, no > need to worry My goal was just to thank a lot Luboš and to > provide arguments against the migration. Nevertheless, I already knew > the battle, battle against this censorship (I weigh my words) was > lost. Well - if you feel strongly; I'd encourage you to come and make your point - or for at least someone to speak out. From my perspective it is -really- important that people can speak up and say what they think. Ideally in a constructive and as balanced a way as possible, avoiding overly emotive or simplified constructions - that makes it easier for everyone to be heard. I really don't think there is a foregone conclusion. On 18/03/2021 20:04, Luboš Luňák wrote: > in order to make the discussion somewhat more constructive, I have > an alternative proposal on how to resolve the problem. I'd love you to come and propose that. I'm also aware that some people are concerned that this turns into a much wider and more concerning project than it is ie. the slippery slope argument. I'm not so convinced about that - but its easy to avoid that by hearing Thorsten's bigger-picture plan here. So - thanks for raising this; I'd really like to end the thread here - and take it to the next ESC meeting. Miklos - can you put it on the agenda ? Thanks, Michael. -- michael.me...@collabora.com <><, GM Collabora Productivity Hangout: mejme...@gmail.com, Skype: mmeeks (M) +44 7795 666 147 - timezone usually UK / Europe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/uiconfig
cui/uiconfig/ui/spellingdialog.ui | 12 1 file changed, 12 insertions(+) New commits: commit 66319fd36564f55feb9669b3f117176f4ef4c939 Author: Caolán McNamara AuthorDate: Tue Mar 16 16:07:24 2021 + Commit: Michael Stahl CommitDate: Fri Mar 19 11:12:58 2021 +0100 tdf#141027 set all buttons to the same max width so changing from "ignore all" to "ignore rule" makes no difference, which removes the redraw problem with Russian UI Change-Id: I27c0e7b00a4f77ac5348aeee64bf312afff423cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112587 Tested-by: Jenkins Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara (cherry picked from commit feb6fd1f4213ef114e63a3dd398c2cba6a5e93ea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112620 Reviewed-by: Michael Stahl diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index a12e3a2b6d96..83a838eb0d6e 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -651,4 +651,16 @@ + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarstylespanel.ui | 45 -- 1 file changed, 22 insertions(+), 23 deletions(-) New commits: commit 5df473002da1d04d5be12b9223e1e132cae53a62 Author: Caolán McNamara AuthorDate: Thu Mar 18 17:24:58 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 11:40:37 2021 +0100 drop vexpand from styles panel Change-Id: I02f8d68342ba3082c960109b078f6124a17dae3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112697 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svx/uiconfig/ui/sidebarstylespanel.ui b/svx/uiconfig/ui/sidebarstylespanel.ui index 2a411ff8d9e4..9c33e7da3d4f 100644 --- a/svx/uiconfig/ui/sidebarstylespanel.ui +++ b/svx/uiconfig/ui/sidebarstylespanel.ui @@ -1,49 +1,48 @@ - + True -False +False True True -False +False True -True -6 +6 6 True -False +False True vertical True -True +True True -icons -False +icons +False True -False +False True True -False +False True -True -False +True +False +True True -True @@ -71,19 +70,19 @@ True -False +False True -True +True 3 -icons -False +icons +False 2 True -False +False True @@ -93,7 +92,7 @@ True -False +False True @@ -103,7 +102,7 @@ True -False +False True @@ -126,8 +125,8 @@ -0 -0 +0 +0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/02/0801.xhp |2 +- source/text/scalc/main0208.xhp |2 +- source/text/shared/02/0802.xhp |2 +- source/text/shared/main0208.xhp|2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 5ad095b0204b6f0eb5aab14d1e4a16fce1ba2632 Author: Johnny_M AuthorDate: Fri Mar 19 10:46:42 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:03:11 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ibd3db13f8d9c65b191c9cee0325f7ac788e28a5d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112704 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/02/0801.xhp b/source/text/scalc/02/0801.xhp index 3f5bb7ec9..39b648223 100644 --- a/source/text/scalc/02/0801.xhp +++ b/source/text/scalc/02/0801.xhp @@ -30,7 +30,7 @@ - + Position in document Displays the number of the current sheet and the total number of sheets in the spreadsheet. diff --git a/source/text/scalc/main0208.xhp b/source/text/scalc/main0208.xhp index f35ccabc5..f06ede5ff 100644 --- a/source/text/scalc/main0208.xhp +++ b/source/text/scalc/main0208.xhp @@ -31,7 +31,7 @@ Status Bar The Status Bar displays information about the current sheet. - + diff --git a/source/text/shared/02/0802.xhp b/source/text/shared/02/0802.xhp index 170639b1b..c58048d4d 100644 --- a/source/text/shared/02/0802.xhp +++ b/source/text/shared/02/0802.xhp @@ -28,7 +28,7 @@ - + Position in Document Displays the current cursor position in the %PRODUCTNAME Basic document. The row number is specified, then the column number. diff --git a/source/text/shared/main0208.xhp b/source/text/shared/main0208.xhp index eb8a479d4..a8d22bdc7 100644 --- a/source/text/shared/main0208.xhp +++ b/source/text/shared/main0208.xhp @@ -36,7 +36,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 48feb32280bb229ff8e493381f9d683df8b8e47d Author: Johnny_M AuthorDate: Fri Mar 19 12:03:11 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:03:11 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 5ad095b0204b6f0eb5aab14d1e4a16fce1ba2632 - tdf#132643 Translate German section IDs Change-Id: Ibd3db13f8d9c65b191c9cee0325f7ac788e28a5d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112704 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 75d047408148..5ad095b0204b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 75d047408148b9c914b964017738d3b96b528017 +Subproject commit 5ad095b0204b6f0eb5aab14d1e4a16fce1ba2632 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0801.xhp |2 +- source/text/shared/main0208.xhp|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a24d2d03172ed1a0f6487c075578bde533bff626 Author: Johnny_M AuthorDate: Fri Mar 19 10:48:14 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:03:42 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I89247f878c8746e68f7c1f988c2c762d60334aa3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112705 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0801.xhp b/source/text/shared/02/0801.xhp index 2b0fbf56a..9813017a8 100644 --- a/source/text/shared/02/0801.xhp +++ b/source/text/shared/02/0801.xhp @@ -28,7 +28,7 @@ - + Document Information Displays information about the active %PRODUCTNAME Basic document. The names of the document, the library, and the module are displayed, separated by dots. diff --git a/source/text/shared/main0208.xhp b/source/text/shared/main0208.xhp index a8d22bdc7..be505447d 100644 --- a/source/text/shared/main0208.xhp +++ b/source/text/shared/main0208.xhp @@ -34,7 +34,7 @@ Status Bar in $[officename] Basic Documents The Status Bar displays information about the current $[officename] Basic document. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28f2f50510f6d7e667293a32d3cec46bb34a24f7 Author: Johnny_M AuthorDate: Fri Mar 19 12:03:42 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:03:42 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a24d2d03172ed1a0f6487c075578bde533bff626 - tdf#132643 Translate German section IDs Change-Id: I89247f878c8746e68f7c1f988c2c762d60334aa3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112705 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5ad095b0204b..a24d2d03172e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5ad095b0204b6f0eb5aab14d1e4a16fce1ba2632 +Subproject commit a24d2d03172ed1a0f6487c075578bde533bff626 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05030100.xhp |4 ++-- source/text/shared/02/0311.xhp |4 ++-- source/text/simpress/main0203.xhp |4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 43ca714789ab82c7561f5b30a56f77d7bffdf963 Author: Johnny_M AuthorDate: Fri Mar 19 10:51:40 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:04:33 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I8e846ef21a82835e62db20a3cd3aa08fd85dc5aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112706 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05030100.xhp b/source/text/shared/01/05030100.xhp index f8656562c..814c507c9 100644 --- a/source/text/shared/01/05030100.xhp +++ b/source/text/shared/01/05030100.xhp @@ -73,7 +73,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/source/text/shared/02/0311.xhp b/source/text/shared/02/0311.xhp index a59a00aea..f620fd361 100644 --- a/source/text/shared/02/0311.xhp +++ b/source/text/shared/02/0311.xhp @@ -28,12 +28,12 @@ - + Increase Spacing Click the Increase Spacing icon to increase the paragraph spacing above the selected paragraph. - + diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 26505a43c..4024ed6fa 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -52,8 +52,8 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ca5ce61c9d91eb77da2e085935fc9291b61bf6e Author: Johnny_M AuthorDate: Fri Mar 19 12:04:33 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:04:33 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 43ca714789ab82c7561f5b30a56f77d7bffdf963 - tdf#132643 Translate German section IDs Change-Id: I8e846ef21a82835e62db20a3cd3aa08fd85dc5aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112706 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a24d2d03172e..43ca714789ab 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a24d2d03172ed1a0f6487c075578bde533bff626 +Subproject commit 43ca714789ab82c7561f5b30a56f77d7bffdf963 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0205.xhp |4 ++-- source/text/shared/02/0204.xhp |4 ++-- source/text/simpress/main0203.xhp |4 ++-- source/text/swriter/main0220.xhp |4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) New commits: commit dd35bdfc9a28343688df30e8617b24dab0620cde Author: Johnny_M AuthorDate: Fri Mar 19 10:56:05 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:05:21 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I4b5d5585415fac4128101128270869b0dd20f3ce Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112707 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 1e2003816..2ce760fd2 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -82,8 +82,8 @@ - - + + diff --git a/source/text/shared/02/0204.xhp b/source/text/shared/02/0204.xhp index 12e8b3dbc..9be679f1d 100644 --- a/source/text/shared/02/0204.xhp +++ b/source/text/shared/02/0204.xhp @@ -28,12 +28,12 @@ - + Text running from left to right Specifies the horizontal direction of the text. - + diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 4024ed6fa..86b1ee602 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -129,8 +129,8 @@ - - + + Increase Font Size diff --git a/source/text/swriter/main0220.xhp b/source/text/swriter/main0220.xhp index 12cadcde3..1bd738727 100644 --- a/source/text/swriter/main0220.xhp +++ b/source/text/swriter/main0220.xhp @@ -60,8 +60,8 @@ - - + + Select All ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ff26e4787c9e51fa07277c31989176943d46fd1 Author: Johnny_M AuthorDate: Fri Mar 19 12:05:21 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:05:21 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to dd35bdfc9a28343688df30e8617b24dab0620cde - tdf#132643 Translate German section IDs Change-Id: I4b5d5585415fac4128101128270869b0dd20f3ce Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112707 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 43ca714789ab..dd35bdfc9a28 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 43ca714789ab82c7561f5b30a56f77d7bffdf963 +Subproject commit dd35bdfc9a28343688df30e8617b24dab0620cde ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/02/14020200.xhp |4 ++-- source/text/shared/main0214.xhp|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit b4fd7e41094ae6e9ca5bdf5d0c86f594ef58271a Author: Johnny_M AuthorDate: Fri Mar 19 11:02:18 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:06:32 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ibd2baadac00917bc152966c582f0e1d7ccb609ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112709 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/14020200.xhp b/source/text/shared/02/14020200.xhp index 1d40edf3f..e9d93dace 100644 --- a/source/text/shared/02/14020200.xhp +++ b/source/text/shared/02/14020200.xhp @@ -28,12 +28,12 @@ - + Switch Design View On/Off Displays the design view or the SQL view of the query. - + diff --git a/source/text/shared/main0214.xhp b/source/text/shared/main0214.xhp index e80b3f9f2..4073f449c 100644 --- a/source/text/shared/main0214.xhp +++ b/source/text/shared/main0214.xhp @@ -39,8 +39,8 @@ - - + + Add Tables ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfbc3f49e8dd9322390e67a9742d2cc8a9256671 Author: Johnny_M AuthorDate: Fri Mar 19 12:06:32 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:06:32 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b4fd7e41094ae6e9ca5bdf5d0c86f594ef58271a - tdf#132643 Translate German section IDs Change-Id: Ibd2baadac00917bc152966c582f0e1d7ccb609ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112709 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dd35bdfc9a28..b4fd7e41094a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dd35bdfc9a28343688df30e8617b24dab0620cde +Subproject commit b4fd7e41094ae6e9ca5bdf5d0c86f594ef58271a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040500.xhp |2 +- source/text/shared/01/0503.xhp |2 +- source/text/shared/01/05030300.xhp |4 ++-- source/text/shared/02/1301.xhp |2 +- source/text/swriter/01/04120221.xhp |2 +- source/text/swriter/01/04120222.xhp |2 +- source/text/swriter/01/04120223.xhp |2 +- source/text/swriter/01/04120224.xhp |2 +- source/text/swriter/01/04120225.xhp |2 +- source/text/swriter/01/04120226.xhp |2 +- source/text/swriter/01/04120227.xhp |2 +- source/text/swriter/main0213.xhp|2 +- 12 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 49b1e322e38412a6c4bce867870691b96719029d Author: Johnny_M AuthorDate: Fri Mar 19 11:14:24 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:08:00 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Iad07a1aa41e465d1579ebd5d9eae141b41116e60 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112710 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp index 9000bd53e..81ea09712 100644 --- a/source/text/shared/00/00040500.xhp +++ b/source/text/shared/00/00040500.xhp @@ -112,7 +112,7 @@ Choose Format - Paragraph - Indents & Spacing tab. Choose View - Styles - open context menu of an entry and choose Modify/New - Indents & Spacing tab. - + Choose Format - Paragraph - Tabs tab. Choose View - Styles - open context menu of an entry and choose Modify/New - Tabs tab. Double-click the ruler diff --git a/source/text/shared/01/0503.xhp b/source/text/shared/01/0503.xhp index 9c254c95c..fc56dfdaf 100644 --- a/source/text/shared/01/0503.xhp +++ b/source/text/shared/01/0503.xhp @@ -43,7 +43,7 @@ - + diff --git a/source/text/shared/01/05030300.xhp b/source/text/shared/01/05030300.xhp index 08a6ced3c..90f6b872b 100644 --- a/source/text/shared/01/05030300.xhp +++ b/source/text/shared/01/05030300.xhp @@ -27,7 +27,7 @@ - + formats; tabulators fill characters with tabulators tab stops;settings @@ -39,7 +39,7 @@ If you want, you can also use the ruler to set the tab positions. - + Position diff --git a/source/text/shared/02/1301.xhp b/source/text/shared/02/1301.xhp index 6eba1dadd..bcb170ae0 100644 --- a/source/text/shared/02/1301.xhp +++ b/source/text/shared/02/1301.xhp @@ -28,7 +28,7 @@ - + Setting Tabs On the ruler, set the tabs for the current paragraph, or all selected paragraphs, using the mouse. diff --git a/source/text/swriter/01/04120221.xhp b/source/text/swriter/01/04120221.xhp index b8ceca9a5..f26ac46e2 100644 --- a/source/text/swriter/01/04120221.xhp +++ b/source/text/swriter/01/04120221.xhp @@ -76,7 +76,7 @@ Inserts the text of the chapter heading. - + Tab stop (T) diff --git a/source/text/swriter/01/04120222.xhp b/source/text/swriter/01/04120222.xhp index fac65a8f6..fae15b6d8 100644 --- a/source/text/swriter/01/04120222.xhp +++ b/source/text/swriter/01/04120222.xhp @@ -39,7 +39,7 @@ Level "S" refers to the single letter headings that divide the index entries alphabetically. To enable these headings, select the Alphabetical delimiter check box in the Format area. - + Chapter Info Inserts chapter information, such as the chapter heading and number. Select the information that you want to display in the Chapter entry box. diff --git a/source/text/swriter/01/04120223.xhp b/source/text/swriter/01/04120223.xhp index 57622c86b..38a7ddce0 100644 --- a/source/text/swriter/01/04120223.xhp +++ b/source/text/swriter/01/04120223.xhp @@ -39,7 +39,7 @@ Illustration Indexes only have one index level. - + diff --git a/source/text/swriter/01/04120224.xhp b/source/text/swriter/01/04120224.xhp index df8e6a1c2..f66b3a2f1 100644 --- a/source/text/swriter/01/04120224.xhp +++ b/source/text/swriter/01/04120224.xhp @@ -39,7 +39,7 @@ An Index of Tables only has one index level. - + diff --git a/source/text/swriter/01/04120225.xhp b/source/text/swriter/01/04120225.xhp index 533a9e14f..914a89829 100644 --- a/source/text/swriter/01/04120225.xhp +++ b/source/text/swriter/01/04120225.xhp @@ -39,7 +39,7 @@ User-defined indexes do not support sub-keys. - + diff --git a/source/text/swriter/01/04120226.xhp b/source/text/swriter/01/04120226.xhp index b52ccf94a..3664b7a0b 100644 --- a/source/text/swriter/01/04120226.xhp +++ b/source/text/swriter/01/04120226.xhp @@ -39,7 +39,7 @@ A Table of Objects only has one index level. - + diff --git a/source/text/swriter/01/04120227.xhp b/source/text/swriter/01/04120227.xhp index e530d0e8a..990daf2d8 100644 --- a/source/text/swriter/01/04120227.xhp +++ b/source/text/swriter/01/04120227.xhp @@ -38,7 +38,7 @@ Type The types that are displayed depend on the different literature sources. - + Type Lists the available bibliography entries. To add an entry to the Structure l
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 26c4a732deac00e3d8c1efd60d12beaa3d07271e Author: Johnny_M AuthorDate: Fri Mar 19 12:08:00 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:08:00 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 49b1e322e38412a6c4bce867870691b96719029d - tdf#132643 Translate German section IDs Change-Id: Iad07a1aa41e465d1579ebd5d9eae141b41116e60 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112710 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b4fd7e41094a..49b1e322e384 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b4fd7e41094ae6e9ca5bdf5d0c86f594ef58271a +Subproject commit 49b1e322e38412a6c4bce867870691b96719029d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/07/0900.xhp |2 +- source/text/shared/main0800.xhp|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5fd56260ef5af41277d8395dd7ae53bd7a03b147 Author: Johnny_M AuthorDate: Fri Mar 19 11:15:56 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:08:41 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I2b5dca851e6e97d537dbb249b1e64cb4ccb575d7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112711 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/07/0900.xhp b/source/text/shared/07/0900.xhp index 948a6e5b8..8a3630f2e 100644 --- a/source/text/shared/07/0900.xhp +++ b/source/text/shared/07/0900.xhp @@ -28,7 +28,7 @@ - + Web Pages To create a new web page for the Internet, open a new HTML Document by choosing File - New. diff --git a/source/text/shared/main0800.xhp b/source/text/shared/main0800.xhp index e58c8ae06..ffe79351a 100644 --- a/source/text/shared/main0800.xhp +++ b/source/text/shared/main0800.xhp @@ -34,6 +34,6 @@ $[officename] and the Internet This section provides information on the subject of the Internet. An Internet glossary explains the most important terms. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b1c215aadb2ddcea5d5ec8b97635182300663e5e Author: Johnny_M AuthorDate: Fri Mar 19 12:08:41 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:08:41 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 5fd56260ef5af41277d8395dd7ae53bd7a03b147 - tdf#132643 Translate German section IDs Change-Id: I2b5dca851e6e97d537dbb249b1e64cb4ccb575d7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112711 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 49b1e322e384..5fd56260ef5a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 49b1e322e38412a6c4bce867870691b96719029d +Subproject commit 5fd56260ef5af41277d8395dd7ae53bd7a03b147 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/main0500.xhp |2 -- 1 file changed, 2 deletions(-) New commits: commit 12c12fcb05e61337af68fa7a2af8df756f783a50 Author: Johnny_M AuthorDate: Fri Mar 19 11:19:28 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:09:10 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ifdc0c8f3d9e1d1668def9ccfa867be70746305af Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112732 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/main0500.xhp b/source/text/shared/main0500.xhp index bacde3bcc..dc6daf593 100644 --- a/source/text/shared/main0500.xhp +++ b/source/text/shared/main0500.xhp @@ -29,10 +29,8 @@ - Glossaries This section provides a general glossary of technical terms used in $[officename], along with a list of Internet terms. - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86ff911c5991c5874c9022392f5ac398bcb6c999 Author: Johnny_M AuthorDate: Fri Mar 19 12:09:10 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:09:10 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 12c12fcb05e61337af68fa7a2af8df756f783a50 - tdf#132643 Translate German section IDs Change-Id: Ifdc0c8f3d9e1d1668def9ccfa867be70746305af Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112732 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5fd56260ef5a..12c12fcb05e6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5fd56260ef5af41277d8395dd7ae53bd7a03b147 +Subproject commit 12c12fcb05e61337af68fa7a2af8df756f783a50 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/02/1801.xhp|2 +- source/text/scalc/main0218.xhp |2 +- source/text/sdraw/main0210.xhp |2 +- source/text/shared/00/edit_menu.xhp |4 ++-- source/text/shared/01/0206.xhp |2 +- source/text/shared/main0201.xhp |2 +- source/text/simpress/02/1011.xhp |2 +- source/text/simpress/main0210.xhp|2 +- 8 files changed, 9 insertions(+), 9 deletions(-) New commits: commit ce121d8e8720a488f4bcefc259ce44c7fa4c16e6 Author: Johnny_M AuthorDate: Fri Mar 19 11:28:50 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 12:10:19 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I28f43fb8971763bcb3ea288218acc49103d9f240 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112733 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/02/1801.xhp b/source/text/scalc/02/1801.xhp index ea9101125..011ae2c75 100644 --- a/source/text/scalc/02/1801.xhp +++ b/source/text/scalc/02/1801.xhp @@ -37,7 +37,7 @@ Click the arrow next to the icon to open the Insert toolbar, where you can add graphics and special characters to the current sheet. Tools bar icon: - + diff --git a/source/text/scalc/main0218.xhp b/source/text/scalc/main0218.xhp index 6126a05b8..8466c1329 100644 --- a/source/text/scalc/main0218.xhp +++ b/source/text/scalc/main0218.xhp @@ -36,7 +36,7 @@ Use the Tools bar to access commonly used commands. - + diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp index 8402815ae..b66d03ade 100644 --- a/source/text/sdraw/main0210.xhp +++ b/source/text/sdraw/main0210.xhp @@ -74,7 +74,7 @@ - + Form Controls diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp index 937efe4b7..71218306a 100644 --- a/source/text/shared/00/edit_menu.xhp +++ b/source/text/shared/00/edit_menu.xhp @@ -102,11 +102,11 @@ - + Choose Edit - Paste. CommandCtrl+V On the Standard bar, click - + diff --git a/source/text/shared/01/0206.xhp b/source/text/shared/01/0206.xhp index 2a74e5d8e..27993e859 100644 --- a/source/text/shared/01/0206.xhp +++ b/source/text/shared/01/0206.xhp @@ -49,7 +49,7 @@ Inserts the contents of the clipboard at the location of the cursor, and replaces any selected text or objects.UFI: text used for icon and menu - + Press the Enter key. diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 649fd3d19..3912bd0a7 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -66,7 +66,7 @@ - + diff --git a/source/text/simpress/02/1011.xhp b/source/text/simpress/02/1011.xhp index c51206f42..0ae5e1a59 100644 --- a/source/text/simpress/02/1011.xhp +++ b/source/text/simpress/02/1011.xhp @@ -28,7 +28,7 @@ Insert - + diff --git a/source/text/simpress/main0210.xhp b/source/text/simpress/main0210.xhp index a8b2191ca..a3df9abff 100644 --- a/source/text/simpress/main0210.xhp +++ b/source/text/simpress/main0210.xhp @@ -80,7 +80,7 @@ - + Rotate This tool is used to rotate the object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0d223f7036263d3e7012d497ea71d4722052927 Author: Johnny_M AuthorDate: Fri Mar 19 12:10:19 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 12:10:19 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ce121d8e8720a488f4bcefc259ce44c7fa4c16e6 - tdf#132643 Translate German section IDs Change-Id: I28f43fb8971763bcb3ea288218acc49103d9f240 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112733 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 12c12fcb05e6..ce121d8e8720 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 12c12fcb05e61337af68fa7a2af8df756f783a50 +Subproject commit ce121d8e8720a488f4bcefc259ce44c7fa4c16e6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/Deck.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c797c2bac2dab105856c65a3de4a0dcea629e6f5
Author: Caolán McNamara
AuthorDate: Thu Mar 18 12:45:36 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 12:11:38 2021 +0100
replace GetParent() with mxParentWindow
which should be the same thing without relying on querying the hierarchy
Change-Id: Ie8b59e3dec1b1b9786bcc1891a358aa2c763dde0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112695
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 4b0eb6580d70..4ea279689e8e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -214,7 +214,7 @@ void Deck::RequestLayout()
return;
bool bChangeNeeded = false;
-Size aParentSize = GetParent()->GetSizePixel();
+Size aParentSize = mxParentWindow->GetSizePixel();
if (mnMinimalHeight > 0 && (mnMinimalHeight != aParentSize.Height() ||
GetSizePixel().Height() != mnMinimalHeight))
{
@@ -231,7 +231,7 @@ void Deck::RequestLayout()
if (bChangeNeeded)
{
-GetParent()->SetSizePixel(aParentSize);
+mxParentWindow->SetSizePixel(aParentSize);
setPosSizePixel(0, 0, aParentSize.Width(), aParentSize.Height());
}
else if (aParentSize != GetSizePixel()) //Sync parent & child sizes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Arpit Bandejiya license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Thanks, Arpit Bandejiya ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlg.cxx |9 +
sc/source/ui/inc/condformatdlgentry.hxx |1 +
2 files changed, 10 insertions(+)
New commits:
commit 426a38ea955742c471c22b4c20f0149ec423f653
Author: Caolán McNamara
AuthorDate: Thu Mar 18 14:21:22 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 12:59:21 2021 +0100
tdf#118482 set a scroll step of the height of a collapsed entry
Change-Id: I09ea056f6c2284afda5b387b6fdff3160bb7adc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112677
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 7a4631289f01..b4759bb3940e 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -174,6 +174,8 @@ void ScCondFormatList::RecalcAll()
if (mbFrozen)
return;
+int nWheelScroll = SAL_MAX_INT32;
+
sal_Int32 nIndex = 1;
for (const auto& item : maEntries)
{
@@ -181,8 +183,15 @@ void ScCondFormatList::RecalcAll()
continue;
item->SetIndex(nIndex);
item->set_grid_top_attach(nIndex - 1);
+nWheelScroll = std::min(nWheelScroll, item->get_preferred_height());
++nIndex;
}
+
+if (nWheelScroll != SAL_MAX_INT32)
+{
+// tdf#118482 set a scroll step of the height of a collapsed entry
+mxScrollWindow->vadjustment_set_step_increment(nWheelScroll);
+}
}
IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, weld::ComboBox&, rBox, void)
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx
b/sc/source/ui/inc/condformatdlgentry.hxx
index bf2d80fba2e0..aed63be47729 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -77,6 +77,7 @@ public:
void Show() { mxGrid->show(); }
void set_grid_top_attach(int nAttach) {
mxBorder->set_grid_top_attach(nAttach); }
+int get_preferred_height() const { return
mxBorder->get_preferred_size().Height(); }
void SetPos(const ScAddress& rPos) { maPos = rPos; };
bool IsSelected() const { return mbActive;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sfx2/util
sfx2/source/notify/globalevents.cxx | 20 ++--
sfx2/util/sfx.component |3 ++-
2 files changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 42969ac2c3db42460a9aaa8b51df76f58b360526
Author: Noel
AuthorDate: Thu Mar 18 11:14:46 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 13:23:06 2021 +0100
use single-use attribute for SfxGlobalEvents_Impl
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I77154b14aa3b71828590242acef97b2948ec5638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112679
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/notify/globalevents.cxx
b/sfx2/source/notify/globalevents.cxx
index 9ac9e8707565..2176c327243f 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -519,30 +519,14 @@ TModelList::iterator
SfxGlobalEvents_Impl::impl_searchDoc(const uno::Reference<
});
}
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(
-static_cast(new
SfxGlobalEvents_Impl(context)))
-{}
-
-rtl::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
-}
+} // namespace
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new SfxGlobalEvents_Impl(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 314b8c18ecc9..a8f4b7104991 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -70,7 +70,8 @@
+
constructor="com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sfx2/util
sfx2/source/appl/shutdownicon.cxx | 21 +
sfx2/util/sfx.component |3 ++-
2 files changed, 3 insertions(+), 21 deletions(-)
New commits:
commit 896bed62eff679e354e46635f5659fe0caa650fe
Author: Noel
AuthorDate: Thu Mar 18 11:16:27 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 13:58:40 2021 +0100
use single-use attribute for ShutdownIcon
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I40de6f9d9c86f1056860d6a9e412b0c1571703bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112680
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 40febc9b422a..fcebfe809d1e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -706,31 +706,12 @@ css::uno::Any SAL_CALL
ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle )
return aValue;
}
-namespace {
-
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(static_cast(new ShutdownIcon(context)))
-{}
-
-rtl::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_desktop_QuickstartWrapper_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new ShutdownIcon(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index a8f4b7104991..a7c9930e0ec8 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -33,7 +33,8 @@
+
constructor="com_sun_star_comp_desktop_QuickstartWrapper_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Alternative master/main branch proposal (Re: ANN: renaming of master branch to "main" for core repository and submodules (dictionaries, help, translations))
On Thu, 2021-03-18 at 21:04 +0100, Luboš Luňák wrote: > Therefore, I propose that the decision to rename the master branch > is postponed for as long as the git project does not take a > definitive stance on it. That stance may take the form of e.g. the > git project making a statement on it or changing their default and > using it. Our decision can be then based on this input and may e.g. > take the form of simply taking the technical decision to do what git > does. +1 I support this approach too. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0208.xhp |2 +- source/text/shared/02/2002.xhp |2 +- source/text/simpress/main0206.xhp |2 +- source/text/swriter/main0208.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c04755eb8c7beac1bf8d0a967d05a78fee715ce5 Author: Johnny_M AuthorDate: Fri Mar 19 11:00:30 2021 +0100 Commit: Olivier Hallot CommitDate: Fri Mar 19 14:20:03 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I36aad8a1f40db2a526062ba49e204ea6541c3d73 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112708 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0208.xhp b/source/text/scalc/main0208.xhp index f06ede5ff..cc4d70d5c 100644 --- a/source/text/scalc/main0208.xhp +++ b/source/text/scalc/main0208.xhp @@ -32,7 +32,7 @@ The Status Bar displays information about the current sheet. - + diff --git a/source/text/shared/02/2002.xhp b/source/text/shared/02/2002.xhp index 0d2b97538..d9f606950 100644 --- a/source/text/shared/02/2002.xhp +++ b/source/text/shared/02/2002.xhp @@ -25,7 +25,7 @@ - + page styles;editing/applying with statusbar diff --git a/source/text/simpress/main0206.xhp b/source/text/simpress/main0206.xhp index 9893a7ae8..104ee8df0 100644 --- a/source/text/simpress/main0206.xhp +++ b/source/text/simpress/main0206.xhp @@ -40,6 +40,6 @@ - + diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp index ba693253a..18e5222f4 100644 --- a/source/text/swriter/main0208.xhp +++ b/source/text/swriter/main0208.xhp @@ -33,7 +33,7 @@ - + Languagei80434 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e250f17d9653042c3edcb4e55167159746d8ffae Author: Johnny_M AuthorDate: Fri Mar 19 14:20:03 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 14:20:03 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c04755eb8c7beac1bf8d0a967d05a78fee715ce5 - tdf#132643 Translate German section IDs Change-Id: I36aad8a1f40db2a526062ba49e204ea6541c3d73 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112708 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ce121d8e8720..c04755eb8c7b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ce121d8e8720a488f4bcefc259ce44c7fa4c16e6 +Subproject commit c04755eb8c7beac1bf8d0a967d05a78fee715ce5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: oox import/export of custom shape extrusion
Hi Miklos, Miklos Vajna schrieb am 19.03.2021 um 08:18: Hi Regina, On Thu, Mar 18, 2021 at 04:24:38PM +0100, Regina Henschel wrote: I want to work on getting oox import/export of custom shape extrusion. Great, much appreciated. In case a grabBag exists, it will be necessary to merge values from the internal "extrusion" property with values from the grabBag on export. In case no grabBag exists, writing OOXML from the internal properties is needed. In case no internal "extrusion" property exists, the current solution of writing the gragBag is OK. Should I use separate solutions for the three cases? Advantage would be, that the development can be done without interfering the current solution for "only grabBag". But a solution for "merge" would be able to solve the situation "no grabBag" and "only grabBag" too, so doing only that might avoid code duplication. The motivation bethind grab-bag is to preserve properties from OOXML, which is not handled by libreoffice core. So in case there is a grab-bag attached to a shape and you use the UI to modify the shape, it's perfectly valid to just empty the grab-bag. This is predictable behavior and you will never have to handle a mix of real document model and grab-bag for the same shape. As an example, we store smartart data in the shape grab-bag. But once you edit the shape text, we empty the grab-bag, so your text edits are not lost on save (since commit a01ae07740e5c311fcc37f2ac2e2a0a2a1935920). Does that help? It would indeed make the structure much easier, if only the situations "no grabBag" and "only grabBag" need to be handled. So that is fine for me. OOX has some 3D properties, which do not exist in ODF and/or cannot be rendered by LO. Those would be lost in a PPTX - LO - PPTX roundtrip. Of cause they will be lost in PPTX - LO - ODF anyway. I would not mind loosing them, but what do your customers expect? Such properties are for sure property 'Bevel', color of light (used in presets "sunset" and "freeze" for example) and property 'Contour'. I have not yet investigated, what is possible in ODF in regard to property 'Material' and which of the Material presets LO would be able to render although no UI exists. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: oox import/export of custom shape extrusion
Hi Regina, On Fri, Mar 19, 2021 at 02:20:54PM +0100, Regina Henschel wrote: > It would indeed make the structure much easier, if only the situations "no > grabBag" and "only grabBag" need to be handled. So that is fine for me. > > OOX has some 3D properties, which do not exist in ODF and/or cannot be > rendered by LO. Those would be lost in a PPTX - LO - PPTX roundtrip. Of > cause they will be lost in PPTX - LO - ODF anyway. The grab-bag format is only in the memory, so you don't have to care about stability / compatibility there (just keep import and export in sync). If something works for LO shapes, those can be properly imported/exported. If the shape is edited, the grab-bag can be emptied. And finally if a property is not something an LO shape / ODF can handle, it can stay in grab-bag. That way you would never have conflicting information in the grab-bag and in the real document model on export. Would this approach work? Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/manager/dp_extensionmanager.cxx | 59 +++---
1 file changed, 33 insertions(+), 26 deletions(-)
New commits:
commit 7d3addde836bbd8d990a363562310b237213527a
Author: Bayram Çiçek
AuthorDate: Sun Mar 14 14:39:14 2021 +0300
Commit: Mike Kaganski
CommitDate: Fri Mar 19 14:37:42 2021 +0100
tdf#122406: only restart when user accepted the license agreement
In Tools > Extension Manager, LO requires restart after
declining the license agreement on the *first* try.
Don't need to restart LO because no change made.
- Current location of fireModified() function doesn't
respect this decision.
- fireModified() has moved to proper location.
Change-Id: I24cb7bcf93d1fff3172b6b4110f17aef00ef97a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112468
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 63882cefdfd3..68a6fe08579d 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -722,6 +722,39 @@ Reference
ExtensionManager::addExtension(
sNewExtensionIdentifier, sNewExtensionFileName,
bUserDisabled2, false, xAbortChannel,
Reference());
+
+// if reached this section,
+// this means that either the licensedialog.ui didn't
popup,
+// or user accepted the license agreement. otherwise
+// no need to call fireModified() because user declined
+// the license agreement therefore no change made.
+try
+{
+fireModified();
+
+}catch ( const css::deployment::DeploymentException& ) {
+throw;
+} catch ( const ucb::CommandFailedException & ) {
+throw;
+} catch ( const ucb::CommandAbortedException & ) {
+throw;
+} catch (const lang::IllegalArgumentException &) {
+throw;
+} catch (const uno::RuntimeException &) {
+throw;
+} catch (const uno::Exception &) {
+uno::Any excOccurred = ::cppu::getCaughtException();
+css::deployment::DeploymentException exc(
+"Extension Manager: Exception on fireModified() "
+"in the scope of 'if (failedPrereq == 0)'",
+static_cast(this), excOccurred);
+throw exc;
+} catch (...) {
+throw uno::RuntimeException(
+"Extension Manager: RuntimeException on
fireModified() "
+"in the scope of 'if (failedPrereq == 0)'",
+static_cast(this));
+}
}
else
{
@@ -780,32 +813,6 @@ Reference
ExtensionManager::addExtension(
}
} // leaving the guarded section (getMutex())
-try
-{
-fireModified();
-
-}catch ( const css::deployment::DeploymentException& ) {
-throw;
-} catch ( const ucb::CommandFailedException & ) {
-throw;
-} catch ( const ucb::CommandAbortedException & ) {
-throw;
-} catch (const lang::IllegalArgumentException &) {
-throw;
-} catch (const uno::RuntimeException &) {
-throw;
-} catch (const uno::Exception &) {
-uno::Any excOccurred = ::cppu::getCaughtException();
-css::deployment::DeploymentException exc(
-"Extension Manager: exception in doChecksForAddExtension",
-static_cast(this), excOccurred);
-throw exc;
-} catch (...) {
-throw uno::RuntimeException(
-"Extension Manager: unexpected exception in
doChecksForAddExtension",
-static_cast(this));
-}
-
return xNewExtension;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/README
android/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0d1ad82e33868683edd7a1e50f516f38d0634b0 Author: Michael Weghorn AuthorDate: Fri Mar 19 10:07:12 2021 +0100 Commit: Michael Weghorn CommitDate: Fri Mar 19 14:48:39 2021 +0100 android: Update obj path in README ... according to the changes done in commit 0dffc65236fbacf98047d6dbfc82b4efe7dd959b Date: Fri Jun 5 08:59:26 2020 -0400 android: fix the build output directory When compiling in a different build output directory, the "liblo-native-code.so" file is created in the source directory and it fails compiling the "online" project Change-Id: I886231034bbe3937748d9b5ef56239aea3cf7b8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112702 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/README b/android/README index 5b27ceb8e971..cfce3ddaa942 100644 --- a/android/README +++ b/android/README @@ -241,7 +241,7 @@ Using lldb from within Android Studio is more comfortable though and works like - make sure you select the right build variant (strippedUIDebug is what you want) - use Run|Edit Configurations to create a new configuration of type "Android Native" - on tab "General" pick module "source" -- on tab "Native Debugger" add android/source/obj/local/ to +- on tab "Native Debugger" add android/obj/local/ to the Symbol directories - on the LLDB startup commands tab add "command script import /path/to/solenv/lldb/libreoffice/LO.py" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040500.xhp |5 +++-- source/text/shared/01/0605.xhp |2 +- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 4ceb9e1c9bc4a9961ece57131f8d9db569998568 Author: Seth Chaiklin AuthorDate: Fri Mar 19 14:22:12 2021 +0100 Commit: Seth Chaiklin CommitDate: Fri Mar 19 15:03:30 2021 +0100 tdf#139667 access and apply corrections to Bullets and Numbering ( shared/00/00040500.xhp ) + add context menu access * repair incorrect icon and label ( shared/01/0605.xhp ) + add that the dialog can also be applied to selected paragraphs. Change-Id: I052f7cae83859ab1a2051cc58a0355f33c66097b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112722 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp index 81ea09712..3845475be 100644 --- a/source/text/shared/00/00040500.xhp +++ b/source/text/shared/00/00040500.xhp @@ -262,15 +262,16 @@ Open the context menu of the 3D object, choose 3D Effects - Material tab. Choose Format - Bullets and Numbering. +Right-click a paragraph, choose List - Bullets and Numbering. On Formatting bar, click - Icon bullet list + Bullets and Numbering dialog Icon - Bullets On/Off + Bullets and Numbering diff --git a/source/text/shared/01/0605.xhp b/source/text/shared/01/0605.xhp index 08910dd29..78405abb8 100644 --- a/source/text/shared/01/0605.xhp +++ b/source/text/shared/01/0605.xhp @@ -32,7 +32,7 @@ Bullets and Numbering -Adds numbering or bullets to the current paragraph, and lets you edit format of the numbering or bullets. +Adds numbering or bullets to the current paragraph or to selected paragraphs, and lets you edit format of the numbering or bullets. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6bc79df7e0171452e912789cf0962831c44fdc97 Author: Seth Chaiklin AuthorDate: Fri Mar 19 15:03:30 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 15:03:30 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4ceb9e1c9bc4a9961ece57131f8d9db569998568 - tdf#139667 access and apply corrections to Bullets and Numbering ( shared/00/00040500.xhp ) + add context menu access * repair incorrect icon and label ( shared/01/0605.xhp ) + add that the dialog can also be applied to selected paragraphs. Change-Id: I052f7cae83859ab1a2051cc58a0355f33c66097b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112722 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index c04755eb8c7b..4ceb9e1c9bc4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c04755eb8c7beac1bf8d0a967d05a78fee715ce5 +Subproject commit 4ceb9e1c9bc4a9961ece57131f8d9db569998568 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/02/add_to_list.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4703fa8a90baedcf23cb5739507a46d4b03418f1 Author: Seth Chaiklin AuthorDate: Fri Mar 19 15:04:04 2021 +0100 Commit: Seth Chaiklin CommitDate: Fri Mar 19 15:06:58 2021 +0100 correction to access command Change-Id: I2a05689b8dd050e6851e38b4291a25a78282d8a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112723 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/source/text/swriter/02/add_to_list.xhp b/source/text/swriter/02/add_to_list.xhp index 69ba5a3d4..ff4306569 100644 --- a/source/text/swriter/02/add_to_list.xhp +++ b/source/text/swriter/02/add_to_list.xhp @@ -26,7 +26,7 @@ Choose Format - Lists - Add to List. -Right-click a paragraph, choose Lists - Add to List. +Right-click a paragraph, choose List - Add to List. On Bullets and Numbering bar, click Add to List icon. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6aee002aa3094ebaa863e79ff3c3b1c6f5ef3c76 Author: Seth Chaiklin AuthorDate: Fri Mar 19 15:06:58 2021 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 19 15:06:58 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4703fa8a90baedcf23cb5739507a46d4b03418f1 - correction to access command Change-Id: I2a05689b8dd050e6851e38b4291a25a78282d8a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112723 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 4ceb9e1c9bc4..4703fa8a90ba 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4ceb9e1c9bc4a9961ece57131f8d9db569998568 +Subproject commit 4703fa8a90baedcf23cb5739507a46d4b03418f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/png/PngFilterTest.cxx | 10 --
vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png |binary
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 26d2356f64dc24b654f4afdb7d4b701d0a09e1e8
Author: Tomaž Vajngerl
AuthorDate: Fri Mar 19 20:49:50 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Fri Mar 19 16:25:43 2021 +0100
vcl: add interlaced test case for PngImageReader
Change-Id: I17f3a2b96756bba3316f30541ef6961fabc339b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112740
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx
b/vcl/qa/cppunit/png/PngFilterTest.cxx
index 3b02e1135504..c167c4c9c636 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -97,8 +97,14 @@ void PngFilterTest::testPng()
}
}
}
-for (const OUString& aFileName :
- { OUString("color-rect-8bit-RGB.png"),
OUString("color-rect-4bit-pal.png") })
+
+OUString aFilenames[] = {
+OUString("color-rect-8bit-RGB.png"),
+OUString("color-rect-8bit-RGB-interlaced.png"),
+OUString("color-rect-4bit-pal.png"),
+};
+
+for (const OUString& aFileName : aFilenames)
{
SvFileStream aFileStream(getFullUrl(aFileName), StreamMode::READ);
diff --git a/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png
b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png
new file mode 100644
index ..17ca9a350d9c
Binary files /dev/null and
b/vcl/qa/cppunit/png/data/color-rect-8bit-RGB-interlaced.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: oox import/export of custom shape extrusion
Hi Miklos, Miklos Vajna schrieb am 19.03.2021 um 14:36: Hi Regina, On Fri, Mar 19, 2021 at 02:20:54PM +0100, Regina Henschel wrote: It would indeed make the structure much easier, if only the situations "no grabBag" and "only grabBag" need to be handled. So that is fine for me. OOX has some 3D properties, which do not exist in ODF and/or cannot be rendered by LO. Those would be lost in a PPTX - LO - PPTX roundtrip. Of cause they will be lost in PPTX - LO - ODF anyway. The grab-bag format is only in the memory, so you don't have to care about stability / compatibility there (just keep import and export in sync). If something works for LO shapes, those can be properly imported/exported. If the shape is edited, the grab-bag can be emptied. I thought to only put something into the grab-bag on import, if LO cannot handle it and it is needed in export. So removing something from the grab-bag should not be necessary. That means import has to be done parallel to export. Removing something in the grab-bag when shape is edited, would require changes in places, which are not related to import/export. I think, that will be complicate and dangerous. And finally if a property is not something an LO shape / ODF can handle, it can stay in grab-bag. Exactly that is what I have called "merge". The export happens in DrawingML::WriteShape3DEffects https://opengrok.libreoffice.org/xref/core/oox/source/export/drawingml.cxx?r=68bc6a5d#4342 It means, that I have to put those values, which are set by LO and therefore not in the grab-bag, into the sequences aEffectProps, aLightRigProps and aShape3DProps there. That way you would never have conflicting information in the grab-bag and in the real document model on export. Would this approach work? If I not only implement export but handle import at the same time it should work. I think, I will start and sometime in April you can see some concrete code in Gerrit. Thank you for your thoughts so far. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/cppuhelper
include/cppuhelper/implbase.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13ea8a2f245fd07056e9a86ed3860109950470ef Author: Stephan Bergmann AuthorDate: Fri Mar 19 14:04:00 2021 +0100 Commit: Stephan Bergmann CommitDate: Fri Mar 19 16:32:56 2021 +0100 Fix typo in comment Change-Id: I6b670bca6c6f374dec97a27134fc24b40cb45d9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112741 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index 02bfb4ce7eef..95c2b0fc74f6 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -40,7 +40,7 @@ // is unlikely ever be a better choice than WeakImplHelper, so all their // existing uses are probably confused and should use WeakImplHelper instead. // -// Replacements for WeakAggImplHelperN and AggImplInheritanceHelper1 have +// Replacements for WeakAggImplHelperN and AggImplInheritanceHelperN have // deliberately been left out, as the underlying aggregation mechanism is known // broken in general and should not be used. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Alternative master/main branch proposal
I'm not yet an active contributor, but hope it's okay to share my 2c worth. I think that a change to a word with dozens of meanings, based on the offensiveness of one, is an overreaction. I am reminded of when "leg" and "occupy" were taboo. I am also fine with the "wait and see" proposal. Original Message Subject: Re: Alternative master/main branch proposal (Re: ANN: renaming of master branch to "main" for core repository and submodules (dictionaries, help, translations)) Date: 19.03.2021 02:07 From: Michael Weghorn To: libreoffice@lists.freedesktop.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/export/shapes.cxx|8 +++-
sd/qa/unit/data/pptx/tdf131905.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 28
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 48f6ce530f3546570eabdf398388185ab988636b
Author: Tibor Nagy
AuthorDate: Mon Mar 8 16:07:59 2021 +0100
Commit: László Németh
CommitDate: Fri Mar 19 16:55:03 2021 +0100
tdf#131905 PPTX table export: fix vertical alignment
Table cells lost their vertical alignment.
Change-Id: Id5ca22550b5613566d7ea2a93e8a36fdca31860d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112171
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 13c52d22c56e..e889901c477c 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1780,6 +1780,8 @@ void ShapeExport::WriteTable( const Reference< XShape >&
rXShape )
void ShapeExport::WriteTableCellProperties(const Reference< XPropertySet>&
xCellPropSet)
{
sal_Int32 nLeftMargin(0), nRightMargin(0);
+TextVerticalAdjust eVerticalAlignment;
+const char* sVerticalAlignment;
Any aLeftMargin = xCellPropSet->getPropertyValue("TextLeftDistance");
aLeftMargin >>= nLeftMargin;
@@ -1787,7 +1789,11 @@ void ShapeExport::WriteTableCellProperties(const
Reference< XPropertySet>& xCell
Any aRightMargin = xCellPropSet->getPropertyValue("TextRightDistance");
aRightMargin >>= nRightMargin;
-mpFS->startElementNS(XML_a, XML_tcPr,
+Any aVerticalAlignment =
xCellPropSet->getPropertyValue("TextVerticalAdjust");
+aVerticalAlignment >>= eVerticalAlignment;
+sVerticalAlignment = GetTextVerticalAdjust(eVerticalAlignment);
+
+mpFS->startElementNS(XML_a, XML_tcPr, XML_anchor, sVerticalAlignment,
XML_marL,
sax_fastparser::UseIf(OString::number(oox::drawingml::convertHmmToEmu(nLeftMargin)),
nLeftMargin > 0),
XML_marR,
sax_fastparser::UseIf(OString::number(oox::drawingml::convertHmmToEmu(nRightMargin)),
nRightMargin > 0));
diff --git a/sd/qa/unit/data/pptx/tdf131905.pptx
b/sd/qa/unit/data/pptx/tdf131905.pptx
new file mode 100644
index ..4d203510f093
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf131905.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 9523d5718a46..3d8e93b8b003 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -87,6 +87,7 @@ static void assertMotionPath(const OUString &rStr1, const
OUString &rStr2, const
class SdOOXMLExportTest2 : public SdModelTestBaseXML
{
public:
+void testTdf131905();
void testTdf93883();
void testTdf91378();
void testBnc822341();
@@ -211,6 +212,7 @@ public:
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
+CPPUNIT_TEST(testTdf131905);
CPPUNIT_TEST(testTdf93883);
CPPUNIT_TEST(testTdf91378);
CPPUNIT_TEST(testBnc822341);
@@ -366,6 +368,32 @@ public:
};
+void SdOOXMLExportTest2::testTdf131905()
+{
+::sd::DrawDocShellRef xDocShRef
+=
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf131905.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
+assertXPath(
+pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/a:tbl/a:tr[1]/a:tc/a:tcPr",
+"anchor", "t");
+
+assertXPath(
+pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/a:tbl/a:tr[2]/a:tc/a:tcPr",
+"anchor", "ctr");
+
+assertXPath(
+pXmlDocContent,
+
"/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/a:tbl/a:tr[3]/a:tc/a:tcPr",
+"anchor", "b");
+
+xDocShRef->DoClose();
+}
+
void SdOOXMLExportTest2::testTdf93883()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf93883.odp"), ODP);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source framework/util
framework/source/uifactory/windowcontentfactorymanager.cxx | 19 -
framework/util/fwk.component |3 +-
2 files changed, 3 insertions(+), 19 deletions(-)
New commits:
commit 22e4f7a348f82fae7eefae5b67de3d829dceadcb
Author: Noel
AuthorDate: Thu Mar 18 11:17:57 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 17:36:29 2021 +0100
use single-use attribute for WindowContentFactoryManager
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I877c541c11d5c667b0d94cb3875f4263a9323dcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112681
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx
b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 996fae5f41a1..0d2991c80b7e 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -193,22 +193,6 @@ uno::Reference< uno::XInterface > SAL_CALL
WindowContentFactoryManager::createIn
return xWindow;
}
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(static_cast(
-new WindowContentFactoryManager(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -216,8 +200,7 @@
com_sun_star_comp_framework_WindowContentFactoryManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new WindowContentFactoryManager(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index e056e8a9aeb6..d6ca2652d3cf 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -175,7 +175,8 @@
+
constructor="com_sun_star_comp_framework_WindowContentFactoryManager_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source framework/util
framework/source/uifactory/uielementfactorymanager.cxx | 19 -
framework/util/fwk.component |3 +-
2 files changed, 3 insertions(+), 19 deletions(-)
New commits:
commit f5784794f4cecd4fd57a803191b544f80f7ba02e
Author: Noel
AuthorDate: Thu Mar 18 11:19:21 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 17:37:07 2021 +0100
use single-use attribute for UIElementFactoryManager
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I52193861c4b2e07c3655773c8d185b2036336da2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112682
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx
b/framework/source/uifactory/uielementfactorymanager.cxx
index 02d5435bab80..b1567724ff06 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -542,22 +542,6 @@ void SAL_CALL UIElementFactoryManager::deregisterFactory(
const OUString& aType,
// SAFE
}
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(static_cast(
-new UIElementFactoryManager(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -565,8 +549,7 @@
com_sun_star_comp_framework_UIElementFactoryManager_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new UIElementFactoryManager(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index d6ca2652d3cf..9f050373c603 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -166,7 +166,8 @@
+
constructor="com_sun_star_comp_framework_UIElementFactoryManager_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update: VectorGraphicData::ensureSequenceAndRange
On Thu, 2021-02-18 at 16:44 +0900, Tomaž Vajngerl wrote: > On Sun, Feb 14, 2021 at 6:21 AM Caolán McNamara > > reproducible for me: > > $ ./instdir/program/soffice.bin --headless --convert-to > > odg:output.odg > > ./tdf118346-1.odg > > > > crashes in VectorGraphicData::ensureSequenceAndRange in some odd way > > during assigning to maSequence > > > Sorry, I missed this mail. I'll take a look. What I seem to see is recursive reduceGraphicMemory calls and https://gerrit.libreoffice.org/c/core/+/112772 works for me on this example document ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
385 new defect(s) introduced to LibreOffice found with Coverity Scan.
24 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 20 of 385 defect(s)
** CID 1474403: Error handling issues (CHECKED_RETURN)
/sw/source/core/undo/rolbck.cxx: 152 in
SwHistorySetFormat::dumpAsXml(_xmlTextWriter *) const()
*** CID 1474403: Error handling issues (CHECKED_RETURN)
/sw/source/core/undo/rolbck.cxx: 152 in
SwHistorySetFormat::dumpAsXml(_xmlTextWriter *) const()
146 return aResult;
147 }
148
149 void SwHistorySetFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
150 {
151 xmlTextWriterStartElement(pWriter, BAD_CAST("SwHistorySetFormat"));
>>> CID 1474403: Error handling issues (CHECKED_RETURN)
>>> Calling "xmlTextWriterWriteAttribute(pWriter, (xmlChar
>>> *)"m_nNodeIndex", (xmlChar *)rtl::OString::number(this->m_nNodeIndex,
>>> 10).getStr())" without checking return value. This library function may
>>> fail and return an error code.
152 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nNodeIndex"),
153
BAD_CAST(OString::number(m_nNodeIndex).getStr()));
154 SwHistoryHint::dumpAsXml(pWriter);
155
156 if (m_pAttr)
157 {
** CID 1474402: Error handling issues (CHECKED_RETURN)
/drawinglayer/source/dumper/XShapeDumper.cxx: 236 in
::dumpFillTransparenceGradientNameAsAttribute(std::basic_string_view>, _xmlTextWriter *)()
*** CID 1474402: Error handling issues (CHECKED_RETURN)
/drawinglayer/source/dumper/XShapeDumper.cxx: 236 in
::dumpFillTransparenceGradientNameAsAttribute(std::basic_string_view>, _xmlTextWriter *)()
230 {
231 xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("fillTransparence"), "%" SAL_PRIdINT32, aTransparence);
232 }
233
234 void dumpFillTransparenceGradientNameAsAttribute(std::u16string_view
sTranspGradName, xmlTextWriterPtr xmlWriter)
235 {
>>> CID 1474402: Error handling issues (CHECKED_RETURN)
>>> Calling "xmlTextWriterWriteFormatAttribute(xmlWriter, (xmlChar
>>> *)"fillTransparenceGradientName", "%s",
>>> rtl::OString(rtl::OUStringToOString(sTranspGradName, 76, 1382U)).getStr())"
>>> without checking return value. This library function may fail and return an
>>> error code.
236 xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("fillTransparenceGradientName"), "%s",
237 OUStringToOString(sTranspGradName,
RTL_TEXTENCODING_UTF8).getStr());
238 }
239
240 //because there's more awt::Gradient properties to dump
241 void dumpGradientProperty(const awt::Gradient& rGradient,
xmlTextWriterPtr xmlWriter)
** CID 1474401: Error handling issues (CHECKED_RETURN)
/svl/source/undo/undo.cxx: 1367 in SfxListUndoAction::dumpAsXml(_xmlTextWriter
*) const()
*** CID 1474401: Error handling issues (CHECKED_RETURN)
/svl/source/undo/undo.cxx: 1367 in SfxListUndoAction::dumpAsXml(_xmlTextWriter
*) const()
1361 return !maUndoActions.empty() &&
maUndoActions[maUndoActions.size()-1].pAction->Merge( pNextAction );
1362 }
1363
1364 void SfxListUndoAction::dumpAsXml(xmlTextWriterPtr pWriter) const
1365 {
1366 xmlTextWriterStartElement(pWriter, BAD_CAST("SfxListUndoAction"));
>>> CID 1474401: Error handling issues (CHECKED_RETURN)
>>> Calling "xmlTextWriterWriteAttribute(pWriter, (xmlChar *)"size",
>>> (xmlChar *)rtl::OString::number(this->maUndoActions.size(), 10).getStr())"
>>> without checking return value. This library function may fail and return an
>>> error code.
1367 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("size"),
BAD_CAST(OString::number(maUndoActions.size()).getStr()));
1368 SfxUndoAction::dumpAsXml(pWriter);
1369
1370 for (size_t i = 0; i < maUndoActions.size(); ++i)
1371 maUndoActions[i].pAction->dumpAsXml(pWriter);
1372
** CID 1474400: Error handling issues (CHECKED_RETURN)
/svl/source/items/stritem.cxx: 31 in SfxStringItem::dumpAsXml(_xmlTextWriter *)
const()
*** CID 1474400: Error handling issues (CHECKED_RETURN)
/svl/source/items/stritem.cxx: 31 in SfxStringItem::dumpAsXml(_xmlTextWriter *)
const()
25 {
26 return new SfxStringItem(*this);
27 }
28
29 void SfxStringItem::dumpAsXml(xmlTextWriterPtr pWriter) const
30 {
>>> CID 1474
Viswaas Loganadhan Prabunathan license statement
Hello, All of my past & future contributions to LibreOffice maybe licensed under the MPLv2/LGPLv3+ dual license. Thanks & Regards, Viswaas L Prabunathan B.S. Comp Sci & Eng | UC Davis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit cc1690b9752b3fef3d541de0d26b7c7681615767
Author: Armin Le Grand (Allotropia)
AuthorDate: Wed Mar 17 18:31:59 2021 +0100
Commit: Armin Le Grand
CommitDate: Fri Mar 19 19:14:43 2021 +0100
tdf#131031 take MenuBar into account on size change
in GtkSalFrame::SetPosSize when setting local vars for
maGeometry.nWidth/nHeight the implicitely existing gtk
native menu bar has to be taken into account. This can
be done by extracting the values for it and re-apply
to the new values.
Change-Id: Ic0e76ecfd49fab7dbf330f3e26ab4a6ad3267b35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112654
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-by: Armin Le Grand
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index bf47097af565..e52ff192869f 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1553,8 +1553,13 @@ void GtkSalFrame::SetPosSize( tools::Long nX,
tools::Long nY, tools::Long nWidth
{
m_bDefaultSize = false;
+// tdf#131031 Just setting maGeometry.nWidth/nHeight will delete
+// the evtl. implicitely existing space at top for the gtk native
MenuBar,
+// will make the Window too big and the StatusBar at the bottom vanish
+// and thus breaks the fix in tdf#130841.
+const int nImplicitMenuBarHeight(m_pSalMenu ?
m_pSalMenu->GetMenuBarHeight() : 0);
maGeometry.nWidth = nWidth;
-maGeometry.nHeight = nHeight;
+maGeometry.nHeight = nHeight - nImplicitMenuBarHeight;
if( isChild( false ) )
widget_set_size_request(nWidth, nHeight);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Opinions are like languages: Everyone has (at least) one
I hope we can be careful how strongly we word sentiments like: Most of us are not even native English speakers We wouldn't want people to feel like their opinion doesn't count. If you make use of English in any capacity (and if you're reading this you do), then it's reasonable for you to have an opinion about this tool you use. The fact that my native language is the (ironically-termed) lingua franca here and so many places is a privilege I have due to nothing more than the circumstances of my birth. It does not grant me special authority to tell you which words you should use or what they should mean to you. If anything, it should encourage me to show charity and make room for those who felt forced "to learn a foreign language before they can express themselves electronically". If this conversation were in any other language I would be, at best, severely struggling. On a related note, there's a certain irony here: to get lectured on English by a German If we were weighing people's opinion based on their native language, which I advise against, German-speakers would fare pretty well since our languages are so closely related. In this conversation, for example, "master" and "Meister" share the same origin and are practically the same word. In fact, they show up in adages in both our languages where they refer to mastering a skill: "Jack of all trades, master of none" and "Übung macht den Meister.". But that doesn't mean a speaker of a more distant language like Russian or Chinese can't have a valid observation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - framework/source framework/util
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 19 --
framework/source/uiconfiguration/windowstateconfiguration.cxx | 19 --
framework/util/fwk.component |6 ++-
3 files changed, 6 insertions(+), 38 deletions(-)
New commits:
commit ccef00e160439f1836ab27cd13cbe6aa8f9e5146
Author: Noel
AuthorDate: Thu Mar 18 11:27:23 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 20:04:25 2021 +0100
use single-use attribute for WindowStateConfiguration
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I2a6a3b1e989d48f4eebf19e9922df22124d25d2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112687
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx
b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index ba8d0c15a43e..31b08076e953 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1383,22 +1383,6 @@ sal_Bool SAL_CALL WindowStateConfiguration::hasElements()
return true;
}
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(static_cast(
-new WindowStateConfiguration(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -1406,8 +1390,7 @@
com_sun_star_comp_framework_WindowStateConfiguration_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new WindowStateConfiguration(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index efc79a108e5d..f3a0cfcf1edd 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -183,7 +183,8 @@
+
constructor="com_sun_star_comp_framework_WindowStateConfiguration_get_implementation"
+ single-instance="true">
commit 2167edad3b1f79e304a072b4d74eb1705cfe66b4
Author: Noel
AuthorDate: Thu Mar 18 11:31:28 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 20:04:18 2021 +0100
use single-use attribute for ModuleUIConfigurationManagerSupplier
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: I146c0da83e59557ec563ec33851d2418c15aa065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112689
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 31d61d8d0ad5..f28c2afedddf 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -171,22 +171,6 @@ Reference< XUIConfigurationManager > SAL_CALL
ModuleUIConfigurationManagerSuppli
return pIter->second;
}
-struct Instance {
-explicit Instance(
-css::uno::Reference const & context):
-instance(static_cast(
-new ModuleUIConfigurationManagerSupplier(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
-
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
@@ -194,8 +178,7 @@
com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementat
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-Singleton::get(context).instance.get()));
+return cppu::acquire(new ModuleUIConfigurationManagerSupplier(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index 9f050373c603..efc79a108e5d 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -91,7 +91,8 @@
+
constructor="com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source framework/util
framework/source/uifactory/uicontrollerfactory.cxx | 21 +
framework/util/fwk.component |3 ++-
2 files changed, 3 insertions(+), 21 deletions(-)
New commits:
commit 109312f4223a986444c589eca51eac7cdeb5ff48
Author: Noel
AuthorDate: Thu Mar 18 11:24:37 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 19 20:04:43 2021 +0100
use single-use attribute for PopupMenuControllerFactory
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: Ib7e51a5ba945ad151176d207d2d40f13d0fa6813
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112685
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx
b/framework/source/uifactory/uicontrollerfactory.cxx
index 619b66d7c420..5f81f80be026 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -261,24 +261,6 @@ PopupMenuControllerFactory::PopupMenuControllerFactory(
const Reference< XCompon
{
}
-struct PopupMenuControllerFactoryInstance {
-explicit PopupMenuControllerFactoryInstance(
-css::uno::Reference const & context):
-instance(static_cast(
-new PopupMenuControllerFactory(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct PopupMenuControllerFactorySingleton:
-public rtl::StaticWithArg<
-PopupMenuControllerFactoryInstance,
-css::uno::Reference,
-PopupMenuControllerFactorySingleton>
-{};
-
class ToolbarControllerFactory : public UIControllerFactory
{
public:
@@ -376,8 +358,7 @@
com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-PopupMenuControllerFactorySingleton::get(context).instance.get()));
+return cppu::acquire(new PopupMenuControllerFactory(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index f3a0cfcf1edd..2d71213468d6 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -110,7 +110,8 @@
+
constructor="com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/qa sfx2/source
sd/qa/unit/tiledrendering/tiledrendering.cxx |6 +-
sfx2/source/control/bindings.cxx | 23 +++
2 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 69bcdb4cffe2c3a12e215b6cf5d99f18e49a5973
Author: Tamás Zolnai
AuthorDate: Mon Mar 15 17:10:10 2021 +0100
Commit: Tamás Zolnai
CommitDate: Fri Mar 19 20:40:21 2021 +0100
lok: switch to the correct view before any UI update is done via
SfxBindings.
Change-Id: I541e53b4219340233ed5a4bec407ded5adf6a841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112538
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 79163b0cea67..5c4cb06f0790 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1002,6 +1002,7 @@ void SdTiledRenderingTest::testViewCursorParts()
SfxLokHelper::createView();
pXImpressDocument->initializeForTiledRendering(uno::Sequence());
ViewCallback aView2;
+int nView2 = SfxLokHelper::getView();
// Select the shape in the second view.
sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
@@ -1015,6 +1016,7 @@ void SdTiledRenderingTest::testViewCursorParts()
pView->UnmarkAllObj(pView->GetSdrPageView());
// Now switch to the second part in the second view.
+SfxLokHelper::setView(nView2);
pXImpressDocument->setPart(1);
aView2.m_nPart = 1;
aView1.m_bGraphicViewSelectionInvalidated = false;
@@ -1055,10 +1057,10 @@ void SdTiledRenderingTest::testCursorViews()
// second view as well, even if the second view was created after begin
// text edit in the first view.
ViewCallback aView2;
+SfxLokHelper::setView(nView1);
// This failed: the second view didn't get a lock notification, even if the
// first view already started text edit.
CPPUNIT_ASSERT(aView2.m_bViewLock);
-SfxLokHelper::setView(nView1);
aView2.m_bTilesInvalidated = false;
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
@@ -1185,6 +1187,8 @@ void
SdTiledRenderingTest::testCursorVisibility_MultiView()
pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
centerX, centerY,
2, MOUSE_LEFT, 0);
+
+SfxLokHelper::setView(nView1);
pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP,
centerX, centerY,
2, MOUSE_LEFT, 0);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 1d6fd0d62441..6be545d382bf 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -55,6 +55,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
@@ -1240,6 +1243,26 @@ bool SfxBindings::NextJob_Impl(Timer const * pTimer)
SfxApplication *pSfxApp = SfxGetpApp();
+// Switch to the right view for state update.
+if (comphelper::LibreOfficeKit::isActive())
+{
+if( pDispatcher )
+{
+SfxViewFrame* pFrame = pDispatcher->GetFrame();
+if (pFrame)
+{
+vcl::Window* pFrameWin = pFrame->GetWindow().GetFrameWindow();
+if (pFrameWin && pFrameWin->GetLOKNotifier()) {
+const SfxViewShell* pView = dynamic_cast(pFrameWin->GetLOKNotifier());
+if (pView)
+{
+SfxLokHelper::setView(pView->GetViewShellId().get());
+}
+}
+}
+}
+}
+
if( pDispatcher )
pDispatcher->Update_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/printer/cpdmgr.cxx | 49 ++---
1 file changed, 25 insertions(+), 24 deletions(-)
New commits:
commit 236f3a8e60e05147a37f294774b0c07d40aff36f
Author: Caolán McNamara
AuthorDate: Fri Mar 19 14:11:45 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:01:42 2021 +0100
cid#1473818 Use after free
Change-Id: Idd74e0debd12e42ff97d79b56e76cde6fd98aa2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112745
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx
b/vcl/unx/generic/printer/cpdmgr.cxx
index bebd568330c5..0789ae7e1ca7 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -43,11 +43,11 @@ void CPDManager::onNameAcquired (GDBusConnection
*connection,
gpointer user_data)
{
gchar* contents;
-GDBusNodeInfo *introspection_data;
-
// Get Interface for introspection
-g_file_get_contents (FRONTEND_INTERFACE, &contents, nullptr, nullptr);
-introspection_data = g_dbus_node_info_new_for_xml (contents, nullptr);
+if (!g_file_get_contents (FRONTEND_INTERFACE, &contents, nullptr, nullptr))
+return;
+
+GDBusNodeInfo *introspection_data = g_dbus_node_info_new_for_xml
(contents, nullptr);
g_dbus_connection_register_object (connection,
"/org/libreoffice/PrintDialog",
@@ -63,28 +63,29 @@ void CPDManager::onNameAcquired (GDBusConnection
*connection,
std::vector> backends =
current->getTempBackends();
for (auto const& backend : backends)
{
-GDBusProxy *proxy;
// Get Interface for introspection
-g_file_get_contents (BACKEND_INTERFACE, &contents, nullptr, nullptr);
-introspection_data = g_dbus_node_info_new_for_xml (contents, nullptr);
-proxy = g_dbus_proxy_new_sync (connection,
- G_DBUS_PROXY_FLAGS_NONE,
- introspection_data->interfaces[0],
- backend.first.c_str(),
- backend.second,
- "org.openprinting.PrintBackend",
- nullptr,
- nullptr);
+if (g_file_get_contents(BACKEND_INTERFACE, &contents, nullptr,
nullptr))
+{
+introspection_data = g_dbus_node_info_new_for_xml (contents,
nullptr);
+GDBusProxy *proxy = g_dbus_proxy_new_sync (connection,
+ G_DBUS_PROXY_FLAGS_NONE,
+ introspection_data->interfaces[0],
+ backend.first.c_str(),
+ backend.second,
+ "org.openprinting.PrintBackend",
+ nullptr,
+ nullptr);
+g_assert (proxy != nullptr);
+g_dbus_proxy_call(proxy, "ActivateBackend",
+ nullptr,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1, nullptr, nullptr, nullptr);
+
+g_free(contents);
+g_object_unref(proxy);
+g_dbus_node_info_unref(introspection_data);
+}
g_free(backend.second);
-g_assert (proxy != nullptr);
-g_dbus_proxy_call(proxy, "ActivateBackend",
- nullptr,
- G_DBUS_CALL_FLAGS_NONE,
- -1, nullptr, nullptr, nullptr);
-
-g_free(contents);
-g_object_unref(proxy);
-g_dbus_node_info_unref(introspection_data);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3c122fe936339f789945aa88fb26b099246ac37 Author: Caolán McNamara AuthorDate: Fri Mar 19 11:06:40 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:02:01 2021 +0100 Show is always called with true in this case Change-Id: I68889a830299ab0f8955a01a92f0db514e738a35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112737 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index b8df3b61e046..40b48b790782 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1378,7 +1378,7 @@ void SidebarController::UpdateDeckOpenState() mbIsDeckOpen = *mbIsDeckRequestedOpen; if (*mbIsDeckOpen && mpCurrentDeck) -mpCurrentDeck->Show(*mbIsDeckOpen); +mpCurrentDeck->Show(); NotifyResize(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source sw/uiconfig
sc/source/ui/cctrl/dpcontrol.cxx |6 -- sw/uiconfig/swriter/ui/navigatorpanel.ui |5 + 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit aad8b94ed6494e19611a779aed74adca931d14aa Author: Tünde Tóth AuthorDate: Fri Mar 12 11:33:54 2021 +0100 Commit: László Németh CommitDate: Fri Mar 19 21:02:42 2021 +0100 tdf#140955 sc UI: highlight active autofilter dropdown arrow by inverting its colors, as suggested by Heiko Tietze. The small difference in the active and inactive arrow shapes (a dot in the corner) is much more visible this way. Change-Id: I784fcb809549b22930037d28e007c2a42dcff337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112378 Tested-by: László Németh Reviewed-by: László Németh diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index d7dd13dd5c4e..0419b785b712 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -175,12 +175,14 @@ void ScDPFieldButton::drawPopupButton() // Background & outer black border mpOutDev->SetLineColor(COL_BLACK); -Color aBackgroundColor = mbPopupPressed ? mpStyle->GetShadowColor() : mpStyle->GetFaceColor(); +Color aBackgroundColor += mbHasHiddenMember ? mpStyle->GetHighlightColor() +: mbPopupPressed ? mpStyle->GetShadowColor() : mpStyle->GetFaceColor(); mpOutDev->SetFillColor(aBackgroundColor); mpOutDev->DrawRect(tools::Rectangle(aPos, aSize)); // the arrowhead -Color aArrowColor = mbHasHiddenMember ? mpStyle->GetHighlightLinkColor() : mpStyle->GetButtonTextColor(); +Color aArrowColor = mbHasHiddenMember ? mpStyle->GetHighlightTextColor() : mpStyle->GetButtonTextColor(); mpOutDev->SetLineColor(aArrowColor); mpOutDev->SetFillColor(aArrowColor); commit c3e703d115981cf9a7e9a2be493eec2ef3f3b95e Author: Caolán McNamara AuthorDate: Fri Mar 19 13:11:15 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:02:26 2021 +0100 don't hide toolbar item widgets if the pane shrinks Change-Id: Iac5df0f0233c9e97f84dce8a479cb50b944f45db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112746 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui index e8aa7fdc66fe..936df34e1d52 100644 --- a/sw/uiconfig/swriter/ui/navigatorpanel.ui +++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui @@ -250,6 +250,7 @@ True vertical + True False @@ -258,6 +259,7 @@ True True icons +False True @@ -287,6 +289,7 @@ True True icons +False True @@ -331,6 +334,7 @@ True True icons +False True @@ -363,6 +367,7 @@ True True icons +False True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx |4 1 file changed, 4 deletions(-) New commits: commit 3f0995d665a892bbc9d4cd01842da145bac8f488 Author: Caolán McNamara AuthorDate: Fri Mar 19 13:07:29 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:03:22 2021 +0100 shouldn't have to force a redraw for desktop either Change-Id: Id76dd8241d505011535c34d4de09a7f5320e5433 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112747 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 40b48b790782..f839fd98e0a9 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -828,10 +828,6 @@ void SidebarController::SwitchToDeck ( msCurrentDeckId = rDeckDescriptor.msId; } -// invisible with LOK, so avoid invalidations -if (!comphelper::LibreOfficeKit::isActive()) -mpTabBar->Invalidate(); - mpTabBar->HighlightDeck(msCurrentDeckId); // Determine the panels to display in the deck. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 303c1433005044e3a818490d65385febc8eb6030 Author: Caolán McNamara AuthorDate: Fri Mar 19 14:15:45 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:03:47 2021 +0100 cid#1474031 silence Double free coverity has learned about GObject apparently Change-Id: I3ef65407d3463cfd8bc106a8c354f4d8c1710dc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112748 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index fc958c780f18..6e5e5b48895d 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -3137,6 +3137,7 @@ public: gtk_widget_destroy(m_pMouseEventBox); gtk_container_add(GTK_CONTAINER(pParent), m_pWidget); +// coverity[freed_arg : FALSE] - this does not free m_pWidget, it is reffed by pParent g_object_unref(m_pWidget); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/edfcol.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit caf97c68afc35a8c9a60dd86bf7df205e635bf53
Author: Caolán McNamara
AuthorDate: Fri Mar 19 14:21:20 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:04:13 2021 +0100
cid#1473777 silence Using invalid iterator
Change-Id: I6fd80c8b5cec6d1d9c398e45cbd30cc65caa23a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112749
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index ed6e90b12ede..bcff20b8b243 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1946,6 +1946,7 @@ void
SwEditShell::RestoreMetadataFieldsAndValidateParagraphSignatures()
std::vector aResults;
if (!sFieldNames.isEmpty())
{
+assert(it != aStatements.end() && "can only be non-empty if it
was valid");
// Order the fields
sal_Int32 nIndex = 0;
do
@@ -1955,8 +1956,9 @@ void
SwEditShell::RestoreMetadataFieldsAndValidateParagraphSignatures()
break;
const auto it2 = aStatements.find(sCurFieldName);
-const OUString sName = (it2 != aStatements.end() ?
it->first : sBlank);
-const OUString sValue = (it2 != aStatements.end() ?
it->second : sBlank);
+bool bStatementFound = it2 != aStatements.end();
+const OUString sName = bStatementFound ? it->first :
sBlank;
+const OUString sValue = bStatementFound ? it->second :
sBlank;
if (aKeyCreator.isMarkingTextKey(sName))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/helper/canvastools.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 2f30b6af9ed727a967947b870b56689046f4a745 Author: Caolán McNamara AuthorDate: Fri Mar 19 14:24:39 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:04:41 2021 +0100 cid#1474156 Logically dead code nAlphaDepth can only be 0, 1 or 8 Change-Id: I54568f943149d455477a97a958df4a2349095dcc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112750 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 54dd76ae7651..8e837ac069e8 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -272,7 +272,6 @@ namespace vcl::unotools vcl::PixelFormat::N24_BPP; auto eAlphaPixelFormat = ( nAlphaDepth <= 1 ) ? vcl::PixelFormat::N1_BPP : -( nAlphaDepth <= 4 ) ? vcl::PixelFormat::N4_BPP : vcl::PixelFormat::N8_BPP; ::Bitmap aBitmap( aPixelSize, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/DeckLayouter.cxx | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
New commits:
commit bd7e258bac69f3b9f9e87128aacb989d23e24d4f
Author: Caolán McNamara
AuthorDate: Fri Mar 19 14:35:03 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:05:10 2021 +0100
cid#1473847 Logically dead code
Change-Id: Id8973910097844602f00bdc491656ea6c983413e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112751
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index 36d6357ef305..3752e7df8fe4 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -192,16 +192,21 @@ void LayoutPanels (
// size:
// Use the unmodified preferred height for all panels.
-LayoutMode eMode (MinimumOrLarger);
+LayoutMode eMode(MinimumOrLarger);
if (bShowVerticalScrollBar)
+{
eMode = Preferred;
-else if (nTotalPreferredHeight <= nAvailableHeight)
-eMode = PreferredOrLarger;
-else
-eMode = MinimumOrLarger;
-if (eMode != Preferred)
+const sal_Int32 nContentHeight(nTotalPreferredHeight +
nTotalDecorationHeight);
+SetupVerticalScrollBar(rVerticalScrollBar, nContentHeight,
aBox.GetHeight());
+}
+else
{
+if (nTotalPreferredHeight <= nAvailableHeight)
+eMode = PreferredOrLarger;
+else
+eMode = MinimumOrLarger;
+
const sal_Int32 nTotalHeight (eMode==MinimumOrLarger ?
nTotalMinimumHeight : nTotalPreferredHeight);
DistributeHeights(
@@ -211,15 +216,6 @@ void LayoutPanels (
eMode==MinimumOrLarger);
}
-if (bShowVerticalScrollBar)
-{
-const sal_Int32 nContentHeight(
-eMode==Preferred
-? nTotalPreferredHeight + nTotalDecorationHeight
-: aBox.GetHeight());
-SetupVerticalScrollBar(rVerticalScrollBar, nContentHeight,
aBox.GetHeight());
-}
-
const sal_Int32 nUsedHeight(PlacePanels(rLayoutItems, eMode));
rMinimalHeight = nUsedHeight;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source drawinglayer/source editeng/source sc/source sd/qa sd/source sfx2/source svl/source svx/source sw/qa sw/source tools/source writerfilter/source
chart2/source/model/main/ChartModel.cxx|6 chart2/source/view/main/ChartView.cxx |6 chart2/source/view/main/DrawModelWrapper.cxx |6 drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 338 +++--- drawinglayer/source/dumper/XShapeDumper.cxx| 484 ++--- editeng/source/editeng/editattr.cxx|8 editeng/source/editeng/editdoc.cxx | 24 - editeng/source/editeng/editobj.cxx | 28 - editeng/source/items/frmitems.cxx | 102 ++-- editeng/source/items/numitem.cxx | 32 - editeng/source/items/paraitem.cxx | 12 editeng/source/items/textitem.cxx | 84 +-- editeng/source/outliner/outliner.cxx |8 editeng/source/outliner/outlobj.cxx|6 editeng/source/outliner/paralist.cxx | 14 sc/source/core/data/attrib.cxx | 36 - sc/source/ui/view/gridwin_dbgutil.cxx | 18 sd/qa/unit/tiledrendering/tiledrendering.cxx |4 sd/source/core/drawdoc.cxx | 10 sd/source/core/sdpage2.cxx |6 sfx2/source/view/viewsh.cxx|8 svl/source/items/cenumitm.cxx |8 svl/source/items/intitem.cxx | 24 - svl/source/items/itempool.cxx |4 svl/source/items/itemset.cxx |4 svl/source/items/poolitem.cxx | 23 svl/source/items/stritem.cxx |8 svl/source/undo/undo.cxx | 40 - svx/source/items/e3ditem.cxx | 12 svx/source/sdr/properties/defaultproperties.cxx|4 svx/source/sdr/properties/properties.cxx |4 svx/source/svdraw/svdattr.cxx | 34 - svx/source/svdraw/svdmodel.cxx |6 svx/source/svdraw/svdobj.cxx | 18 svx/source/svdraw/svdogrp.cxx |6 svx/source/svdraw/svdpage.cxx |8 svx/source/svdraw/svdtext.cxx |4 svx/source/table/cell.cxx |8 svx/source/table/svdotable.cxx | 10 svx/source/table/tablelayouter.cxx | 22 svx/source/table/tablemodel.cxx|4 svx/source/xoutdev/xattr.cxx | 38 - svx/source/xoutdev/xattr2.cxx | 32 - svx/source/xoutdev/xattrbmp.cxx|6 sw/qa/core/uwriter.cxx |4 sw/qa/unit/swmodeltestbase.cxx |4 sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 10 sw/source/core/bastyp/swrect.cxx | 12 sw/source/core/crsr/bookmrk.cxx| 34 - sw/source/core/crsr/crsrsh.cxx |8 sw/source/core/crsr/pam.cxx| 20 sw/source/core/doc/DocumentSettingManager.cxx | 340 +++--- sw/source/core/doc/docbm.cxx |8 sw/source/core/doc/docfmt.cxx | 26 - sw/source/core/doc/docredln.cxx| 36 - sw/source/core/doc/fmtcol.cxx | 10 sw/source/core/doc/number.cxx | 14 sw/source/core/docnode/node.cxx| 52 +- sw/source/core/docnode/nodes.cxx |4 sw/source/core/docnode/section.cxx | 10 sw/source/core/fields/authfld.cxx | 34 - sw/source/core/fields/docufld.cxx | 12 sw/source/core/fields/fldbas.cxx | 26 - sw/source/core/fields/usrfld.cxx | 16 sw/source/core/layout/atrfrm.cxx | 174 +++ sw/source/core/layout/dumpfilter.cxx |4 sw/source/core/layout/pagedesc.cxx | 32 - sw/source/core/layout/tabfrm.cxx |4 sw/source/core/ole/ndole.cxx | 20 sw/source/core/para/paratr.cxx |8 sw/source/core/text/xmldump.cxx| 186 sw/source/core/txtnode/atrfld.cxx |8 sw/source/core/txtnode/atrftn.cxx | 22 sw/source/core/txtnode/chrfmt.cxx | 11 sw/source/core/txtnode/fmtatr2.cxx |8 sw/source/core/txtnode/ndtxt.cxx | 28 - sw/source/core/txtnode/txatbase.cxx| 18 sw/source/core/undo/docundo.cxx|8 sw/source/core/undo/rolbck.cxx | 30 - sw/source/core/undo/undel.cxx |6 sw/source/core/undo/undobj.cxx |6 sw/source/core/undo/undobj1.cxx
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9e0b747a51fe30c58296c5350214e98d7ecb80a8 Author: Caolán McNamara AuthorDate: Fri Mar 19 15:13:12 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:07:22 2021 +0100 cid#1473912 silence Use after free Change-Id: Ic4ee4d9cdf5f7f4e1247513b231b2880c1f316c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112754 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 6e5e5b48895d..52c06df10452 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -6368,6 +6368,7 @@ private: g_object_ref(m_pNotebook); gtk_container_remove(GTK_CONTAINER(pParent), GTK_WIDGET(m_pNotebook)); gtk_box_pack_start(m_pOverFlowBox, GTK_WIDGET(m_pNotebook), true, true, 0); +// coverity[freed_arg : FALSE] - this does not free m_pNotebook , it is reffed by pParent g_object_unref(m_pNotebook); gtk_widget_show(GTK_WIDGET(m_pOverFlowBox)); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/StylesPreviewWindow.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b41bb50749cee0281ecd19bafc2bb82c671eeeba
Author: Caolán McNamara
AuthorDate: Fri Mar 19 15:15:18 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:07:59 2021 +0100
cid#1473993 Uninitialized pointer read
Change-Id: Id1c4c48ef89241d2b3c8840a55a5511df7c263c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112755
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx
b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 59e86b7d2bd6..08d812af6493 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -78,8 +78,7 @@
StylePoolChangeListener::StylePoolChangeListener(StylesPreviewWindow_Base* pPrev
{
SfxObjectShell* pDocShell = SfxObjectShell::Current();
-if (pDocShell)
-m_pStyleSheetPool = pDocShell->GetStyleSheetPool();
+m_pStyleSheetPool = pDocShell ? pDocShell->GetStyleSheetPool() : nullptr;
if (m_pStyleSheetPool)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 754aea8115291304a7ca57396c32cbc516ccb843 Author: Caolán McNamara AuthorDate: Fri Mar 19 15:17:29 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:08:23 2021 +0100 cid#1474020 silence Use after free Change-Id: I3ef80e4c642b247ad228f912efa38e22ad7239e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112756 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 52c06df10452..745934c192c2 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1882,6 +1882,7 @@ namespace gtk_container_add(GTK_CONTAINER(pReplacement), pWidget); +// coverity[freed_arg : FALSE] - this does not free pWidget, it is reffed by pReplacement g_object_unref(pWidget); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 401105d4fc9c5a1746b4d887554b169e023a06c1 Author: Caolán McNamara AuthorDate: Fri Mar 19 15:22:04 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:08:42 2021 +0100 cid#1474327 silence Use after free Change-Id: I94c355c73a62723987157aecb9b0dbc2431af5af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112757 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 745934c192c2..c9fe5288ae2f 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -6136,6 +6136,7 @@ public: gtk_container_add(GTK_CONTAINER(m_pScrolledWindow), m_pOrigViewport); g_object_unref(m_pOrigViewport); +// coverity[freed_arg : FALSE] - this does not free m_pOrigViewport, it is reffed by m_pScrolledWindow gtk_container_add(GTK_CONTAINER(m_pOrigViewport), pChild); g_object_unref(pChild); gtk_widget_destroy(pViewport); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/scalectrl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7676c2fa79d035fd8746b6cf9099c94d0c120ec Author: Caolán McNamara AuthorDate: Fri Mar 19 15:28:34 2021 + Commit: Caolán McNamara CommitDate: Fri Mar 19 21:56:38 2021 +0100 cid#1474113 Out-of-bounds read order of Precedence is % before - Change-Id: Ief011bb145be8246451ae3785bff7325ae28c222 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112759 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx index e1826957b03e..6ab069f8a1e4 100644 --- a/sd/source/ui/app/scalectrl.cxx +++ b/sd/source/ui/app/scalectrl.cxx @@ -91,7 +91,7 @@ void SdScaleControl::Command(const CommandEvent& rCEvt) if (i > 11) nX = 1; else -nX = aTable[12 - i % 12]; +nX = aTable[(12 - i) % 12]; if (i > 11) nY = aTable[i % 12]; else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/fmview.cxx | 34 ++
1 file changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 229558c0bf257e4e559cc1b84bd2918b04c68305
Author: Caolán McNamara
AuthorDate: Fri Mar 19 15:32:53 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:57:04 2021 +0100
cid#1474166 Deference null return value
Change-Id: I725eff105f963b139ae8646cd1cb193ce737d313
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112760
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index feb1e43f2f8e..9adf7d830cf6 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -499,24 +499,26 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
// tdf#139804 Allow selecting form controls with Alt-
if (rKeyCode.IsMod2() && rKeyCode.GetCode())
{
-FmFormPage* pCurPage = GetCurPage();
-for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
+if (FmFormPage* pCurPage = GetCurPage())
{
-SdrObject* pObj = pCurPage->GetObj(a);
-FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
-if (!pFormObject)
-continue;
-
-Reference xControl =
pFormObject->GetUnoControl(*this, *pWin);
-if (!xControl.is())
-continue;
-const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetUILocaleI18nHelper();
-VclPtr pWindow =
VCLUnoHelper::GetWindow(xControl->getPeer());
-if (rI18nHelper.MatchMnemonic(pWindow->GetText(),
rKEvt.GetCharCode()))
+for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
{
-pWindow->GrabFocus();
-bDone = true;
-break;
+SdrObject* pObj = pCurPage->GetObj(a);
+FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
+if (!pFormObject)
+continue;
+
+Reference xControl =
pFormObject->GetUnoControl(*this, *pWin);
+if (!xControl.is())
+continue;
+const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetUILocaleI18nHelper();
+VclPtr pWindow =
VCLUnoHelper::GetWindow(xControl->getPeer());
+if (rI18nHelper.MatchMnemonic(pWindow->GetText(),
rKEvt.GetCharCode()))
+{
+pWindow->GrabFocus();
+bDone = true;
+break;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gio/gio_content.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit b4b0fedaee69fd69aaf1e686f22c2ce3606ef52b
Author: Caolán McNamara
AuthorDate: Fri Mar 19 15:39:01 2021 +
Commit: Caolán McNamara
CommitDate: Fri Mar 19 21:57:26 2021 +0100
cid#1473830 Resource leak
Change-Id: I221468d7030cf3ebf0425ede29e46febe8ffbe05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112763
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/ucb/source/ucp/gio/gio_content.cxx
b/ucb/source/ucp/gio/gio_content.cxx
index cfce60270c27..ed8eedbadf41 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -790,6 +790,8 @@ css::uno::Sequence< css::uno::Any >
Content::setPropertyValues(
else
mpInfo = pNewInfo;
+pNewInfo = nullptr;
+
if (mpFile) //Discard and refetch
{
g_object_unref(mpFile);
@@ -801,6 +803,9 @@ css::uno::Sequence< css::uno::Any >
Content::setPropertyValues(
notifyPropertiesChange( aChanges );
}
+if (pNewInfo)
+g_object_unref(pNewInfo);
+
return aRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03685f913d6aa46b8152feb15d3b873b9cc793a7 Author: Andras Timar AuthorDate: Fri Mar 19 22:26:29 2021 +0100 Commit: Andras Timar CommitDate: Fri Mar 19 22:26:29 2021 +0100 Bump version to 6.4-31 Change-Id: Iff12253d56f3316bff798410d7b90e695821d652 diff --git a/configure.ac b/configure.ac index b3b8162b9eb3..bd98318047d8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[6.4.10.30],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.31],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-31'
Tag 'cp-6.4-31' created by Andras Timar at 2021-03-19 21:32 + cp-6.4-31 Changes since co-6.4-20: Andras Timar (1): update Danish dictionary --- da_DK/README_da_DK.txt |4 da_DK/da_DK.aff| 3401 da_DK/da_DK.dic|288016 +++-- da_DK/description.xml |9 4 files changed, 139245 insertions(+), 152185 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-31'
Tag 'cp-6.4-31' created by Andras Timar at 2021-03-19 21:32 + cp-6.4-31 Changes since cp-6.4-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-31'
Tag 'cp-6.4-31' created by Andras Timar at 2021-03-19 21:32 + cp-6.4-31 Changes since cp-6.4-23: Andras Timar (1): Translation update --- source/ar/cui/messages.po | 130 source/ar/dictionaries/da_DK.po| 24 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 24 source/ar/svtools/messages.po | 44 source/ar/svx/messages.po | 502 - source/ar/sw/messages.po | 405 source/as/cui/messages.po | 106 source/as/dictionaries/da_DK.po| 18 source/as/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/as/svtools/messages.po | 42 source/as/svx/messages.po | 472 source/as/sw/messages.po | 385 source/ast/cui/messages.po | 108 source/ast/dictionaries/da_DK.po | 18 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 18 source/ast/svtools/messages.po | 42 source/ast/svx/messages.po | 485 - source/ast/sw/messages.po | 387 source/bg/cui/messages.po | 106 source/bg/dictionaries/da_DK.po| 24 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/bg/svtools/messages.po | 42 source/bg/svx/messages.po | 465 source/bg/sw/messages.po | 385 source/bn-IN/cui/messages.po | 106 source/bn-IN/dictionaries/da_DK.po | 18 source/bn-IN/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/bn-IN/svtools/messages.po | 42 source/bn-IN/svx/messages.po | 482 source/bn-IN/sw/messages.po| 386 source/br/cui/messages.po | 106 source/br/dictionaries/da_DK.po| 18 source/br/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/br/svtools/messages.po | 42 source/br/svx/messages.po | 487 - source/br/sw/messages.po | 385 source/ca-valencia/cui/messages.po | 106 source/ca-valencia/dictionaries/da_DK.po | 18 source/ca-valencia/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/ca-valencia/svtools/messages.po | 42 source/ca-valencia/svx/messages.po | 471 source/ca-valencia/sw/messages.po | 385 source/ca/cui/messages.po | 106 source/ca/dictionaries/da_DK.po| 24 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/ca/svtools/messages.po | 42 source/ca/svx/messages.po | 471 source/ca/sw/messages.po | 385 source/cs/cui/messages.po | 106 source/cs/dictionaries/da_DK.po| 24 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/cs/svtools/messages.po | 42 source/cs/svx/messages.po | 465 source/cs/sw/messages.po | 385 source/cy/cui/messages.po | 106 source/cy/dictionaries/da_DK.po| 24 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/cy/svtools/messages.po | 42 source/cy/svx/messages.po | 467 source/cy/sw/messages.po | 385 source/da/cui/messages.po
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-31'
Tag 'cp-6.4-31' created by Andras Timar at 2021-03-19 21:32 + cp-6.4-31 Changes since cp-6.4-30-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/PrecompiledHeaders.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 43f4769ae537310a6fe6a1edfbc6687cc26fd996 Author: Luboš Luňák AuthorDate: Fri Mar 19 16:28:09 2021 +0100 Commit: Luboš Luňák CommitDate: Fri Mar 19 23:07:14 2021 +0100 VCL_INTERNALS #define doesn't matter for reused PCH It's only used by VCL, so system PCH doesn't depend on it. Change-Id: If7a459d2d4c31d370e2b0e7fe57fcf68db72ed3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112764 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index 0a07d6588436..0d7ccf6610fb 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -141,6 +141,7 @@ gb_PrecompiledHeader_ignore_flags_system := \ -DSK_USER_CONFIG_HEADER=% \ -DSKIA_DLL \ -DGLM_FORCE_CTOR_INIT \ +-DVCL_INTERNALS \ -include $(SRCDIR)/pch/inc/clangfix.hxx \ # Probably also update pch/inc/clangfix.hxx if you extend the list. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unit Tests failing when built with clang 12
The UITest_calc_tests9 failure with clang 12/13 was fixed by https://cgit.freedesktop.org/libreoffice/core/commit/?id=9ccbf716ba16 Fix null-pointer-use Thanks Stephan! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/unoshape.hxx|7 +--
svx/source/unodraw/unoshap2.cxx |5 -
2 files changed, 1 insertion(+), 11 deletions(-)
New commits:
commit e8f9830f48ba08b3b949d8b0fd1d33aad0f5b0e9
Author: Noel Grandin
AuthorDate: Fri Mar 19 15:37:24 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 20 07:47:23 2021 +0100
SvxShape: no need to inherit from WeakAggImplHelper1 twice
once here, and once in one of the superclasses
Change-Id: I0396012b613f195783ef8c7eae38f29120007381
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112744
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index dc0d94a80f9c..844c2aac23bb 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -794,11 +794,7 @@ public:
/***
* *
***/
-typedef ::cppu::WeakAggImplHelper1<
-css::drawing::XEnhancedCustomShapeDefaulter
-> SvxShape_UnoImplHelper1;
-
-class SVXCORE_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public
SvxShape_UnoImplHelper1
+class SVXCORE_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public
css::drawing::XEnhancedCustomShapeDefaulter
{
protected:
using SvxUnoTextRangeBase::setPropertyValue;
@@ -827,7 +823,6 @@ public:
void SAL_CALL setPropertyValue( const OUString& aPropertyName, const
css::uno::Any& aValue ) override;
// XTypeProvider
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
override;
//XEnhancedCustomShapeDefaulter
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 2c4487b4cec6..56d1c1569479 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1582,11 +1582,6 @@ uno::Any SAL_CALL SvxCustomShape::queryAggregation(
const uno::Type & rType )
return aReturn;
}
-uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
-{
-return SvxShapeText::getTypes();
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
{
return css::uno::Sequence();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source framework/util
framework/source/uifactory/uicontrollerfactory.cxx | 21 +
framework/util/fwk.component |3 ++-
2 files changed, 3 insertions(+), 21 deletions(-)
New commits:
commit ea004488f6d55eaebe58c595ac53392bf936b5e4
Author: Noel
AuthorDate: Thu Mar 18 11:23:01 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 20 07:52:33 2021 +0100
use single-use attribute for ToolbarControllerFactory
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: Ie856c5954965fc640dc34d500664be924ddab69c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112684
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx
b/framework/source/uifactory/uicontrollerfactory.cxx
index 5f81f80be026..493d1d5522d0 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -288,24 +288,6 @@ ToolbarControllerFactory::ToolbarControllerFactory( const
Reference< XComponentC
{
}
-struct ToolbarControllerFactoryInstance {
-explicit ToolbarControllerFactoryInstance(
-css::uno::Reference const & context):
-instance(static_cast(
-new ToolbarControllerFactory(context)))
-{
-}
-
-css::uno::Reference instance;
-};
-
-struct ToolbarControllerFactorySingleton:
-public rtl::StaticWithArg<
-ToolbarControllerFactoryInstance,
-css::uno::Reference,
-ToolbarControllerFactorySingleton>
-{};
-
class StatusbarControllerFactory : public UIControllerFactory
{
public:
@@ -366,8 +348,7 @@
com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(static_cast(
-ToolbarControllerFactorySingleton::get(context).instance.get()));
+return cppu::acquire(new ToolbarControllerFactory(context));
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index 2d71213468d6..80af7267b774 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -145,7 +145,8 @@
+
constructor="com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation"
+ single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
