[Libreoffice-commits] core.git: chart2/qa chart2/source sw/qa
chart2/qa/extras/chart2import.cxx |4 +-- chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 16 +++--- chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 16 +++--- chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 16 +++--- chart2/source/view/main/PolarLabelPositionHelper.cxx | 20 +++--- sw/qa/extras/layout/data/tdf137154.docx |binary sw/qa/extras/layout/layout2.cxx | 20 ++ 7 files changed, 54 insertions(+), 38 deletions(-) New commits: commit db49cdcf2f367e27ed8fb5f1619f0b41f2c63fd2 Author: Tünde Tóth AuthorDate: Wed Sep 30 13:11:26 2020 +0200 Commit: László Németh CommitDate: Mon Oct 19 08:58:51 2020 +0200 tdf#137154 pie chart: improve Outside position of data labels Some pie chart data labels were too close to the pie with Outside placement. Change-Id: I0eecdfc32601bdfa8bb3115183f9ca723a9f945b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103683 Tested-by: Jenkins Tested-by: László Németh Reviewed-by: László Németh diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index d901f879ea18..1318a1ddebfa 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -2573,8 +2573,8 @@ void Chart2ImportTest::testTdf133376() CPPUNIT_ASSERT(xDataPointLabel.is()); // Check the position of the 3rd data point label, which is out from the pie slice awt::Point aLabelPosition = xDataPointLabel->getPosition(); -CPPUNIT_ASSERT_DOUBLES_EQUAL(349, aLabelPosition.X, 30); -CPPUNIT_ASSERT_DOUBLES_EQUAL(5480, aLabelPosition.Y, 30); +CPPUNIT_ASSERT_DOUBLES_EQUAL(458, aLabelPosition.X, 30); +CPPUNIT_ASSERT_DOUBLES_EQUAL(5114, aLabelPosition.Y, 30); } void Chart2ImportTest::testTdf134225() diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml index d23c93e558a2..84eb759612ff 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml @@ -181,9 +181,9 @@ - + - + @@ -193,14 +193,14 @@ - + - + @@ -273,9 +273,9 @@ - + - + @@ -284,14 +284,14 @@ - + - + diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml index e4e1bd07273b..11dd8ecfe15b 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml @@ -181,9 +181,9 @@ - + - + @@ -193,14 +193,14 @@ - + - + @@ -273,9 +273,9 @@ - + - + @@ -284,14 +284,14 @@ - + - + diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml index 9c1ce02d4583..4774a7e3e0b4 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml @@ -181,9 +181,9 @@ - + - + @@ -193,14 +193,14 @@ - + - + @@ -273,9 +273,9 @@
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19994e7aec92a0dd3448e7f680b6e820933cfdcc Author: Gleb Popov <6year...@gmail.com> AuthorDate: Sun Oct 18 19:24:52 2020 +0400 Commit: Mike Kaganski CommitDate: Mon Oct 19 09:47:51 2020 +0200 Add FreeBSD to the list of OSes that have OpenSSL in its base. Change-Id: I9ebbaf78c06e23f1fc44d9b97547c0a5c990cd11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104482 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/configure.ac b/configure.ac index 894efc1b7eaa..f26ab0b592d2 100644 --- a/configure.ac +++ b/configure.ac @@ -10554,7 +10554,7 @@ if test "$enable_openssl" = "yes"; then with_system_openssl=no libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) -elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ +elif test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ && test "$with_system_openssl" != "no"; then with_system_openssl=yes SYSTEM_OPENSSL=TRUE ___ 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/filter/ww8/ww8scan.cxx | 37 ++---
sw/source/filter/ww8/ww8scan.hxx |6 --
2 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 7f55db80c6fe42c162bbf51404e638a66b6ae9ab
Author: Caolán McNamara
AuthorDate: Sun Oct 18 20:36:16 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 19 09:49:39 2020 +0200
ofz#26480 validate WW8PLCFpcd is sorted like WW8PLCF does
Change-Id: I11393c730986585aeea229ebeec6417e4a0578d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104510
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index bc7275ea3d6b..e8a9a6450330 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2340,26 +2340,40 @@ void WW8PLCF::ReadPLCF(SvStream& rSt, WW8_FC nFilePos,
sal_uInt32 nPLCF)
void WW8PLCF::MakeFailedPLCF()
{
nIMax = 0;
-pPLCF_PosArray.reset( new sal_Int32[2] );
+pPLCF_PosArray.reset( new WW8_CP[2] );
pPLCF_PosArray[0] = pPLCF_PosArray[1] = WW8_CP_MAX;
pPLCF_Contents = reinterpret_cast(&pPLCF_PosArray[nIMax + 1]);
}
-void WW8PLCF::TruncToSortedRange()
+namespace
{
-//Docs state that: ... all Plcs ... are sorted in ascending order.
-//So ensure that here for broken documents.
-for (auto nI = 0; nI < nIMax; ++nI)
+sal_Int32 TruncToSortedRange(const sal_Int32* pPLCF_PosArray, sal_Int32
nIMax)
{
-if (pPLCF_PosArray[nI] > pPLCF_PosArray[nI+1])
+//Docs state that: ... all Plcs ... are sorted in ascending order.
+//So ensure that here for broken documents.
+for (auto nI = 0; nI < nIMax; ++nI)
{
-SAL_WARN("sw.ww8", "Document has unsorted PLCF, truncated to
sorted portion");
-nIMax = nI;
-break;
+if (pPLCF_PosArray[nI] > pPLCF_PosArray[nI+1])
+{
+SAL_WARN("sw.ww8", "Document has unsorted PLCF, truncated to
sorted portion");
+nIMax = nI;
+break;
+}
}
+return nIMax;
}
}
+void WW8PLCFpcd::TruncToSortedRange()
+{
+nIMax = ::TruncToSortedRange(pPLCF_PosArray.get(), nIMax);
+}
+
+void WW8PLCF::TruncToSortedRange()
+{
+nIMax = ::TruncToSortedRange(pPLCF_PosArray.get(), nIMax);
+}
+
void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN)
{
OSL_ENSURE( nIMax < ncpN, "Pcl.Fkp: Why is PLCF too big?" );
@@ -2381,7 +2395,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN,
sal_Int32 ncpN)
{
size_t nSiz = (4 + nStru) * nIMax + 4;
size_t nElems = ( nSiz + 3 ) / 4;
-pPLCF_PosArray.reset( new sal_Int32[ nElems ] ); // Pointer to
Pos-array
+pPLCF_PosArray.reset( new WW8_CP[ nElems ] ); // Pointer to Pos-array
for (sal_Int32 i = 0; i < ncpN && !failure; ++i)
{
@@ -2515,7 +2529,7 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos,
bValid = false;
nPLCF = bValid ? std::min(nRemainingSize, static_cast(nPLCF))
: nValidMin;
-pPLCF_PosArray.reset( new sal_Int32[ ( nPLCF + 3 ) / 4 ] );// Pointer
to Pos-array
+pPLCF_PosArray.reset( new WW8_CP[ ( nPLCF + 3 ) / 4 ] );// Pointer to
Pos-array
pPLCF_PosArray[0] = 0;
nPLCF = bValid ? pSt->ReadBytes(pPLCF_PosArray.get(), nPLCF) : nValidMin;
@@ -2529,6 +2543,7 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos,
// Pointer to content array
pPLCF_Contents = reinterpret_cast(&pPLCF_PosArray[nIMax + 1]);
+TruncToSortedRange();
pSt->Seek( nOldPos );
}
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index edf22104f65b..d6672ad94cc5 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -340,14 +340,16 @@ class WW8PLCFpcd
{
friend class WW8PLCFpcd_Iter;
-std::unique_ptr pPLCF_PosArray; // pointer to Pos-array and
the whole structure
+std::unique_ptr pPLCF_PosArray; // pointer to Pos-array and the
whole structure
sal_uInt8* pPLCF_Contents; // pointer to content-array-part of Pos-array
-long nIMax;
+sal_Int32 nIMax;
sal_uInt32 nStru;
WW8PLCFpcd(const WW8PLCFpcd&) = delete;
WW8PLCFpcd& operator=(const WW8PLCFpcd&) = delete;
+void TruncToSortedRange();
+
public:
WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos, sal_uInt32 nPLCF,
sal_uInt32 nStruct);
___
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' - sc/qa sc/source sd/qa sd/source sw/qa sw/source
sc/qa/unit/tiledrendering/tiledrendering.cxx | 17 +
sc/source/ui/unoobj/docuno.cxx | 12 +++-
sd/qa/unit/tiledrendering/tiledrendering.cxx | 16
sd/source/ui/unoidl/unomodel.cxx |2 ++
sw/qa/extras/tiledrendering/tiledrendering.cxx | 17 +
sw/source/uibase/uno/unotxdoc.cxx |2 ++
6 files changed, 65 insertions(+), 1 deletion(-)
New commits:
commit 5c5fa6597af973ebce48f983af8fdbb87789d03f
Author: Mert Tumer
AuthorDate: Tue Oct 13 20:16:22 2020 +0300
Commit: Jan Holesovsky
CommitDate: Mon Oct 19 09:51:03 2020 +0200
Check render parameters for AutoSpellChecking
Change-Id: Ife2551b4023461da26e70ac3de505adf9d7db1e8
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104274
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 33a15349b70b..b6db96dc5473 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -112,6 +112,7 @@ public:
void testDeleteCellMultilineContent();
void testFunctionDlg();
void testSpellOnlineParameter();
+void testSpellOnlineRenderParameter();
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
CPPUNIT_TEST(testRowColumnHeaders);
@@ -158,6 +159,7 @@ public:
CPPUNIT_TEST(testDeleteCellMultilineContent);
CPPUNIT_TEST(testFunctionDlg);
CPPUNIT_TEST(testSpellOnlineParameter);
+CPPUNIT_TEST(testSpellOnlineRenderParameter);
CPPUNIT_TEST_SUITE_END();
private:
@@ -604,6 +606,21 @@ void ScTiledRenderingTest::testViewCursors()
CPPUNIT_ASSERT(aView1.m_bViewCursorInvalidated);
}
+void ScTiledRenderingTest::testSpellOnlineRenderParameter()
+{
+ScModelObj* pModelObj = createDoc("empty.ods");
+ScDocument* pDoc = pModelObj->GetDocument();
+bool bSet = pDoc->GetDocOptions().IsAutoSpell();
+
+uno::Sequence aPropertyValues =
+{
+comphelper::makePropertyValue(".uno:SpellOnline", uno::makeAny(!bSet)),
+};
+pModelObj->initializeForTiledRendering(aPropertyValues);
+
+CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
+}
+
void lcl_dispatchCommand(const uno::Reference& xComponent,
const OUString& rCommand, const uno::Sequence& rArguments)
{
uno::Reference xController =
uno::Reference(xComponent,
uno::UNO_QUERY_THROW)->getCurrentController();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b51e63419f57..9d2539a25bcd 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1173,7 +1173,7 @@ void ScModelObj::completeFunction(const OUString&
rFunctionName)
}
}
-void ScModelObj::initializeForTiledRendering(const
css::uno::Sequence& /*rArguments*/)
+void ScModelObj::initializeForTiledRendering(const
css::uno::Sequence& rArguments)
{
SolarMutexGuard aGuard;
@@ -1182,6 +1182,16 @@ void ScModelObj::initializeForTiledRendering(const
css::uno::SequenceSetAppOptions(aAppOptions);
+for (const beans::PropertyValue& rValue : rArguments)
+{
+if (rValue.Name == ".uno:SpellOnline" && rValue.Value.has())
+ {
+ScDocOptions options = GetDocument()->GetDocOptions();
+options.SetAutoSpell(rValue.Value.get());
+GetDocument()->SetDocOptions(options);
+ }
+}
+
// show us the text exactly
ScInputOptions aInputOptions(SC_MOD()->GetInputOptions());
aInputOptions.SetTextWysiwyg(true);
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index d7c2719e105a..79163b0cea67 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -126,6 +126,7 @@ public:
void testRegenerateDiagram();
void testLanguageAllText();
void testInsertDeletePageInvalidation();
+void testSpellOnlineRenderParameter();
CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
CPPUNIT_TEST(testCreateDestroy);
@@ -177,6 +178,7 @@ public:
CPPUNIT_TEST(testRegenerateDiagram);
CPPUNIT_TEST(testLanguageAllText);
CPPUNIT_TEST(testInsertDeletePageInvalidation);
+CPPUNIT_TEST(testSpellOnlineRenderParameter);
CPPUNIT_TEST_SUITE_END();
@@ -2429,6 +2431,20 @@ void
SdTiledRenderingTest::testInsertDeletePageInvalidation()
CPPUNIT_ASSERT_EQUAL(size_t(8), aView1.m_aInvalidations.size());
}
+void SdTiledRenderingTest::testSpellOnlineRenderParameter()
+{
+// Load the document.
+SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+bool bSet = pXImpressDocument->GetDoc()->GetOnlineSpell();
+
+uno::Sequence aPropertyValues =
+{
+comphelper::InitPropertySequence({ { ".uno:SpellOnline",
uno::makeAny(!bSet) } }),
+};
+pXImpressDocument->initia
[Libreoffice-commits] core.git: sd/source
sd/source/filter/ppt/pptinanimations.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91c785d3aec872197ced5788ae83347cadd94804 Author: Noel AuthorDate: Mon Oct 19 08:49:36 2020 +0200 Commit: Noel Grandin CommitDate: Mon Oct 19 10:20:43 2020 +0200 fix typo after commit 648d9892e8a85606c060e050e31251357dcff44b remove thread-unsafe static buffer Change-Id: Ida9065664bf9237b3631e3b864a510d765365b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104511 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 826765ab7185..5d029752154c 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -3014,7 +3014,7 @@ void AnimationImporter::dump( const PropertySet& rSet ) if (pMode) fprintf(mpFile, " class=\"%s\"", pMode); else -fprintpf(mpFile, " class =\"%" SAL_PRIdINT32 "\"", nPresetClass); +fprintf(mpFile, " class =\"%" SAL_PRIdINT32 "\"", nPresetClass); bKnown = true; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 5 commits - include/sfx2 include/vcl sc/source vcl/Library_vcl.mk vcl/qa vcl/source xmlsecurity/Library_xmlsecurity.mk xmlsecurity/qa
include/sfx2/strings.hrc |
4
include/vcl/filter/PDFiumLibrary.hxx |
93 ++
sc/source/core/data/table3.cxx |
4
vcl/Library_vcl.mk |
1
vcl/qa/cppunit/pdfexport/pdfexport.cxx |
12 -
vcl/source/filter/ipdf/pdfread.cxx |
18 -
vcl/source/pdf/PDFiumLibrary.cxx |
90 +
xmlsecurity/Library_xmlsecurity.mk |
5
xmlsecurity/qa/unit/signing/data/hide-and-replace-shadow-file-signed-2.pdf
|binary
xmlsecurity/qa/unit/signing/signing.cxx|
16 +
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |
26 ++
xmlsecurity/source/pdfio/pdfdocument.cxx |
69 +++
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |
4
xmlsecurity/workben/pdfverify.cxx |
5
14 files changed, 310 insertions(+), 37 deletions(-)
New commits:
commit a986a756e3365f0003a41dadd120f1665928892f
Author: Miklos Vajna
AuthorDate: Fri Sep 4 17:17:48 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Oct 19 09:43:56 2020 +0200
xmlsecurity: pdf incremental updates that are non-commenting are invalid
I.e. it's OK to add incremental updates for annotation/commenting
purposes and that doesn't invalite existing signatures. Everything else
does.
(cherry picked from commit 61834cd574568613f0b0a2ee099a60fa5a8d9804)
Conflicts:
include/vcl/filter/PDFiumLibrary.hxx
vcl/source/pdf/PDFiumLibrary.cxx
xmlsecurity/qa/unit/signing/signing.cxx
Change-Id: I4607c242b3c6f6b01517b02407e9e7a095e2e069
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index b9bceabb8acf..ffc70874c19b 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -17,11 +17,16 @@
#include
#include
#include
+#include
+
+#include
namespace vcl
{
namespace pdf
{
+class PDFiumDocument;
+
class VCL_DLLPUBLIC PDFium final
{
private:
@@ -33,6 +38,49 @@ public:
~PDFium();
};
+class VCL_DLLPUBLIC PDFiumPage final
+{
+private:
+FPDF_PAGE mpPage;
+
+private:
+PDFiumPage(const PDFiumPage&) = delete;
+PDFiumPage& operator=(const PDFiumPage&) = delete;
+
+public:
+PDFiumPage(FPDF_PAGE pPage)
+: mpPage(pPage)
+{
+}
+
+~PDFiumPage()
+{
+if (mpPage)
+FPDF_ClosePage(mpPage);
+}
+
+/// Get bitmap checksum of the page, without annotations/commenting.
+BitmapChecksum getChecksum();
+};
+
+class VCL_DLLPUBLIC PDFiumDocument final
+{
+private:
+FPDF_DOCUMENT mpPdfDocument;
+
+private:
+PDFiumDocument(const PDFiumDocument&) = delete;
+PDFiumDocument& operator=(const PDFiumDocument&) = delete;
+
+public:
+PDFiumDocument(FPDF_DOCUMENT pPdfDocument);
+~PDFiumDocument();
+
+int getPageCount();
+
+std::unique_ptr openPage(int nIndex);
+};
+
struct PDFiumLibrary : public rtl::StaticWithInit,
PDFiumLibrary>
{
std::shared_ptr operator()() { return std::make_shared(); }
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 604807524bf9..70e62ece2f11 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -14,6 +14,9 @@
#include
#include
+#include
+#include
+#include
namespace vcl::pdf
{
@@ -29,6 +32,57 @@ PDFium::PDFium()
PDFium::~PDFium() { FPDF_DestroyLibrary(); }
+PDFiumDocument::PDFiumDocument(FPDF_DOCUMENT pPdfDocument)
+: mpPdfDocument(pPdfDocument)
+{
+}
+
+PDFiumDocument::~PDFiumDocument()
+{
+if (mpPdfDocument)
+FPDF_CloseDocument(mpPdfDocument);
+}
+
+std::unique_ptr PDFiumDocument::openPage(int nIndex)
+{
+std::unique_ptr pPDFiumPage;
+FPDF_PAGE pPage = FPDF_LoadPage(mpPdfDocument, nIndex);
+if (pPage)
+{
+pPDFiumPage = std::make_unique(pPage);
+}
+return pPDFiumPage;
+}
+
+int PDFiumDocument::getPageCount() { return FPDF_GetPageCount(mpPdfDocument); }
+
+BitmapChecksum PDFiumPage::getChecksum()
+{
+size_t nPageWidth = FPDF_GetPageWidth(mpPage);
+size_t nPageHeight = FPDF_GetPageHeight(mpPage);
+FPDF_BITMAP pPdfBitmap = FPDFBitmap_Create(nPageWidth, nPageHeight,
/*alpha=*/1);
+if (!pPdfBitmap)
+{
+return 0;
+}
+
+// Intentionally not using FPDF_ANNOT here, annotations/commenting is OK
to not affect the
+// checksum, signature verification wants this.
+FPDF_RenderPageBitmap(pPdfBitmap, mpPage, /*start_x=*/0, /*start_y=*/0,
nPageWidth, nPageHeight,
+ /*rotate=
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unotxdoc.hxx | 42 +--
sw/source/core/inc/flowfrm.hxx|6
sw/source/core/layout/flowfrm.cxx |2
sw/source/uibase/uno/unotxdoc.cxx | 462 +++---
4 files changed, 256 insertions(+), 256 deletions(-)
New commits:
commit 195b28c9f0cd71776d677d25e562eee8e7bef8d7
Author: Miklos Vajna
AuthorDate: Mon Oct 19 09:02:01 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 19 10:28:21 2020 +0200
sw: prefix members of SwFlowFrame, SwXLinkTargetSupplier, ...
... SwXOutlineTarget and SwXTextDocument
See tdf#94879 for motivation.
Change-Id: Ic8f8f5f544dd93e6d9c6764ec53e58c5975598a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104512
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 4ecd5ba57f7e..c44174cbe99b 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -141,17 +141,17 @@ private:
std::deque>> maActionArr;
-const SfxItemPropertySet* pPropSet;
+const SfxItemPropertySet* m_pPropSet;
-SwDocShell* pDocShell;
-boolbObjectValid;
+SwDocShell* m_pDocShell;
+boolm_bObjectValid;
-SwXDrawPage*pDrawPage;
+SwXDrawPage*m_pDrawPage;
css::uno::Reference< css::drawing::XDrawPage > mxXDrawPage;
-css::uno::Reference< css::text::XText > xBodyText;
-SwXBodyText*pBodyText;
-css::uno::Reference< css::uno::XAggregation > xNumFormatAgg;
+css::uno::Reference< css::text::XText > m_xBodyText;
+SwXBodyText*m_pBodyText;
+css::uno::Reference< css::uno::XAggregation >
m_xNumFormatAgg;
css::uno::Reference< css::container::XIndexAccess >
mxXNumberingRules;
css::uno::Reference< css::container::XIndexAccess > mxXFootnotes;
@@ -200,7 +200,7 @@ private:
// set in XPagePrintable::printPages(..) to indicate that the
PagePrintSettings
// has to be applied in XRenderable::getRenderer(..) through which the
printing
// is implemented.
-bool bApplyPagePrintSettingsFromXPagePrintable;
+bool m_bApplyPagePrintSettingsFromXPagePrintable;
using SfxBaseModel::addEventListener;
using SfxBaseModel::removeEventListener;
@@ -453,7 +453,7 @@ public:
voidInvalidate();
voidReactivate(SwDocShell* pNewDocShell);
SwXDocumentPropertyHelper * GetPropertyHelper ();
-boolIsValid() const {return bObjectValid;}
+boolIsValid() const {return m_bObjectValid;}
voidInitNewDoc();
@@ -463,7 +463,7 @@ public:
sal_Int32& nResult,
css::uno::Reference<
css::uno::XInterface > const & xLastResult);
-SwDocShell* GetDocShell() {return pDocShell;}
+SwDocShell* GetDocShell() {return m_pDocShell;}
};
class SwXLinkTargetSupplier final : public cppu::WeakImplHelper
@@ -472,14 +472,14 @@ class SwXLinkTargetSupplier final : public
cppu::WeakImplHelper
css::lang::XServiceInfo
>
{
-SwXTextDocument* pxDoc;
-OUString sTables;
-OUString sFrames;
-OUString sGraphics;
-OUString sOLEs;
-OUString sSections;
-OUString sOutlines;
-OUString sBookmarks;
+SwXTextDocument* m_pxDoc;
+OUString m_sTables;
+OUString m_sFrames;
+OUString m_sGraphics;
+OUString m_sOLEs;
+OUString m_sSections;
+OUString m_sOutlines;
+OUString m_sBookmarks;
public:
SwXLinkTargetSupplier(SwXTextDocument& rxDoc);
@@ -499,7 +499,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
-voidInvalidate() {pxDoc = nullptr;}
+voidInvalidate() {m_pxDoc = nullptr;}
};
class SwXLinkNameAccessWrapper final : public cppu::WeakImplHelper
@@ -557,8 +557,8 @@ class SwXOutlineTarget final : public cppu::WeakImplHelper
css::lang::XServiceInfo
>
{
-const SfxItemPropertySet* pPropSet;
-OUStringsOutlineText;
+const SfxItemPropertySet* m_pPropSet;
+OUStringm_sOutlineText;
public:
SwXOutlineTarget(const OUString& rOutlineText);
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 078ef9326837..965c0b8cfbd0 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -85,7 +85,7 @@ class SwFlowFrame
pages can be skipped at the same time. In addition, it is evaluated by
the MoveBwd() method in TabFrame.
*/
-sta
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/font.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 1441ab9c75a2f0ac664983db22b681a1b602f8a9 Author: Noel AuthorDate: Mon Oct 19 09:19:15 2020 +0200 Commit: Noel Grandin CommitDate: Mon Oct 19 10:34:53 2020 +0200 fix possible SIGSEGV after commit 8f54136caa786523fd224f6c98fc8e7c45cd805d use std::unique_ptr for SalLayout Change-Id: If1a0af9924a185694489b7f31f9e71495f2cb77b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104513 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e5b8a9fbc1bf..f7b172c4665d 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1295,6 +1295,9 @@ std::unique_ptr OutputDevice::ImplGlyphFallbackLayout( std::unique_pt return nullptr; } +// keep a pointer to the layout because we might move ownership of the unique_ptr +const SalLayout* pSalLayoutTmp = pSalLayout.get(); + // prepare multi level glyph fallback std::unique_ptr pMultiSalLayout; ImplLayoutRuns aLayoutRuns = rLayoutArgs.maRuns; @@ -1356,7 +1359,7 @@ std::unique_ptr OutputDevice::ImplGlyphFallbackLayout( std::unique_pt pSalLayout = std::move(pMultiSalLayout); // restore orig font settings -pSalLayout->InitFont(); +pSalLayoutTmp->InitFont(); rLayoutArgs.maRuns = aLayoutRuns; return pSalLayout; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Optimization thought, concurrent importing of slides
Our two competitors MS Office/WPS do not have the problem of scaling. Opening a
document with 100 slides makes little percetible difference from opening a PPT
of one single slide. We take a look at the code, and we think, maybe, instead
of importing the document slide by slide, would it be possible to import all
the slides at once with multiple threads?
Has anyone made such attemp? What stops us from using concurrent processing?
Here are the code snippet, in oox/source/ppt/presentationfragmenthandler.cxx
void PresentationFragmentHandler::finalizeImport()
{
...
int nPagesImported = 0;
for (sal_Int32 elem :
aRangeEnumerator)
{
if (
rxStatusIndicator.is() )
rxStatusIndicator->setValue((nPagesImported * 1) /
aRangeEnumerator.size());
importSlide(elem,
!nPagesImported, bImportNotesPages);
nPagesImported++;
}
...
}___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/xlsx/tdf90104.xlsx|binary
sc/qa/unit/subsequent_export-test.cxx | 24 +++
sc/source/filter/excel/xecontent.cxx | 35 +-
sc/source/filter/inc/xecontent.hxx|1
4 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit 699372466384113cf015be714e0067e857f8fa5c
Author: Tibor Nagy
AuthorDate: Tue Oct 13 15:48:31 2020 +0200
Commit: László Németh
CommitDate: Mon Oct 19 10:42:53 2020 +0200
tdf#90104 XLSX export: fix commas in data validation list
Comma was exported as list separator instead of
decimal separator, messing up the data validation list
by breaking integer and fractional parts of a number to
two integer numbers, for example the 2-item list 1,5, 2,5
to the bad 4-item list 1, 5, 2, 5.
Note: for testing with numbers, it needs to set decimal
separator to comma in locale settings.
Co-authored-by: Attila Szűcs (NISZ)
Change-Id: I6133c402b47aab8ed9f02b412762404fc520badc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104240
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/qa/unit/data/xlsx/tdf90104.xlsx
b/sc/qa/unit/data/xlsx/tdf90104.xlsx
new file mode 100644
index ..ce6ed68368d6
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf90104.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index e928785d062e..bf015d93eac7 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -93,6 +93,7 @@ public:
ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const
OUString&, const OUString&, SfxFilterFlags );
void test();
+void testTdf90104();
void testTdf111876();
void testPasswordExportODS();
void testTdf134332();
@@ -276,6 +277,7 @@ public:
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
+CPPUNIT_TEST(testTdf90104);
CPPUNIT_TEST(testTdf111876);
CPPUNIT_TEST(testPasswordExportODS);
CPPUNIT_TEST(testTdf134332);
@@ -478,6 +480,7 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr&
pXmlXPathCtx)
{ BAD_CAST("ContentType"),
BAD_CAST("http://schemas.openxmlformats.org/package/2006/content-types";) },
{ BAD_CAST("x14"),
BAD_CAST("http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";) },
{ BAD_CAST("xm"),
BAD_CAST("http://schemas.microsoft.com/office/excel/2006/main";) },
+{ BAD_CAST("x12ac"),
BAD_CAST("http://schemas.microsoft.com/office/spreadsheetml/2011/1/ac";) },
};
for(size_t i = 0; i < SAL_N_ELEMENTS(aNamespaces); ++i)
{
@@ -541,6 +544,27 @@ void ScExportTest::test()
xDocSh->DoClose();
}
+void ScExportTest::testTdf90104()
+{
+ScDocShellRef xShell = loadDoc("tdf90104.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+
+xmlDocUniquePtr pDoc
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPathContent(pDoc,
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
+ "/mc:Choice/x12ac:list", "1,\"2,3\",4,\"5,6\"");
+assertXPathContent(pDoc,
"/x:worksheet/x:dataValidations/x:dataValidation/mc:AlternateContent"
+ "/mc:Fallback/x:formula1", "\"1,2,3,4,5,6\"");
+}
+
void ScExportTest::testTdf111876()
{
// Document with relative path hyperlink
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index a04c456fdeaa..dbb28ec7b81c 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1738,6 +1738,8 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong
nScHandle ) :
OUString aString;
if( XclTokenArrayHelper::GetStringList( aString, *xScTokArr,
'\n' ) )
{
+bool bList = false;
+OUStringBuffer sListBuf;
OUStringBuffer sFormulaBuf;
sFormulaBuf.append( '"' );
/* Formula is a list of string tokens -> build the Excel
string.
@@ -1750,12 +1752,22 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong
nScHandle ) :
for(;;)
{
const OUString aToken( aString.getToken( 0, '\n',
nStringIx ) );
+if (aToken.indexOf(",") != -1)
+{
+sListBuf.append('"');
+sListBuf.append(aToken);
+sListBuf.append('"');
+bList = true;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d76e9fc4edcdf9a44cb2ed9542261064a8a76dde
Author: Caolán McNamara
AuthorDate: Sat Oct 17 16:24:09 2020 +0100
Commit: Michael Stahl
CommitDate: Mon Oct 19 11:21:34 2020 +0200
Resolves: tdf#137201 and tdf#134939 don't update IM if focus is in another
widget
Change-Id: Ia078ed9c1896d4a3541525ea2907760ce235dfd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104346
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d818ec137096..69a554108196 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3190,10 +3190,13 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
GtkSalFrame* pThis = static_cast(frame);
+bool bFocusInAnotherGtkWidget = false;
+
if (GTK_IS_WINDOW(pThis->m_pWindow))
{
GtkWidget* pFocusWindow =
gtk_window_get_focus(GTK_WINDOW(pThis->m_pWindow));
-if (pFocusWindow && pFocusWindow !=
GTK_WIDGET(pThis->m_pFixedContainer))
+bFocusInAnotherGtkWidget = pFocusWindow && pFocusWindow !=
GTK_WIDGET(pThis->m_pFixedContainer);
+if (bFocusInAnotherGtkWidget)
{
gpointer pClass = g_type_class_ref(GTK_TYPE_WINDOW);
GtkWidgetClass* pWindowClass = GTK_WIDGET_CLASS(pClass);
@@ -3213,11 +3216,8 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
vcl::DeletionListener aDel( pThis );
-if( pThis->m_pIMHandler )
-{
-if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) )
-return true;
-}
+if (!bFocusInAnotherGtkWidget && pThis->m_pIMHandler &&
pThis->m_pIMHandler->handleKeyEvent(pEvent))
+return true;
bool bStopProcessingKey = false;
@@ -3306,7 +3306,7 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
pThis->m_nKeyModifiers = ModKeyFlags::NONE;
}
-if( !aDel.isDeleted() && pThis->m_pIMHandler )
+if (!bFocusInAnotherGtkWidget && !aDel.isDeleted() && pThis->m_pIMHandler)
pThis->m_pIMHandler->updateIMSpotLocation();
return bStopProcessingKey;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/winlayout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a3f93ced82f8d4d122468cc4a1c4298141d67507
Author: Stephan Bergmann
AuthorDate: Mon Oct 19 09:20:35 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Oct 19 11:48:41 2020 +0200
Simplify single-wchar_t LPCWSTR argument to ExtTextOutW
Change-Id: I5c66408297ab03da29494d00ce222b3ef1e0ef13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104515
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 884b1be6e670..3438e3b79deb 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -266,7 +266,7 @@ bool ExTextOutRenderer::operator ()(GenericSalLayout const
&rLayout,
const GlyphItem* pGlyph;
while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart))
{
-WORD glyphWStr[] = { pGlyph->glyphId() };
+wchar_t glyphWStr = pGlyph->glyphId();
if (hAltFont && pGlyph->IsVertical() == bUseAltFont)
{
bUseAltFont = !bUseAltFont;
@@ -275,7 +275,7 @@ bool ExTextOutRenderer::operator ()(GenericSalLayout const
&rLayout,
if (bShift && pGlyph->IsVertical())
SetTextAlign(hDC, TA_TOP|TA_LEFT);
-ExtTextOutW(hDC, aPos.X(), aPos.Y(), ETO_GLYPH_INDEX, nullptr,
LPCWSTR(&glyphWStr), 1, nullptr);
+ExtTextOutW(hDC, aPos.X(), aPos.Y(), ETO_GLYPH_INDEX, nullptr,
&glyphWStr, 1, nullptr);
if (bShift && pGlyph->IsVertical())
SetTextAlign(hDC, nTextAlign);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/win/salgdi.h |2 +-
vcl/win/gdi/salfont.cxx | 31 +++
vcl/win/gdi/winlayout.cxx |2 +-
3 files changed, 5 insertions(+), 30 deletions(-)
New commits:
commit 6137de745606e9ccee94119fd1f8b7a90c4aa323
Author: Noel Grandin
AuthorDate: Mon Sep 21 15:47:31 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 19 12:20:44 2020 +0200
tdf#127047 fix printing very large font sizes to pdf
The clamping of font sizes was done in #i47675 and #i95867
to deal with issues in the Windows font libraries which are
presumably no longer a problem.
Change-Id: I124a3ff746953ce4d7d934506e76e6d0cba48307
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103113
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index a717286737c0..bec473b296b4 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -184,7 +184,7 @@ private:
bool DrawCachedGlyphs(const GenericSalLayout& rLayout);
public:
-HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const
PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont);
+HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const
PhysicalFontFace * i_pFontFace, HFONT& o_rOldFont);
HDC getHDC() const { return mhLocalDC; }
void setHDC(HDC aNew) { mhLocalDC = aNew; }
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 3f6082a6b92d..f37ae89a00a8 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -65,8 +65,6 @@
using namespace vcl;
-const int MAXFONTHEIGHT = 2048;
-
static FIXED FixedFromDouble( double d )
{
const long l = static_cast( d * 65536. );
@@ -846,7 +844,6 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const & i_rFont,
const PhysicalFontFace * i_pFontFace,
-float& o_rFontScale,
HFONT& o_rOldFont)
{
HFONT hNewFont = nullptr;
@@ -854,25 +851,6 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern
const & i_rFont,
LOGFONTW aLogFont;
ImplGetLogFontFromFontSelect( getHDC(), i_rFont, i_pFontFace, aLogFont );
-// #i47675# limit font requests to MAXFONTHEIGHT
-// TODO: share MAXFONTHEIGHT font instance
-if( (-aLogFont.lfHeight <= MAXFONTHEIGHT)
-&& (+aLogFont.lfWidth <= MAXFONTHEIGHT) )
-{
-o_rFontScale = 1.0;
-}
-else if( -aLogFont.lfHeight >= +aLogFont.lfWidth )
-{
-o_rFontScale = -aLogFont.lfHeight / float(MAXFONTHEIGHT);
-aLogFont.lfHeight = -MAXFONTHEIGHT;
-aLogFont.lfWidth = FRound( aLogFont.lfWidth / o_rFontScale );
-}
-else // #i95867# also limit font widths
-{
-o_rFontScale = +aLogFont.lfWidth / float(MAXFONTHEIGHT);
-aLogFont.lfWidth = +MAXFONTHEIGHT;
-aLogFont.lfHeight = FRound( aLogFont.lfHeight / o_rFontScale );
-}
hNewFont = ::CreateFontIndirectW( &aLogFont );
HDC hdcScreen = nullptr;
@@ -1579,9 +1557,8 @@ bool WinSalGraphics::CreateFontSubset( const OUString&
rToFile,
// TODO: much better solution: move SetFont and restoration of old font to
caller
ScopedFont aOldFont(*this);
-float fScale = 1.0;
HFONT hOldFont = nullptr;
-ImplDoSetFont(aIFSD, pFont, fScale, hOldFont);
+ImplDoSetFont(aIFSD, pFont, hOldFont);
WinFontFace const * pWinFontData = static_cast(pFont);
@@ -1645,9 +1622,8 @@ const void* WinSalGraphics::GetEmbedFontData(const
PhysicalFontFace* pFont, long
ScopedFont aOldFont(*this);
-float fScale = 0.0;
HFONT hOldFont = nullptr;
-ImplDoSetFont(aIFSD, pFont, fScale, hOldFont);
+ImplDoSetFont(aIFSD, pFont, hOldFont);
// get the raw font file data
RawFontData aRawFontData( getHDC() );
@@ -1676,9 +1652,8 @@ void WinSalGraphics::GetGlyphWidths( const
PhysicalFontFace* pFont,
// TODO: much better solution: move SetFont and restoration of old font to
caller
ScopedFont aOldFont(*this);
-float fScale = 0.0;
HFONT hOldFont = nullptr;
-ImplDoSetFont(aIFSD, pFont, fScale, hOldFont);
+ImplDoSetFont(aIFSD, pFont, hOldFont);
// get raw font file data
const RawFontData xRawFontData( getHDC() );
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 3438e3b79deb..feda998d5759 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -448,7 +448,7 @@ void WinFontInstance::SetGraphics(WinSalGraphics *pGraphics)
if (m_hFont)
return;
HFONT hOrigFont;
-m_hFont = m_pGraphics->ImplDoSetFont(GetFontSelectPattern(),
GetFontFace(), m_fScale, hOrigFont);
+m_hFont = m_pGraphics->ImplDoSetFont(GetFontSelectPattern(),
GetFontFace(), hOrigFont);
SelectObject(m_pGraphics->getHDC(), hOrigFont);
}
___
Libreoffice-commits m
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/ww8export3.cxx |5 +
sw/source/filter/ww8/wrtww8.cxx |6 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 1086654d6e8cc22f1f99195668db3f305437e570
Author: Justin Luth
AuthorDate: Mon Sep 28 20:21:52 2020 +0300
Commit: Justin Luth
CommitDate: Mon Oct 19 12:40:10 2020 +0200
tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
This is a partial revert of LO 6.2
commit 2ec0cf500222aef55d02df80154b47fbb92970c9
I can't think of any excuse for how I possibly missed that
xDocProps was being defined/used outside of this clause.
Just plain stupid and blind.
The good news is that the create and modified date still
seem to be getting saved somehow/somewhere. So it isn't
the disaster that it looks like it could have been.
Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index b5a9d336cf74..380463e96f2f 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -62,6 +63,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection,
"tdf37778_readonlySection.d
// tdf#127862: page fill color (in this case white) was lost
uno::Reference
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
CPPUNIT_ASSERT(drawing::FillStyle_NONE !=
getProperty(xStyle, "FillStyle"));
+
+// tdf#136983
+uno::Reference xDPS(mxComponent,
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009),
xDPS->getDocumentProperties()->getPrintDate().Year);
}
DECLARE_WW8EXPORT_TEST(testTdf104596_wrapInHeaderTable,
"tdf104596_wrapInHeaderTable.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 90152ceca99c..f853af98aa83 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -496,7 +496,11 @@ static void WriteDop( WW8Export& rWrt )
uno::Reference xProps;
if ( pDocShell )
{
-xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference xModelComp = pDocShell->GetModel();
+xProps.set(xModelComp, uno::UNO_QUERY);
+uno::Reference xDPS(xModelComp,
uno::UNO_QUERY_THROW);
+xDocProps = xDPS->getDocumentProperties();
+OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools tools/inc tools/qa tools/source
include/tools/bigint.hxx|5
include/tools/fract.hxx |3
include/tools/gen.hxx | 203 ++--
include/tools/helpers.hxx | 13 +-
include/tools/long.hxx | 33 +
include/tools/poly.hxx |6 -
include/tools/stream.hxx|3
include/tools/svborder.hxx | 21 +--
include/tools/zcodec.hxx|9 -
tools/inc/poly.h|2
tools/qa/cppunit/test_minmax.cxx|8 -
tools/qa/cppunit/test_rectangle.cxx | 24 ++--
tools/source/generic/color.cxx | 13 +-
tools/source/generic/gen.cxx| 32 ++---
tools/source/generic/point.cxx | 22 +--
tools/source/generic/poly.cxx | 64 +--
tools/source/generic/poly2.cxx |4
tools/source/stream/stream.cxx | 15 +-
tools/source/zcodec/zcodec.cxx | 19 +--
19 files changed, 271 insertions(+), 228 deletions(-)
New commits:
commit 2646023729dd16c1a613fac7e8e6a37828d7a404
Author: Noel
AuthorDate: Mon Oct 19 10:44:14 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 19 12:56:30 2020 +0200
add tools::Long typedef and use it in tools
first step to switching long to a 64-bit type on 64-bit windows
Change-Id: I640d807426dfe713c7a8984ef560575f8288dbeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104516
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index 66ce1dd3b1b8..f80d64fe87c3 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -21,6 +21,7 @@
#include
#include
+#include
#define MAX_DIGITS 8
@@ -88,7 +89,7 @@ public:
operatorsal_uInt32() const;
operatordouble() const;
#if SAL_TYPES_SIZEOFLONG == 8
-operatorlong() const;
+operatortools::Long() const;
#endif
boolIsSet() const { return bIsSet; }
@@ -156,7 +157,7 @@ inline BigInt::operator sal_uInt32() const
}
#if SAL_TYPES_SIZEOFLONG == 8
-inline BigInt::operator long() const
+inline BigInt::operator tools::Long() const
{
// Clamp to int32 since long is int32 on Windows.
if (!bIsBig)
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 7caf9c6a93f5..79f5b525aed4 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -21,6 +21,7 @@
#include
#include
+#include
#include
#include
@@ -53,7 +54,7 @@ public:
explicit operator sal_Int32() const;
#if SAL_TYPES_SIZEOFLONG == 8
-explicit operator long() const { return sal_Int32(*this); }
+explicit operator ::tools::Long() const { return sal_Int32(*this); }
#endif
explicit operator double() const;
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 4f6927c62f0b..b357d2198de1 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -21,6 +21,7 @@
#include
+#include
#include
#include
#include
@@ -40,19 +41,19 @@ class SAL_WARN_UNUSED Pair
{
public:
Pair() : nA(0), nB(0) {}
-Pair( long _nA, long _nB ) : nA(_nA), nB(_nB) {}
+Pair( tools::Long _nA, tools::Long _nB ) : nA(_nA),
nB(_nB) {}
-longA() const { return nA; }
-longB() const { return nB; }
+tools::LongA() const { return nA; }
+tools::LongB() const { return nB; }
-long& A() { return nA; }
-long& B() { return nB; }
+tools::Long& A() { return nA; }
+tools::Long& B() { return nB; }
TOOLS_DLLPUBLIC rtl::OStringtoString() const;
protected:
-longnA;
-longnB;
+tools::LongnA;
+tools::LongnB;
};
namespace tools::detail {
@@ -72,33 +73,33 @@ class SAL_WARN_UNUSED
UNLESS_MERGELIBS(SAL_DLLPUBLIC_EXPORT) Point final : prote
{
public:
Point() {}
-Point( long nX, long nY ) : Pair( nX, nY ) {}
+Point( tools::Long nX, tools::Long nY ) : Pair( nX, nY
) {}
-longX() const { return nA; }
-longY() const { return nB; }
+tools::LongX() const { return nA; }
+tools::LongY() const { return nB; }
-voidMove( long nHorzMove, long nVertMove );
+voidMove( tools::Long nHorzMove, tools::Long nVertMove );
voidMove( Size const & s );
-longAdjustX( long nHorzMove ) { nA += nHorzMove; return
nA; }
-longAdjustY( long nVertMove ) { nB += nVertMove; return
nB; }
+tools::LongAdjustX( tools::Long nHorzMove ) { nA +=
nHorzMove; return nA; }
+tools::LongAdjustY( tools::Long nVertMove ) { nB +=
[Libreoffice-commits] core.git: chart2/source sw/qa
chart2/source/view/charttypes/PieChart.cxx | 117 +++
chart2/source/view/charttypes/PieChart.hxx |2
sw/qa/extras/layout/data/piechart_leaderline.odt |binary
sw/qa/extras/layout/layout2.cxx | 15 ++
4 files changed, 94 insertions(+), 40 deletions(-)
New commits:
commit 657ea0d1250624312e104f9acfb6a04a3ba4cce3
Author: Tünde Tóth
AuthorDate: Fri Oct 16 08:57:53 2020 +0200
Commit: László Németh
CommitDate: Mon Oct 19 13:00:50 2020 +0200
tdf#134121 pie chart: add leader lines
to data labels with custom position.
See commit 769433ad93040bc81f06672c8a2c01e2b76fece3
(tdf#90749 chart: add leader lines to custom data label positions)
Change-Id: If5d912cc04993e59bd5ab93b644ea49ba8642b49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104410
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 55eb67037b9a..9b7279599f8b 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -102,6 +102,29 @@ struct PieChart::ShapeParam
mfDepth(0.0) {}
};
+namespace
+{
+::basegfx::B2IRectangle lcl_getRect(const uno::Reference&
xShape)
+{
+::basegfx::B2IRectangle aRect;
+if (xShape.is())
+aRect = BaseGFXHelper::makeRectangle(xShape->getPosition(),
xShape->getSize());
+return aRect;
+}
+
+bool lcl_isInsidePage(const awt::Point& rPos, const awt::Size& rSize, const
awt::Size& rPageSize)
+{
+if (rPos.X < 0 || rPos.Y < 0)
+return false;
+if ((rPos.X + rSize.Width) > rPageSize.Width)
+return false;
+if ((rPos.Y + rSize.Height) > rPageSize.Height)
+return false;
+return true;
+}
+
+} //end anonymous namespace
+
class PiePositionHelper : public PolarPlottingPositionHelper
{
public:
@@ -349,17 +372,22 @@ void PieChart::createTextLabelShape(
aOuterCirclePoint.Y - aPieLabelInfo.aOrigin.getY() );
double fSquaredPieRadius = aRadiusVector.scalar(aRadiusVector);
double fPieRadius = sqrt( fSquaredPieRadius );
+double fAngleDegree
+= rParam.mfUnitCircleStartAngleDegree +
rParam.mfUnitCircleWidthAngleDegree / 2.0;
+while (fAngleDegree > 360.0)
+fAngleDegree -= 360.0;
+while (fAngleDegree < 0.0)
+fAngleDegree += 360.0;
+
+awt::Point aOuterPosition =
PlottingPositionHelper::transformSceneToScreenPosition(
+m_pPosHelper->transformUnitCircleToScene(fAngleDegree,
rParam.mfUnitCircleOuterRadius, 0),
+m_xLogicTarget, m_pShapeFactory, m_nDimension);
+aPieLabelInfo.aOuterPosition = basegfx::B2IVector(aOuterPosition.X,
aOuterPosition.Y);
// set the maximum text width to be used when text wrapping is enabled
double fTextMaximumFrameWidth = 0.8 * fPieRadius;
if( nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE &&
m_aAvailableOuterRect.getWidth() )
{
-double fAngleDegree = rParam.mfUnitCircleStartAngleDegree +
rParam.mfUnitCircleWidthAngleDegree / 2.0;
-while (fAngleDegree > 360.0)
-fAngleDegree -= 360.0;
-while (fAngleDegree < 0.0)
-fAngleDegree += 360.0;
-
if (fAngleDegree < 67.5 || fAngleDegree >= 292.5)
fTextMaximumFrameWidth = m_aAvailableOuterRect.getMaxX() -
aPieLabelInfo.aFirstPosition.getX();
else if (fAngleDegree < 112.5 || fAngleDegree >= 247.5)
@@ -396,13 +424,6 @@ void PieChart::createTextLabelShape(
{
if (m_aAvailableOuterRect.getWidth())
{
-double fAngleDegree = rParam.mfUnitCircleStartAngleDegree
- + rParam.mfUnitCircleWidthAngleDegree /
2.0;
-while (fAngleDegree > 360.0)
-fAngleDegree -= 360.0;
-while (fAngleDegree < 0.0)
-fAngleDegree += 360.0;
-
if (fAngleDegree < 67.5 || fAngleDegree >= 292.5)
fTextMaximumFrameWidth
= 0.8
@@ -451,10 +472,50 @@ void PieChart::createTextLabelShape(
}
}
+bool bShowLeaderLine = rSeries.getPropertiesOfSeries()
+
->getPropertyValue("ShowCustomLeaderLines")
+.get();
+if (m_bPieLabelsAllowToMove && rSeries.isLabelCustomPos(nPointIndex) &&
bShowLeaderLine)
+{
+sal_Int32 nX1 = aPieLabelInfo.aOuterPosition.getX();
+sal_Int32 nY1 = aPieLabelInfo.aOuterPosition.getY();
+sal_Int32 nX2 = nX1;
+sal_Int32 nY2 = nY1;
+::basegfx::B2IRectangle
aRect(lcl_getRect(aPieLabelInfo.xLabelGroupShape));
+if (nX1 < aRect.getMinX())
+nX2 = aRect.getMinX();
+else if (nX1 > aRect.getMaxX())
+nX2 = aRect.getMaxX();
+
+if (nY1 < aRect.getMinY())
+nY2 = aRect.getMinY()
[Libreoffice-commits] core.git: compilerplugins/clang officecfg/registry svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
compilerplugins/clang/unusedfields.writeonly.results | 14 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 34 - svx/Library_svx.mk |3 svx/UIConfig_svx.mk |3 svx/source/sidebar/PanelFactory.cxx | 11 svx/source/sidebar/effect/EffectPropertyPanel.cxx| 87 ++- svx/source/sidebar/effect/EffectPropertyPanel.hxx| 23 - svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx| 96 svx/source/sidebar/softedge/SoftEdgePropertyPanel.hxx| 56 -- svx/uiconfig/ui/sidebareffect.ui | 240 +++ svx/uiconfig/ui/sidebarglow.ui | 141 -- svx/uiconfig/ui/sidebarsoftedge.ui | 83 --- 12 files changed, 327 insertions(+), 464 deletions(-) New commits: commit 55281fe6d3cda23d37b0b0c368786c9fc4c5abe9 Author: andreas kainz AuthorDate: Fri Oct 2 13:24:17 2020 +0200 Commit: Andreas Kainz CommitDate: Mon Oct 19 13:06:01 2020 +0200 tdf#136073 combine glow and softedge sidebar section Change-Id: I19381009f5b286b051ae0cb90a794ed51a413a7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103835 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index aa90dcb507b2..5860beec983e 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -770,12 +770,12 @@ svx/source/sdr/attribute/sdrtextattribute.cxx:49 drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32 svx/source/sdr/attribute/sdrtextattribute.cxx:63 drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell _Bool -svx/source/sidebar/glow/GlowPropertyPanel.hxx:40 -svx::sidebar::GlowPropertyPanel maGlowColorController sfx2::sidebar::ControllerItem -svx/source/sidebar/glow/GlowPropertyPanel.hxx:41 +svx/source/sidebar/effect/EffectPropertyPanel.hxx:40 +svx::sidebar::EffectPropertyPanel maGlowColorController sfx2::sidebar::ControllerItem +svx/source/sidebar/effect/EffectPropertyPanel.hxx:41 svx::sidebar::GlowPropertyPanel maGlowRadiusController sfx2::sidebar::ControllerItem -svx/source/sidebar/glow/GlowPropertyPanel.hxx:42 -svx::sidebar::GlowPropertyPanel maGlowTransparencyController sfx2::sidebar::ControllerItem +svx/source/sidebar/effect/EffectPropertyPanel.hxx:42 +svx::sidebar::EffectPropertyPanel maGlowTransparencyController sfx2::sidebar::ControllerItem svx/source/sidebar/line/LinePropertyPanel.hxx:83 svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem svx/source/sidebar/line/LinePropertyPanel.hxx:84 @@ -816,8 +816,8 @@ svx/source/sidebar/possize/PosSizePropertyPanel.hxx:117 svx::sidebar::PosSizePropertyPanel mxAlignDispatch std::unique_ptr svx/source/sidebar/possize/PosSizePropertyPanel.hxx:119 svx::sidebar::PosSizePropertyPanel mxAlignDispatch2 std::unique_ptr -svx/source/sidebar/softedge/SoftEdgePropertyPanel.hxx:41 -svx::sidebar::SoftEdgePropertyPanel maSoftEdgeRadiusController sfx2::sidebar::ControllerItem +svx/source/sidebar/effect/EffectPropertyPanel.hxx:41 +svx::sidebar::EffectPropertyPanel maSoftEdgeRadiusController sfx2::sidebar::ControllerItem svx/source/sidebar/styles/StylesPropertyPanel.hxx:13 svx::sidebar::StylesPropertyPanel m_xFontStyleDispatch std::unique_ptr svx/source/sidebar/styles/StylesPropertyPanel.hxx:16 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 7deb82a87d4b..75a3a07eb1e3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -589,12 +589,12 @@ - + - Glow + Effect - GlowPropertyPanel + EffectPropertyPanel PropertyDeck @@ -608,33 +608,7 @@ - private:resource/toolpanel/SvxPanelFactory/GlowPropertyPanel - - - 300 - - - - - - Soft Edge - - - SoftEdgePropertyPanel - - - PropertyDeck - - - -Calc, Draw, hidden ; -DrawImpress,Draw, hidden ; -DrawImpress,Graphic,hidden ; -WriterVariants, Draw, hidden ; - - - - private:resource/toolpanel/SvxPanelFactory/SoftEdgePropertyPanel + private:resource/toolpanel/SvxPanelFactory/EffectPropertyPanel 300 diff --git a/svx/Library_svx.mk b/
Re: Optimization thought, concurrent importing of slides
Hi,
On 19.10.2020 6:32, 方振华(601661) wrote:
Our two competitors MS Office/WPS do not have the problem of scaling.
Opening a document with 100 slides makes little percetible difference
from opening a PPT of one single slide. We take a look at the code, and
we think, maybe, instead of importing the document slide by slide, would
it be possible to import all the slides at once with multiple threads?
Has anyone made such attemp? What stops us from using concurrent processing?
Looks like this is what
https://git.libreoffice.org/core/+/8062e88e73acd8d1f9a62b0bd519b499693285e3
recently did for ODF case, it seems?
Here are the code snippet, in oox/source/ppt/presentationfragmenthandler.cxx
void PresentationFragmentHandler::finalizeImport()
{
...
int nPagesImported = 0;
for (sal_Int32 elem : aRangeEnumerator)
{
if ( rxStatusIndicator.is() )
rxStatusIndicator->setValue((nPagesImported *
1) / aRangeEnumerator.size());
importSlide(elem, !nPagesImported, bImportNotesPages);
nPagesImported++;
}
...
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Optimization thought, concurrent importing of slides
The trick is to make sure that the relevant chunk of import code is
thread-safe, which can be quite hard.
I strongly suspect that the reason that MS-Office is fast, is that it only
parses the pages on demand, instead
of all at once.
On 2020/10/19 1:16 pm, Mike Kaganski wrote:
Hi,
On 19.10.2020 6:32, 方振华(601661) wrote:
Our two competitors MS Office/WPS do not have the problem of scaling. Opening a document with 100 slides makes little
percetible difference from opening a PPT of one single slide. We take a look at the code, and we think, maybe, instead
of importing the document slide by slide, would it be possible to import all the slides at once with multiple threads?
Has anyone made such attemp? What stops us from using concurrent processing?
Looks like this is what https://git.libreoffice.org/core/+/8062e88e73acd8d1f9a62b0bd519b499693285e3 recently did for ODF
case, it seems?
Here are the code snippet, in oox/source/ppt/presentationfragmenthandler.cxx
void PresentationFragmentHandler::finalizeImport()
{
...
int nPagesImported = 0;
for (sal_Int32 elem : aRangeEnumerator)
{
if ( rxStatusIndicator.is() )
rxStatusIndicator->setValue((nPagesImported * 1) /
aRangeEnumerator.size());
importSlide(elem, !nPagesImported, bImportNotesPages);
nPagesImported++;
}
...
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Optimization thought, concurrent importing of slides
On Monday 19 of October 2020, Mike Kaganski wrote: > Hi, > > On 19.10.2020 6:32, 方振华(601661) wrote: > > Our two competitors MS Office/WPS do not have the problem of scaling. > > Opening a document with 100 slides makes little percetible difference > > from opening a PPT of one single slide. We take a look at the code, and > > we think, maybe, instead of importing the document slide by slide, would > > it be possible to import all the slides at once with multiple threads? > > > > Has anyone made such attemp? What stops us from using concurrent > > processing? Thread-safety of the relevant code (the lack of, that is). You can try to improve that, but it's a question of how hard that would be. But first of all, if you want to improve anything related to performance, the first step should be to actually profile it, so that you know instead of guess. > Looks like this is what > https://git.libreoffice.org/core/+/8062e88e73acd8d1f9a62b0bd519b499693285e3 > recently did for ODF case, it seems? That commit is only for loading images, not whole documents (i.e. it helps somewhat, but not that much). -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/treelist/treelistbox.cxx | 23 +++
1 file changed, 23 insertions(+)
New commits:
commit 2471d6f44c7e8ecbe86a90eeb593b899a08a7408
Author: Attila Szűcs
AuthorDate: Fri Oct 16 09:54:14 2020 +0200
Commit: László Németh
CommitDate: Mon Oct 19 13:44:06 2020 +0200
tdf#116675 vcl tree list: toggle by label click (e.g. in AutoFilter)
Checkboxes in a tree list could be toggled only by clicking
on them, but not on the associated labels, despite UX guidelines
and interoperability requirements especially for AutoFilter usage
in the spreadsheet.
Note: Implemented only for generic VCL plugin. Testing on Linux:
SAL_USE_VCLPLUGIN=gen instdir/program/soffice
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: Ibc3d42271a1be53a54e11dedf4ab3ab506d680cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104414
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/vcl/source/treelist/treelistbox.cxx
b/vcl/source/treelist/treelistbox.cxx
index b3f9506f5839..52243ccf95e6 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -2288,6 +2288,29 @@ void SvTreeListBox::MouseButtonDown( const MouseEvent&
rMEvt )
void SvTreeListBox::MouseButtonUp( const MouseEvent& rMEvt )
{
+// tdf#116675 clicking on an entry should toggle its checkbox
+if (rMEvt.IsLeft() && (nTreeFlags & SvTreeFlags::CHKBTN))
+{
+const Point aPnt = rMEvt.GetPosPixel();
+SvTreeListEntry* pEntry = GetEntry(aPnt);
+if (pEntry && pEntry->m_Items.size() > 0)
+{
+SvLBoxItem* pItem = GetItem(pEntry, aPnt.X());
+// if the checkbox button was clicked, that will be toggled later,
do not toggle here
+// anyway users probably don't want to toggle the checkbox by
clickink on another button
+if (!pItem || pItem->GetType() != SvLBoxItemType::Button)
+{
+SvLBoxButton* pItemCheckBox
+=
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
+if (pItemCheckBox)
+{
+pItemCheckBox->ClickHdl(pEntry);
+InvalidateEntry(pEntry);
+}
+}
+}
+}
+
pImpl->MouseButtonUp( rMEvt );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl svl/source svl/unx
include/svl/imageitm.hxx |4 ++--
include/svl/metitem.hxx |2 +-
include/svl/poolitem.hxx |3 ++-
include/svl/svdde.hxx | 21 +++--
svl/source/crypto/cryptosign.cxx |2 +-
svl/source/items/imageitm.cxx |6 +++---
svl/source/items/intitem.cxx |2 +-
svl/source/items/poolitem.cxx |2 +-
svl/source/numbers/zformat.cxx| 11 ++-
svl/source/undo/undo.cxx |3 ++-
svl/unx/source/svdde/ddedummy.cxx | 17 +
11 files changed, 39 insertions(+), 34 deletions(-)
New commits:
commit 73b115b1a399f57efd727eb71d7ef9e4a27afbc9
Author: Noel
AuthorDate: Mon Oct 19 10:46:18 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 19 13:52:32 2020 +0200
use tools::Long in svl
Change-Id: Ic63d3c0ebd1e58d7bab5b0fd6313cabddc16eb98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104517
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index ccecc5356637..c135216cc482 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -39,8 +39,8 @@ public:
virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-voidSetRotation( long nValue );
-longGetRotation() const;
+voidSetRotation( tools::Long nValue );
+tools::LongGetRotation() const;
voidSetMirrored( bool bSet );
boolIsMirrored() const;
};
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index be5b1b7ba497..9d64d6bdd34f 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -27,7 +27,7 @@ class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
public:
explicit SfxMetricItem( sal_uInt16 nWhich, sal_uInt32
nValue );
-virtual void ScaleMetrics( long lMult, long lDiv ) override;
+virtual void ScaleMetrics( tools::Long lMult, tools::Long lDiv
) override;
virtual bool HasMetrics() const override;
};
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index f1bb0cfab4d3..ce4ebeaef679 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
class IntlWrapper;
@@ -164,7 +165,7 @@ public:
OUString &rText,
const IntlWrapper& rIntlWrapper ) const;
-virtual void ScaleMetrics( long lMult, long lDiv );
+virtual void ScaleMetrics( tools::Long lMult, tools::Long lDiv
);
virtual bool HasMetrics() const;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const;
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index c0d5975e84c7..eecd48d72e91 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
@@ -56,14 +57,14 @@ class SVL_DLLPUBLIC DdeData
public:
DdeData();
-DdeData(SAL_UNUSED_PARAMETER const void*,
SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId =
SotClipboardFormatId::STRING);
+DdeData(SAL_UNUSED_PARAMETER const void*,
SAL_UNUSED_PARAMETER tools::Long, SAL_UNUSED_PARAMETER SotClipboardFormatId =
SotClipboardFormatId::STRING);
DdeData(SAL_UNUSED_PARAMETER const OUString&);
DdeData(const DdeData&);
DdeData(DdeData&&) noexcept;
~DdeData();
void const *getData() const;
-longgetSize() const;
+tools::LonggetSize() const;
SotClipboardFormatId GetFormat() const;
@@ -91,7 +92,7 @@ protected:
Link aDone;
boolbBusy;
-DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const
OUString&, SAL_UNUSED_PARAMETER long = 0 );
+DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const
OUString&, SAL_UNUSED_PARAMETER tools::Long = 0 );
public:
virtual~DdeTransaction();
@@ -110,7 +111,7 @@ public:
void SetFormat( SotClipboardFormatId nFmt ) {
aDdeData.SetFormat( nFmt ); }
SotClipboardFormatId GetFormat() const { return
aDdeData.GetFormat(); }
-longGetError() const;
+tools::LongGetError() const;
private:
friend classDdeInternal;
@@ -127,7 +128,7 @@ class SVL_DLLPUBLIC DdeLink : public DdeTransaction
Link aNotify;
public:
-DdeLink( DdeConnection&, const OUString&, long = 0 );
+
[Libreoffice-commits] core.git: chart2/qa xmloff/source
chart2/qa/extras/chart2export.cxx| 22 +-
xmloff/source/chart/SchXMLExport.cxx | 12
2 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit f1d798151048dde3f48b124ef406416668d1e9c5
Author: Tünde Tóth
AuthorDate: Fri Oct 16 13:41:28 2020 +0200
Commit: László Németh
CommitDate: Mon Oct 19 14:19:34 2020 +0200
tdf#137585 Chart ODF: fix export of DataLabelPlacement::CUSTOM
Saving .ods, the DataLabelPlacement::CUSTOM converted to
the default "avoid-overlap" instead of the requested "outside".
Follow-up of commit 20da1a5dd37c7edac620566c992d5a53b23a5f12
(tdf#134978 Chart OOXML Import: fix pie chart label custom position)
Change-Id: Ib15c7f24e0a650c84e6afce08b84e7eece8dafea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104430
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index e9d154d4ade1..d86fa14ef84c 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -180,6 +180,7 @@ public:
void testTdf134977();
void testTdf123647();
void testTdf136267();
+void testDataLabelPlacementPieChart();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -322,6 +323,7 @@ public:
CPPUNIT_TEST(testTdf134977);
CPPUNIT_TEST(testTdf123647);
CPPUNIT_TEST(testTdf136267);
+CPPUNIT_TEST(testDataLabelPlacementPieChart);
CPPUNIT_TEST_SUITE_END();
@@ -1432,7 +1434,7 @@ void Chart2ExportTest::testPieChartDataLabels()
load("/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open
XML Text");
CPPUNIT_ASSERT(pXmlDoc);
-assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos",
"val", "bestFit");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos",
"val", "outEnd");
}
void Chart2ExportTest::testSeriesIdxOrder()
@@ -2949,6 +2951,24 @@ void Chart2ExportTest::testTdf136267()
assertXPathContent(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:strCache/c:pt/c:v",
"John");
}
+void Chart2ExportTest::testDataLabelPlacementPieChart()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+reload("calc8");
+uno::Reference xChartDoc(getChartCompFromSheet(0,
mxComponent),
+ UNO_QUERY_THROW);
+// test the placement of the manually positioned label
+Reference
+
xDataPointPropSet(xChartDoc->getDiagram()->getDataPointProperties(2, 0),
+ uno::UNO_SET_THROW);
+uno::Any aAny = xDataPointPropSet->getPropertyValue("LabelPlacement");
+CPPUNIT_ASSERT(aAny.hasValue());
+sal_Int32 nLabelPlacement = 0;
+CPPUNIT_ASSERT(aAny >>= nLabelPlacement);
+CPPUNIT_ASSERT_EQUAL(chart::DataLabelPlacement::OUTSIDE, nLabelPlacement);
+
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index 07a1019ccc71..723c07fe15c4 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3407,6 +3408,17 @@ void SchXMLExportHelper_Impl::exportDataPoints(
mxExpPropMapper);
}
+if (nCurrentODFVersion & SvtSaveOptions::ODFSVER_EXTENDED)
+{
+sal_Int32 nPlacement = 0;
+xPropSet->getPropertyValue("LabelPlacement") >>=
nPlacement;
+if (nPlacement == chart::DataLabelPlacement::CUSTOM)
+{
+xPropSet->setPropertyValue("LabelPlacement",
+
uno::Any(chart::DataLabelPlacement::OUTSIDE));
+}
+}
+
aPropertyStates = mxExpPropMapper->Filter(xPropSet);
if (!aPropertyStates.empty() ||
!aDataLabelPropertyStates.empty())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 7 commits - configure.ac download.lst external/nss include/sfx2 include/vcl vcl/Library_vcl.mk vcl/qa vcl/source xmlsecurity/Library_
Rebased ref, commits from common ancestor:
commit f9f820e2400a8aa4d27169bd9a7b5b95ca3a9791
Author: Samuel Mehrbrodt
AuthorDate: Mon Oct 19 10:20:20 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Oct 19 10:20:20 2020 +0200
Release 6.3.6.7
Change-Id: Iea58b785d62006d0f1ee2e21c110acc402d499f7
diff --git a/configure.ac b/configure.ac
index f84c7b3fcbd2..8b9786155e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.3.6.6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.7],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 91cb51348d186ed3e5b5443a6bf49fd3e1af54bc
Author: Michael Stahl
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Oct 19 10:03:11 2020 +0200
nss: upgrade to release 3.55.0
Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)
* external/nss/nss.nspr-parallel-win-debug_build.patch:
remove, merged upstream
Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara
(cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f)
diff --git a/download.lst b/download.lst
index 378213dc851b..00f73f95375b 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM :=
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
export ODFGEN_VERSION_MICRO := 6
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..1cad5852fa89 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.pdb.patch \
external/nss/nss.bzmozilla1238154.patch \
external/nss/macos-dlopen.patch.0 \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
$(if $(filter iOS,$(OS)), \
external/nss/nss-ios.patch) \
$(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/macos-dlopen.patch.0
b/external/nss/macos-dlopen.patch.0
index 8c484e4c6841..1889b8df7cd3 100644
--- a/external/nss/macos-dlopen.patch.0
+++ b/external/nss/macos-dlopen.patch.0
@@ -1,14 +1,14 @@
--- nspr/pr/src/linking/prlink.c
+++ nspr/pr/src/linking/prlink.c
-@@ -793,7 +793,7 @@
- /* ensure the file exists if it contains a slash character i.e. path
*/
- /* DARWIN's dlopen ignores the provided path and checks for the */
- /* plain filename in DYLD_LIBRARY_PATH */
--if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-+if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name,
"@loader_path/", 13) == 0 ||
- PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
- h = dlopen(name, dl_flags);
- }
+@@ -799,7 +799,7 @@
+ * The reason is that DARWIN's dlopen ignores the provided path
+ * and checks for the plain filename in DYLD_LIBRARY_PATH,
+ * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name,
"@loader_path/", 13) == 0) {
+ /* no slash, allow to load from any location */
+ okToLoad = PR_TRUE;
+ } else {
--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+++ nss/lib/libpkix/pkix_pl_nss/module/pkix
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa sw/source
sw/qa/extras/ww8export/ww8export3.cxx |5 +
sw/source/filter/ww8/wrtww8.cxx |6 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547
Author: Justin Luth
AuthorDate: Mon Sep 28 20:21:52 2020 +0300
Commit: Miklos Vajna
CommitDate: Mon Oct 19 17:19:11 2020 +0200
tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
This is a partial revert of LO 6.2
commit 2ec0cf500222aef55d02df80154b47fbb92970c9
I can't think of any excuse for how I possibly missed that
xDocProps was being defined/used outside of this clause.
Just plain stupid and blind.
The good news is that the create and modified date still
seem to be getting saved somehow/somewhere. So it isn't
the disaster that it looks like it could have been.
Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index c88c23dbc581..a663a034074b 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -51,6 +52,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection,
"tdf37778_readonlySection.d
// tdf#127862: page fill color (in this case white) was lost
uno::Reference
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
CPPUNIT_ASSERT(drawing::FillStyle_NONE !=
getProperty(xStyle, "FillStyle"));
+
+// tdf#136983
+uno::Reference xDPS(mxComponent,
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009),
xDPS->getDocumentProperties()->getPrintDate().Year);
}
DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9b5980f3e5e1..b3e71ba0f747 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -497,7 +497,11 @@ static void WriteDop( WW8Export& rWrt )
uno::Reference xProps;
if ( pDocShell )
{
-xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference xModelComp = pDocShell->GetModel();
+xProps.set(xModelComp, uno::UNO_QUERY);
+uno::Reference xDPS(xModelComp,
uno::UNO_QUERY_THROW);
+xDocProps = xDPS->getDocumentProperties();
+OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/printoptionspage.ui |5 + 1 file changed, 5 insertions(+) New commits: commit 42404bf5763b24bcab0a1f0d79f7c65f4ac64d48 Author: Seth Chaiklin AuthorDate: Mon Oct 19 11:10:40 2020 +0200 Commit: Seth Chaiklin CommitDate: Mon Oct 19 17:56:49 2020 +0200 tdf#137495 add "tooltip" to "Fax" label in Options - Writer - Print Change-Id: I3c9b97956d4d0920f74bf5be967cabaefbc6dcf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104494 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index f6c7d2a15a8c..f9b529e2b067 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -470,6 +470,11 @@ _Fax: True fax + + +If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine. + + 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools
include/unotools/accessiblestatesethelper.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 73933ed0a207f1cf210cc4a7d329755bd885f871 Author: Arnaud Versini AuthorDate: Mon Oct 19 13:48:40 2020 +0200 Commit: Arnaud Versini CommitDate: Mon Oct 19 18:55:57 2020 +0200 UNOTOOLS : remove unused include since 54cbe9458033f50d9f608b1462d65e8514cbb636 Change-Id: I48ffb5454727518217dcfa60a34ece6f459341f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104521 Tested-by: Jenkins Reviewed-by: Arnaud Versini diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 140375503fb1..b772a54af603 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -24,7 +24,6 @@ #include #include #include -#include //= XAccessibleStateSet helper classes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk|1 source/text/shared/02/0707.xhp| 12 +++--- source/text/swriter/01/edit_reference_submenu.xhp | 39 ++ source/text/swriter/main0102.xhp | 32 +++--- 4 files changed, 59 insertions(+), 25 deletions(-) New commits: commit 7f0ff496eadf2fcb9bdbf698637cfb66261ea3fd Author: Seth Chaiklin AuthorDate: Mon Oct 19 18:17:02 2020 +0200 Commit: Seth Chaiklin CommitDate: Mon Oct 19 20:34:23 2020 +0200 Resolves: 02 edit menu in tdf#137084 - update edit menu in Writer - move "Direct Cursor Mode" to current position in Edit menu - add Comment label and description - update label to "Links to External Files" - remove "Footnote or Endnote", "Index Entry" and "Bibliography Entry" to "Reference" submenu - make new submenu page, embedded as "Reference" - add "access" command for "Reference" in edit_menu.xhp - add keyboard shortcut for "Go to Page" - update "Go to Page", because no longer to Navigator - update "Edit File" (/shared/02/07070.xhp) to "Edit Mode" - update to ,, Change-Id: I34e8f74b8d43e2875e40b24cc0d93eecdc2b2ad0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104498 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 54c0fc79f..ce3925d09 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -175,6 +175,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/0621 \ helpcontent2/source/text/swriter/01/0622 \ helpcontent2/source/text/swriter/01/0699 \ +helpcontent2/source/text/swriter/01/edit_reference_submenu \ helpcontent2/source/text/swriter/01/format_object \ helpcontent2/source/text/swriter/01/legacynumbering \ helpcontent2/source/text/swriter/01/mailmerge00 \ diff --git a/source/text/shared/02/0707.xhp b/source/text/shared/02/0707.xhp index 158d18957..28f95e1d2 100644 --- a/source/text/shared/02/0707.xhp +++ b/source/text/shared/02/0707.xhp @@ -35,20 +35,20 @@ read-only documents; editing cursor;in read-only text read-only documents;cursor -Edit File icon +Edit Mode icon mw inserted "Edit File icon" entry -Edit File -Enables you to edit a read-only document or database table. Use the Edit File icon to activate or deactivate the edit mode. +Edit Mode +Enables you to edit a read-only document or database table. Use the Edit Mode icon to activate or deactivate the edit mode. - Icon + Edit Mode Icon - Edit File + Edit Mode @@ -56,7 +56,7 @@ -You can enable a selection cursor in a read-only text document or in the Help. Choose Edit - Select Text or open the context menu of a read-only document and choose Select Text. The selection cursor does not blink. +You can enable a selection cursor in a read-only text document or in the Help. Choose Edit - Select Text or open the context menu of a read-only document and choose Select Text. The selection cursor does not blink. diff --git a/source/text/swriter/01/edit_reference_submenu.xhp b/source/text/swriter/01/edit_reference_submenu.xhp new file mode 100644 index 0..9dfe3fa5f --- /dev/null +++ b/source/text/swriter/01/edit_reference_submenu.xhp @@ -0,0 +1,39 @@ + + + + + + +Reference (Edit) +/text/swriter/01/edit_reference_submenu.xhp + + + + + +Reference +A submenu that offers possibilities to edit footnotes, endnotes, index entries, and bibliography entries. + + + + + + +Footnote or Endnote + + +Index Entry + + +Bibliography Entry + + + + \ No newline at end of file diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp index d26df71fa..46b53eac0 100644 --- a/source/text/swriter/main0102.xhp +++ b/source/text/swriter/main0102.xhp @@ -31,7 +31,7 @@ -Edit +Edit This menu contains commands for editing the contents of the current document. @@ -44,37 +44,31 @@ -Select Text +Select Text -Direct Cursor Mode -Allows a user to click at the beginning, middle, or end of any possible text line on a page and then begin typing. -Go to Page -Opens the Navigator window on the Page Number spin button, so you can enter in a page number. +Go to Page +Opens a dialog box to enter which page number should be shown. (CommandCtrl+G) + +Comment + Shows submenu that gives options to reply, resolve and delete comments.When a submenu for Comment is made, then replace label and description with an embed - 19.10.20 + - -Footnote or Endnote - - -Index Entry - - -Bibliography Entry - - -Fields +Fields -Links +Links to External Files -Object +Object +Direct Cursor Mode +Allows a user to click at the beginning, middle, or end of any possible text line on a page and then begin typing.
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/0211.xhp | 208 1 file changed, 97 insertions(+), 111 deletions(-) New commits: commit efae5941210d1801523ae2a7a6ef3e3d5521bd46 Author: Seth Chaiklin AuthorDate: Mon Oct 19 14:13:20 2020 +0200 Commit: Seth Chaiklin CommitDate: Mon Oct 19 20:33:43 2020 +0200 tdf#135668 general cleanup of help page for Navigator Design of Navigator has been under modification (e.g., tdf#89566) This patch updates in relation to those (and possibly other) changes. - Change order of controls to correspond to current layout of Navigator - Add that Navigator can be docked at bottom of window. - Add new controls for new features "Navigate By" "Go to" - Modify "Previous" and "Next" descriptions to new Navigate By - Change icons for "Previous" and "Next", because new directions - Update label names to "Promote/Demote Chapter" - Remove "Navigation" control - no longer in Navigator - Remove "Navigator" button - no longer in Navigator - Replace incorrect Drag Mode icon with correct icon - Add note about context menus. - Add keyboard shortcut - Update to , Change-Id: Ieab9afb8b351509254a966437d4b26c1a9863c19 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104496 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/source/text/swriter/01/0211.xhp b/source/text/swriter/01/0211.xhp index 0bb8c960f..d743aff7e 100644 --- a/source/text/swriter/01/0211.xhp +++ b/source/text/swriter/01/0211.xhp @@ -36,60 +36,33 @@ Navigator Shows or hides the Navigator window, where you can quickly jump to different parts of your document. Navigator is also available as a deck of the Sidebar. You can also use the Navigator to insert elements from the current document or other open documents, and to organize master documents. To edit an item in the Navigator, right-click the item, and then choose a command from the context menu. If you want, you can dock the Navigator at the edge of your workspace. - +Context menus use a selection of commands found on this help page. The commands in a context menu change, depending on which category or item is selected. -To open the Navigator, choose View - Navigator. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, hold down the Ctrl key and double-click on a grey area of the Navigator. -Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator. +To open the Navigator, choose View - Navigator (F5). To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left, right or bottom edge of the workspace. To undock the Navigator, hold down the Ctrl key and double-click on a grey area of the Navigator. +Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator. To jump to the next or previous item in a document, click the Navigation icon to open the Navigation toolbar, click the item category, and then click the up or down arrows. A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, frames, graphics, OLE objects, and indexes. -Toggle Master View -Switches between master view and normal view if a master document is open. Switches between master view and normal view if a master document is open. - - - - - Icon Toggle Master View - - - Toggle Master View - - - - - - -Navigation -Opens the Navigation toolbar, where you can quickly jump to the next or the previous item in the category that you select. Select the category, and then click the "Previous" and "Next" arrows. Opens the Navigation toolbar, where you can quickly jump to the next or the previous item in the category that you select. Select the category, and then click the "Previous" and "Next" arrows. -To continue the search, click the Repeat Search icon on the Navigation toolbar. - - - - - Icon Navigation - - - Navigation - - - + +Navigate By +Use selection box to choose which type of item should be navigated, when using the Previous and Next buttons. Previous -Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click a
[Libreoffice-commits] core.git: include/svtools svtools/inc svtools/source
include/svtools/borderline.hxx |9 -
include/svtools/brwbox.hxx | 116 +++
include/svtools/ctrlbox.hxx | 22 +-
include/svtools/editbrowsebox.hxx| 26 +--
include/svtools/ruler.hxx| 98 ++--
include/svtools/svparser.hxx |7
include/svtools/tabbar.hxx | 16 +-
include/svtools/unitconv.hxx | 15 +
include/svtools/valueset.hxx | 18 +-
svtools/inc/table/tablecontrol.hxx |4
svtools/inc/table/tablecontrolinterface.hxx |8 -
svtools/source/brwbox/brwbox1.cxx| 140 +-
svtools/source/brwbox/brwbox2.cxx| 100 ++---
svtools/source/brwbox/brwbox3.cxx|6
svtools/source/brwbox/brwhead.cxx|2
svtools/source/brwbox/datwin.cxx | 32 ++--
svtools/source/brwbox/editbrowsebox.cxx | 28 +--
svtools/source/brwbox/editbrowsebox2.cxx |4
svtools/source/config/printoptions.cxx |2
svtools/source/control/ctrlbox.cxx | 68
svtools/source/control/ctrltool.cxx |8 -
svtools/source/control/ruler.cxx | 206 +--
svtools/source/control/tabbar.cxx| 60 +++
svtools/source/control/valueset.cxx | 54 +++
svtools/source/dialogs/addresstemplate.cxx |4
svtools/source/misc/embedhlp.cxx |8 -
svtools/source/misc/unitconv.cxx | 142 +-
svtools/source/svhtml/htmlout.cxx|2
svtools/source/svrtf/svparser.cxx|2
svtools/source/table/cellvalueconversion.cxx |7
svtools/source/table/gridtablerenderer.cxx | 20 +-
svtools/source/table/mousefunction.cxx | 14 -
svtools/source/table/tablecontrol.cxx|4
svtools/source/table/tablecontrol_impl.cxx | 88 +--
svtools/source/table/tablecontrol_impl.hxx | 26 +--
35 files changed, 685 insertions(+), 681 deletions(-)
New commits:
commit 5afba3e12c8d4eb1ebb8e087134eb87593bb017a
Author: Noel
AuthorDate: Mon Oct 19 10:46:41 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 19 21:34:15 2020 +0200
use tools::Long in svtools
Change-Id: I2b26da23e625e643dc2bb5393abff3671c457884
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104518
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svtools/borderline.hxx b/include/svtools/borderline.hxx
index 1d7d9f1cd2f7..efd233dd87ac 100644
--- a/include/svtools/borderline.hxx
+++ b/include/svtools/borderline.hxx
@@ -22,6 +22,7 @@
#include
#include
+#include
/**
Class computing border widths shared between Line style listbox and the
@@ -65,11 +66,11 @@ public:
bool operator== ( const BorderWidthImpl& r ) const;
-long GetLine1 ( long nWidth ) const;
-long GetLine2( long nWidth ) const;
-long GetGap( long nWidth ) const;
+tools::Long GetLine1 ( tools::Long nWidth ) const;
+tools::Long GetLine2( tools::Long nWidth ) const;
+tools::Long GetGap( tools::Long nWidth ) const;
-long GuessWidth( long nLine1, long nLine2, long nGap );
+tools::Long GuessWidth( tools::Long nLine1, tools::Long nLine2,
tools::Long nGap );
bool IsEmpty( ) const { return (0 == m_nRate1) && (0 == m_nRate2); }
bool IsDouble( ) const { return (0 != m_nRate1) && (0 != m_nRate2); }
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index e466a89d4d14..b5c64abed6aa 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -54,7 +54,7 @@ namespace vcl {
}
#define BROWSER_INVALIDID SAL_MAX_UINT16
-#define BROWSER_ENDOFSELECTION (static_cast(SFX_ENDOFSELECTION))
+#define BROWSER_ENDOFSELECTION
(static_cast(SFX_ENDOFSELECTION))
enum class BrowserMode
{
@@ -119,19 +119,19 @@ namespace o3tl
class BrowseEvent
{
VclPtr pWin;
-longnRow;
+tools::LongnRow;
tools::RectangleaRect;
sal_uInt16 nCol;
sal_uInt16 nColId;
public:
BrowseEvent( vcl::Window* pWindow,
- long nAbsRow,
+ tools::Long nAbsRow,
sal_uInt16 nColumn, sal_uInt16 nColumnId,
const tools::Rectangle& rRect );
vcl::Window*GetWindow() const { return pWin; }
-longGetRow() const { return nRow; }
+tools::LongGetRow() const { return nRow; }
sal_uInt16 GetColumn() const { return nCol; }
sal_uInt16 GetColumnId() const { return nColId; }
const tools::Rectangle&GetRect() const { return aRect; }
@@ -173,8 +173,8 @@ public:
sal_uInt16 nUpdateLock;
[Libreoffice-commits] core.git: include/vcl vcl/backendtest vcl/headless vcl/inc vcl/opengl vcl/qa vcl/qt5 vcl/skia vcl/source vcl/unx vcl/workben
include/vcl/BitmapBuffer.hxx |6 include/vcl/BitmapConvolutionMatrixFilter.hxx |4 include/vcl/BitmapFilter.hxx |9 include/vcl/BitmapTools.hxx |2 include/vcl/GraphicAttributes.hxx | 20 - include/vcl/GraphicObject.hxx |4 include/vcl/ITiledRenderable.hxx |4 include/vcl/RawBitmap.hxx | 14 include/vcl/accessibletable.hxx |4 include/vcl/accessibletableprovider.hxx | 10 include/vcl/animate/Animation.hxx |6 include/vcl/animate/AnimationBitmap.hxx |4 include/vcl/bitmap.hxx|2 include/vcl/bitmapaccess.hxx | 92 ++--- include/vcl/bitmapex.hxx |4 include/vcl/button.hxx|8 include/vcl/commandevent.hxx | 20 - include/vcl/ctrl.hxx |8 include/vcl/cursor.hxx|6 include/vcl/dockwin.hxx | 28 - include/vcl/embeddedfontshelper.hxx |3 include/vcl/fixed.hxx |6 include/vcl/font.hxx |9 include/vcl/gdimtf.hxx|6 include/vcl/graph.hxx |4 include/vcl/hatch.hxx |9 include/vcl/headbar.hxx | 34 +- include/vcl/i18nhelp.hxx |3 include/vcl/imap.hxx |2 include/vcl/layout.hxx| 76 ++-- include/vcl/menu.hxx | 15 include/vcl/metaact.hxx | 96 +++--- include/vcl/metric.hxx| 42 +- include/vcl/notebookbar.hxx |2 include/vcl/opengl/OpenGLHelper.hxx |6 include/vcl/outdev.hxx| 156 - include/vcl/outdevmap.hxx | 20 - include/vcl/pdfwriter.hxx |6 include/vcl/print.hxx | 14 include/vcl/region.hxx|2 include/vcl/salgtype.hxx | 24 - include/vcl/salnativewidgets.hxx | 26 - include/vcl/scrbar.hxx| 64 ++-- include/vcl/settings.hxx | 46 +- include/vcl/split.hxx | 14 include/vcl/splitwin.hxx | 44 +- include/vcl/status.hxx| 20 - include/vcl/svapp.hxx |4 include/vcl/sysdata.hxx |5 include/vcl/syswin.hxx|2 include/vcl/tabctrl.hxx | 18 - include/vcl/texteng.hxx | 40 +- include/vcl/textrectinfo.hxx |4 include/vcl/textview.hxx |2 include/vcl/toolbox.hxx | 42 +- include/vcl/toolkit/button.hxx|4 include/vcl/toolkit/combobox.hxx |8 include/vcl/toolkit/controllayout.hxx | 10 include/vcl/toolkit/dialog.hxx|4 include/vcl/toolkit/edit.hxx | 10 include/vcl/toolkit/fixedhyper.hxx|2 include/vcl/toolkit/ivctrl.hxx|6 include/vcl/toolkit/lstbox.hxx|6 include/vcl/toolkit/prgsbar.hxx |4 include/vcl/toolkit/spin.hxx | 24 - include/vcl/toolkit/svlbitm.hxx |8 include/vcl/toolkit/svtabbx.hxx | 16 - include/vcl/toolkit/treelistbox.hxx | 30 - include/vcl/toolkit/vclmedit.hxx |2 include/vcl/vcllayout.hxx |2 include/vcl/virdev.hxx|4 include/vcl/window.hxx| 32 +- vcl/backendtest/VisualBackendTest.cxx | 20 - vcl/backendtest/outputdevice/common.cxx
[Libreoffice-commits] core.git: canvas/source compilerplugins/clang connectivity/source embedserv/source vcl/win winaccessibility/source
canvas/source/directx/dx_canvasbitmap.cxx |6 +++---
compilerplugins/clang/test/cstylecast.cxx |2 +-
connectivity/source/drivers/ado/Aolevariant.cxx |6 +++---
embedserv/source/embed/docholder.cxx |6 +++---
vcl/win/gdi/salbmp.cxx|2 +-
winaccessibility/source/service/AccObjectManagerAgent.cxx |2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit c4cec8647faf130111d67302e75998ddff4c0792
Author: Stephan Bergmann
AuthorDate: Mon Oct 19 15:11:45 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Oct 19 22:01:31 2020 +0200
clang-cl: Adapt Windows-specific code to extended loplugin:cstylecast
...after 1ebeacb20ad0165e399629fcfd7795ad0da3edf8 "Extend
loplugin:cstylecast to
certain function-style casts"
Change-Id: I99bd383f5b3bee861d442d2e1be6ecd356b78315
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104523
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx
b/canvas/source/directx/dx_canvasbitmap.cxx
index b02ff2796813..adc4b741a4c3 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -98,7 +98,7 @@ namespace dxcanvas
mpBitmap->getBitmap()->GetHBITMAP(Gdiplus::Color(), &aHBmp
);
uno::Sequence< uno::Any > args(1);
-args[0] <<= sal_Int64(aHBmp);
+args[0] <<= reinterpret_cast(aHBmp);
aRes <<= args;
}
@@ -154,7 +154,7 @@ namespace dxcanvas
pGDIPlusBitmap->UnlockBits( &aBmpData );
uno::Sequence< uno::Any > args(1);
-args[0] <<= sal_Int64(hBmpBitmap);
+args[0] <<= reinterpret_cast(hBmpBitmap);
aRes <<= args;
}
@@ -231,7 +231,7 @@ namespace dxcanvas
reinterpret_cast(&aDIB),
DIB_RGB_COLORS );
uno::Sequence< uno::Any > args(1);
-args[0] <<= sal_Int64(hBmpBitmap);
+args[0] <<= reinterpret_cast(hBmpBitmap);
aRes <<= args;
}
diff --git a/compilerplugins/clang/test/cstylecast.cxx
b/compilerplugins/clang/test/cstylecast.cxx
index 916896d54db9..8d212700ae32 100644
--- a/compilerplugins/clang/test/cstylecast.cxx
+++ b/compilerplugins/clang/test/cstylecast.cxx
@@ -23,7 +23,7 @@ using T = unsigned int;
void FunctionalCast(void* p)
{
-// expected-error@+1 {{Function-style cast from 'void *' to 'sal_IntPtr'
(aka 'long') (performs: reinterpret_cast) (PointerToIntegral)
[loplugin:cstylecast]}}
+// expected-error-re@+1 {{Function-style cast from 'void *' to
'sal_IntPtr' (aka '{{.+}}') (performs: reinterpret_cast) (PointerToIntegral)
[loplugin:cstylecast]}}
auto n = sal_IntPtr(p);
(void(n)); // no warning expected (outer parens to disambiguate expr vs.
decl)
}
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx
b/connectivity/source/drivers/ado/Aolevariant.cxx
index f90a4ecc6ef2..ae7c3f30572c 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -80,7 +80,7 @@ OLEString& OLEString::operator=(const BSTR& _rSrc)
}
OUString OLEString::asOUString() const
{
-return (m_sStr != nullptr) ?
OUString(o3tl::toU(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString();
+return (m_sStr != nullptr) ?
OUString(o3tl::toU(m_sStr),::SysStringLen(m_sStr)) : OUString();
}
BSTR OLEString::asBSTR() const
{
@@ -378,7 +378,7 @@ void OLEVariant::set(double n)
OUString OLEVariant::getString() const
{
if (V_VT(this) == VT_BSTR)
-return OUString(o3tl::toU(LPCOLESTR(V_BSTR(this;
+return OUString(o3tl::toU(V_BSTR(this)));
if(isNull())
return OUString();
@@ -387,7 +387,7 @@ OUString OLEVariant::getString() const
varDest.ChangeType(VT_BSTR, this);
-return OUString(o3tl::toU(LPCOLESTR(V_BSTR(&varDest;
+return OUString(o3tl::toU(V_BSTR(&varDest)));
}
diff --git a/embedserv/source/embed/docholder.cxx
b/embedserv/source/embed/docholder.cxx
index cb6f19b68e7e..ecaeede416b7 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -284,7 +284,7 @@ HRESULT DocumentHolder::InPlaceActivate(
xWin.set(
xToolkit->createSystemChild(
-uno::Any(sal_Int64(hWndxWinParent)),
+uno::Any(reinterpret_cast(hWndxWinParent)),
aProcessIdent,
lang::SystemDependent::SYSTEM_WIN32),
uno::UNO_QUERY);
@@ -367,7 +367,7 @@ HRESULT DocumentHolder::InPlaceActivate(
aProcessIdent,lang::SystemDependent::SYSTEM_WIN32);
sal_Int64 t
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/htmlexport/htmlexport.cxx| 247 +++---
sw/source/filter/html/htmlreqifreader.cxx | 17 +-
2 files changed, 147 insertions(+), 117 deletions(-)
New commits:
commit 326c8d06070a4a41a666db919702f7c423dc7a18
Author: Miklos Vajna
AuthorDate: Mon Oct 19 17:53:51 2020 +0200
Commit: Miklos Vajna
CommitDate: Tue Oct 20 00:41:26 2020 +0200
sw reqif-xhtml export, embedded objects: handle non-package Ole10Native
stream
Commit 1392fd6a7eaf9f507639096984c2a0108f254795 (sw reqif-xhtml export,
embedded objects: handle Ole10Native stream, 2020-04-30) added support
for handling an OLE1 stream which contains something other than OLE2
data.
However, that assumed a fixed class name ("Package") and a matching
class id. Fix this, similar to how the import side was fixed with commit
247b247dadc8f0133a8eb94f1423a29315cf998a (sw reqif-xhtml import,
embedded objects: handle non-package Ole10Native stream, 2020-10-16).
Change-Id: If2ec9434c802e23e395cf2a6eaf63ad5b1db9c1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104531
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8ba6b7e4d160..c96c1c8215b1 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -49,6 +49,78 @@
#include
#include
+namespace
+{
+/// Test RTF parser that just extracts a single OLE2 object from a file.
+class TestReqIfRtfReader : public SvRTFParser
+{
+public:
+TestReqIfRtfReader(SvStream& rStream);
+void NextToken(int nToken) override;
+bool WriteObjectData(SvStream& rOLE);
+
+private:
+bool m_bInObjData = false;
+OStringBuffer m_aHex;
+};
+
+TestReqIfRtfReader::TestReqIfRtfReader(SvStream& rStream)
+: SvRTFParser(rStream)
+{
+}
+
+void TestReqIfRtfReader::NextToken(int nToken)
+{
+switch (nToken)
+{
+case '}':
+m_bInObjData = false;
+break;
+case RTF_TEXTTOKEN:
+if (m_bInObjData)
+m_aHex.append(OUStringToOString(aToken,
RTL_TEXTENCODING_ASCII_US));
+break;
+case RTF_OBJDATA:
+m_bInObjData = true;
+break;
+}
+}
+
+bool TestReqIfRtfReader::WriteObjectData(SvStream& rOLE)
+{
+OString aObjdata = m_aHex.makeStringAndClear();
+
+SvMemoryStream aStream;
+int b = 0;
+int count = 2;
+
+// Feed the destination text to a stream.
+for (int i = 0; i < aObjdata.getLength(); ++i)
+{
+char ch = aObjdata[i];
+if (ch != 0x0d && ch != 0x0a)
+{
+b = b << 4;
+sal_Int8 parsed = msfilter::rtfutil::AsHex(ch);
+if (parsed == -1)
+return false;
+b += parsed;
+count--;
+if (!count)
+{
+aStream.WriteChar(b);
+count = 2;
+b = 0;
+}
+}
+}
+
+aStream.Seek(0);
+rOLE.WriteStream(aStream);
+return true;
+}
+}
+
class HtmlExportTest : public SwModelTestBase, public HtmlTestTools
{
private:
@@ -141,8 +213,39 @@ private:
/// HTML export of the sw doc model tests.
class SwHtmlDomExportTest : public SwModelTestBase, public HtmlTestTools
{
+public:
+/// Get the .ole path, assuming maTempFile is an XHTML export result.
+OUString GetOlePath();
+/// Parse the ole1 data out of an RTF fragment URL.
+void ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1);
};
+OUString SwHtmlDomExportTest::GetOlePath()
+{
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocUniquePtr pDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+OUString aOlePath = getXPath(
+pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object", "data");
+OUString aOleSuffix(".ole");
+CPPUNIT_ASSERT(aOlePath.endsWith(aOleSuffix));
+INetURLObject aUrl(maTempFile.GetURL());
+aUrl.setBase(aOlePath.copy(0, aOlePath.getLength() -
aOleSuffix.getLength()));
+aUrl.setExtension("ole");
+return aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE);
+}
+
+void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const OUString& rRtfUrl,
SvMemoryStream& rOle1)
+{
+SvMemoryStream aRtf;
+HtmlExportTest::wrapRtfFragment(rRtfUrl, aRtf);
+tools::SvRef xReader(new TestReqIfRtfReader(aRtf));
+CPPUNIT_ASSERT(xReader->CallParser() != SvParserState::Error);
+CPPUNIT_ASSERT(xReader->WriteObjectData(rOle1));
+CPPUNIT_ASSERT(rOle1.Tell());
+}
+
char const DATA_DIRECTORY[] = "/sw/qa/extras/htmlexport/data/";
DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276, "fdo81276.html")
@@ -921,78 +1024,6 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifParagraphAlignment)
assertXPathNoAttribute(pDoc, "//reqif-xhtml:p", "align");
}
-namespace
-{
-/// Test RT
[Libreoffice-commits] core.git: include/vcl vcl/source xmlsecurity/qa xmlsecurity/source
include/vcl/filter/PDFiumLibrary.hxx|2
include/vcl/filter/pdfdocument.hxx |6 +
vcl/source/filter/ipdf/pdfdocument.cxx | 82 ++--
vcl/source/pdf/PDFiumLibrary.cxx| 12 +-
xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p1.pdf |binary
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 14 +++
xmlsecurity/source/helper/pdfsignaturehelper.cxx| 22 +++--
7 files changed, 118 insertions(+), 20 deletions(-)
New commits:
commit 586f6abee92af3cdabdce034b607b9a046ed3946
Author: Miklos Vajna
AuthorDate: Mon Oct 19 16:50:07 2020 +0200
Commit: Miklos Vajna
CommitDate: Tue Oct 20 00:50:37 2020 +0200
xmlsecurity: handle MDP permission during PDF verify
Change-Id: I626fca7c03079fb0374c577dcfe024e7db6ed5b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104529
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index 474f509df46b..96f258127693 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -213,7 +213,7 @@ public:
std::unique_ptr getTextPage();
/// Get bitmap checksum of the page, without annotations/commenting.
-BitmapChecksum getChecksum();
+BitmapChecksum getChecksum(int nMDPPerm);
double getWidth();
double getHeight();
diff --git a/include/vcl/filter/pdfdocument.hxx
b/include/vcl/filter/pdfdocument.hxx
index be06db286d3e..de0a7b9365ff 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -393,6 +393,7 @@ public:
size_t GetObjectOffset(size_t nIndex) const;
const std::vector>& GetElements() const;
std::vector GetPages();
+PDFObjectElement* GetCatalog();
/// Remember the end location of an EOF token.
void PushBackEOF(size_t nOffset);
/// Look up object based on object number, possibly by parsing object
streams.
@@ -420,6 +421,11 @@ public:
bool Write(SvStream& rStream);
/// Get a list of signatures embedded into this document.
std::vector GetSignatureWidgets();
+/**
+ * Get the value of the "modification detection and prevention" permission:
+ * Valid values are 1, 2 and 3: only 3 allows annotations after signing.
+ */
+int GetMDPPerm();
/// Remove the nth signature from read document in the edit buffer.
bool RemoveSignature(size_t nPosition);
/// Get byte offsets of the end of incremental updates.
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 2b6c9d49de34..7c085abe3324 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -2034,10 +2034,8 @@ static void visitPages(PDFObjectElement* pPages,
std::vector&
pPages->setVisiting(false);
}
-std::vector PDFDocument::GetPages()
+PDFObjectElement* PDFDocument::GetCatalog()
{
-std::vector aRet;
-
PDFReferenceElement* pRoot = nullptr;
PDFTrailerElement* pTrailer = nullptr;
@@ -2057,11 +2055,18 @@ std::vector PDFDocument::GetPages()
if (!pRoot)
{
-SAL_WARN("vcl.filter", "PDFDocument::GetPages: trailer has no Root
key");
-return aRet;
+SAL_WARN("vcl.filter", "PDFDocument::GetCatalog: trailer has no Root
key");
+return nullptr;
}
-PDFObjectElement* pCatalog = pRoot->LookupObject();
+return pRoot->LookupObject();
+}
+
+std::vector PDFDocument::GetPages()
+{
+std::vector aRet;
+
+PDFObjectElement* pCatalog = GetCatalog();
if (!pCatalog)
{
SAL_WARN("vcl.filter", "PDFDocument::GetPages: trailer has no
catalog");
@@ -2134,6 +2139,71 @@ std::vector
PDFDocument::GetSignatureWidgets()
return aRet;
}
+int PDFDocument::GetMDPPerm()
+{
+int nRet = 3;
+
+std::vector aSignatures = GetSignatureWidgets();
+if (aSignatures.empty())
+{
+return nRet;
+}
+
+for (const auto& pSignature : aSignatures)
+{
+vcl::filter::PDFObjectElement* pSig = pSignature->LookupObject("V");
+if (!pSig)
+{
+SAL_WARN("vcl.filter", "PDFDocument::GetMDPPerm: can't find
signature object");
+continue;
+}
+
+auto pReference =
dynamic_cast(pSig->Lookup("Reference"));
+if (!pReference || pReference->GetElements().empty())
+{
+continue;
+}
+
+auto pFirstReference =
dynamic_cast(pReference->GetElements()[0]);
+if (!pFirstReference)
+{
+SAL_WARN("vcl.filter",
+ "PDFDocument::GetMDPPerm: reference array doesn't contain
a dictionary");
+continue;
+}
+
+PDFElement* pTransformParams =
pFirstReference->LookupElement("TransformParams");
+auto pTransformParamsDict =
dynamic_cast(pTransformParams);
+if (!pTransformParamsDict)
+{
+auto p
[Libreoffice-commits] core.git: external/nss
external/nss/ExternalProject_nss.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db6457fc6035a9c271edbaedd33d04985d1235b2 Author: Tor Lillqvist AuthorDate: Mon Oct 19 20:52:46 2020 +0100 Commit: Tor Lillqvist CommitDate: Tue Oct 20 07:31:35 2020 +0200 Unbreak nss build for the native arm64 on an Apple Silicon Mac I had managed to break it with 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8 that made it possible to build for (Rosettafied) x86_64 on an Apple Silicon Mac. Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 062f6642f6f6..b9f56d24de0c 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(CROSS_COMPILING),\ CROSS_COMPILE=1 \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ - $(if $(filter MACOSX-arm64,$(OS)-$(shell uname -m)), \ + $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ CPU_ARCH=x86_64 \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/helper/vclunohelper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6eefea359fe1e51adfd4a2002614013a7c060a33 Author: Noel Grandin AuthorDate: Mon Oct 19 21:32:49 2020 +0200 Commit: Noel Grandin CommitDate: Tue Oct 20 08:04:20 2020 +0200 fix font orientation conversion in VCLUnoHelper css::awt::FontDescriptor uses degrees, while vcl::Font uses deci-degrees Change-Id: I72265ea6385bc61db99ee9a6bb392dab2cb1ab3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104543 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index e1f0bf38d1ec..238f148af910 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -211,7 +211,7 @@ css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF aFD.Slant = vcl::unohelper::ConvertFontSlant(rFont.GetItalic()); aFD.Underline = sal::static_int_cast< sal_Int16 >(rFont.GetUnderline()); aFD.Strikeout = sal::static_int_cast< sal_Int16 >(rFont.GetStrikeout()); -aFD.Orientation = rFont.GetOrientation(); +aFD.Orientation = rFont.GetOrientation() / 10.0; aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); aFD.Type = 0; // ??? => Only in Metric... @@ -245,7 +245,7 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons aFont.SetStrikeout( static_cast(rDescr.Strikeout) ); // Not DONTKNOW -aFont.SetOrientation( static_cast(rDescr.Orientation) ); +aFont.SetOrientation( static_cast(rDescr.Orientation * 10) ); aFont.SetKerning( static_cast(rDescr.Kerning) ); aFont.SetWordLineMode( rDescr.WordLineMode ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source sw/inc sw/qa sw/source
sc/inc/ChartTools.hxx |3 sc/inc/addincol.hxx | 31 sc/inc/attarray.hxx |4 sc/inc/cellsuno.hxx |4 sc/inc/chartuno.hxx |2 sc/inc/column.hxx |4 sc/inc/datauno.hxx |4 sc/inc/dbdocutl.hxx |5 sc/inc/document.hxx |2 sc/inc/docuno.hxx |4 sc/inc/dpcache.hxx | 35 sc/inc/dpdimsave.hxx|4 sc/inc/dpgroup.hxx | 60 - sc/inc/dpobject.hxx | 16 sc/inc/dpoutput.hxx | 22 sc/inc/dpresfilter.hxx |5 sc/inc/dpsave.hxx | 15 sc/inc/dpsdbtab.hxx |8 sc/inc/dpshttab.hxx | 10 sc/inc/dptabdat.hxx | 51 sc/inc/dptabres.hxx | 138 +- sc/inc/dptabsrc.hxx | 116 +- sc/inc/drwlayer.hxx |2 sc/inc/editutil.hxx |4 sc/inc/global.hxx | 11 sc/inc/markarr.hxx |3 sc/inc/markdata.hxx |4 sc/inc/markmulti.hxx|4 sc/inc/patattr.hxx |2 sc/inc/pivot.hxx|9 sc/inc/scabstdlg.hxx|8 sc/inc/scextopt.hxx |4 sc/inc/table.hxx|2 sc/qa/extras/scannotationsobj.cxx |4 sc/qa/unit/bugfix-test.cxx |4 sc/qa/unit/filters-test.cxx |2 sc/qa/unit/helper/qahelper.cxx |2 sc/qa/unit/helper/qahelper.hxx |2 sc/qa/unit/pivottable_filters_test.cxx |6 sc/qa/unit/subsequent_export-test.cxx |4 sc/qa/unit/subsequent_filters-test.cxx |8 sc/qa/unit/ucalc.cxx|4 sc/qa/unit/ucalc_pivottable.cxx |6 sc/source/core/data/attarray.cxx| 26 sc/source/core/data/column2.cxx | 64 - sc/source/core/data/column3.cxx | 10 sc/source/core/data/compressedarray.cxx | 16 sc/source/core/data/dbdocutl.cxx|4 sc/source/core/data/docpool.cxx |6 sc/source/core/data/documen3.cxx| 38 sc/source/core/data/documen4.cxx|2 sc/source/core/data/documen9.cxx|8 sc/source/core/data/document.cxx|2 sc/source/core/data/dpcache.cxx | 62 - sc/source/core/data/dpdimsave.cxx | 22 sc/source/core/data/dpgroup.cxx | 64 - sc/source/core/data/dpobject.cxx| 72 - sc/source/core/data/dpoutput.cxx| 116 +- sc/source/core/data/dpsave.cxx | 38 sc/source/core/data/dpsdbtab.cxx|8 sc/source/core/data/dpshttab.cxx| 14 sc/source/core/data/dptabdat.cxx| 42 sc/source/core/data/dptabres.cxx| 514 - sc/source/core/data/dptabsrc.cxx| 260 ++--- sc/source/core/data/dputil.cxx
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 150d4c8b66a5d4e32a97a2a7e25e6fb632cfd40c Author: Platon Pronko AuthorDate: Mon Oct 19 17:39:08 2020 +0300 Commit: Noel Grandin CommitDate: Tue Oct 20 08:06:32 2020 +0200 remove unnecessary `if (!true) return;` statement from Desktop::Init() Seems that this specific piece of code was introduced in commit bc66bf4608557d757555aef1f46abf8a15c3538b by Noel Grandin, where `if (true)` wrapper was removed and `if (!true) return;` seems to have been left over. But the original `if (true)` statement was introduced in commit 4d258787559426e1e2a0279888eb669622889899 by Michael Meeks, where `if ( m_aBootstrapError == BE_OK )` before starting IPC thread was replaced with `if (true)`. I asked on IRC and they were not sure for the reason of this change, so I will add Michael Meeks as a reviewer of this patch, just in case. Change-Id: I1ffb781464fa2fde152eb21bc61e4b244e8812d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104530 Reviewed-by: Michael Meeks Tested-by: Jenkins diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 1276a2c598f2..04f64621c059 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -484,9 +484,6 @@ void Desktop::Init() } } -if ( !(true) ) -return; - // start ipc thread only for non-remote offices RequestHandler::Status aStatus = RequestHandler::Enable(true); if ( aStatus == RequestHandler::IPC_STATUS_PIPE_ERROR ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/spelleng.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit aa99b57cdc8cb3763aa935ed84e7d80c4e56a172
Author: Mark Hung
AuthorDate: Mon Oct 19 22:33:21 2020 +0800
Commit: Noel Grandin
CommitDate: Tue Oct 20 08:08:42 2020 +0200
tdf#137594 prevent converting unallocated columns.
Check col against GetAllocatedColumnsCount()
instead of MaxCol(). This prevents allocating
a new column just for converting an empty cell.
Change-Id: I5c8dcfffc2661ab9c4fd9c2c53ed389e57351517
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104528
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index d9fdc3bb4e68..bb4c1f1ddf85 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -153,7 +153,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
bLoop = false;
mbFinished = true;
}
-else if( nNewCol > mrDoc.MaxCol() )
+else if( nNewCol >= mrDoc.GetAllocatedColumnsCount(mnStartTab) )
{
// no more cells in the sheet - try to restart at top of sheet
@@ -178,6 +178,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
}
else
{
+// GetPattern may implicitly allocates the column if not
exists,
pPattern = mrDoc.GetPattern( nNewCol, nNewRow, mnStartTab );
if( pPattern && (pPattern != pLastPattern) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/qt5 vcl/source
include/vcl/settings.hxx|1 +
vcl/qt5/Qt5Frame.cxx|1 +
vcl/source/app/settings.cxx |6 ++
3 files changed, 8 insertions(+)
New commits:
commit 0839bfaf75d3a1bc78b63c71f28a763b1b39f979
Author: Jan-Marek Glogowski
AuthorDate: Mon Oct 19 20:46:05 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Tue Oct 20 08:08:28 2020 +0200
tdf#133931 Qt5 set the themed AlternatingRowColor
Change-Id: I6a4a0f90239686ff1c94e1a550540223324184e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104540
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 30023a601ab9..427447c8d1b2 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -415,6 +415,7 @@ public:
voidSetInactiveTabColor( const Color& rColor );
const Color&GetInactiveTabColor() const;
+void SetAlternatingRowColor(const Color& rColor);
const Color&GetAlternatingRowColor() const;
voidSetHighContrastMode(bool bHighContrast );
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 41a5a5436a67..cdb7c8b510be 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1047,6 +1047,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
style.SetFieldColor(aBase);
style.SetWindowColor(aBase);
style.SetActiveTabColor(aBase);
+style.SetAlternatingRowColor(toColor(pal.color(QPalette::Active,
QPalette::AlternateBase)));
// Buttons
style.SetDefaultButtonTextColor(aButn);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index da23dcf9deb9..2f0495c58446 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1547,6 +1547,12 @@ StyleSettings::GetInactiveTabColor() const
return mxData->maInactiveTabColor;
}
+void StyleSettings::SetAlternatingRowColor(const Color& rColor)
+{
+CopyData();
+mxData->maAlternatingRowColor = rColor;
+}
+
const Color&
StyleSettings::GetAlternatingRowColor() const
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Leo Wang - license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Leo Wang ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build stuck
On 20/10/2020 06:26, anshu khare wrote: My libreoffice build is stuck at a point. It's been 4-5 hours. I have attached a screenshot of the point where it's stuck. After [BIN] libcmis [MOD] libcmis it's not moving forward. It is stuck at this point. It's been 4-5 hours. That output likely is not helpful in finding out what exactly got stuck. You appear to be on Windows, where doing `ps` in another Cygwin shell should give a list of all running Cygwin processes, which would be of interest here. (`pstree` might also be available on Cygwin, but I don't know.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
