[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf129888dml.docx |binary
sw/qa/extras/ooxmlexport/data/tdf129888vml.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 28 ++
writerfilter/source/dmapper/DomainMapper.cxx | 15 -
writerfilter/source/dmapper/GraphicImport.cxx |2 -
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 24 +++
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1
7 files changed, 54 insertions(+), 16 deletions(-)
New commits:
commit 47bc0ff1ad0f07b07a75f55d3bb898e113a415b2
Author: Bakos Attila
AuthorDate: Thu Jan 16 13:45:47 2020 +0100
Commit: László Németh
CommitDate: Mon Jan 20 08:35:11 2020 +0100
tdf#129888 DOCX shape import: handle o:allowincell
(VML) and layoutInCell (DrawingML) attributes to fix
regressions caused by commit 10f29d8bf05d44ca8bc11d34d1294ec17f8ac0f1
(tdf#87569 tdf#109411 DOCX import: fix shape anchor in tables).
Position of shapes anchored to tables is calculated from
the cell margin only if the previous attributes allow that.
Change-Id: Ifcfcb7f4959aea522dd45dff00cefd1bb9f4edda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86922
Tested-by: Jenkins
Reviewed-by: László Németh
Signed-off-by: xisco
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86980
Reviewed-by: Attila Bakos
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129888dml.docx
b/sw/qa/extras/ooxmlexport/data/tdf129888dml.docx
new file mode 100644
index ..1f6b03034fda
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf129888dml.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129888vml.docx
b/sw/qa/extras/ooxmlexport/data/tdf129888vml.docx
new file mode 100644
index ..ee7c60f8a8dc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf129888vml.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 516d65d9bcb8..bb9e3932320f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -42,6 +42,34 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128207,
"tdf128207.docx")
assertXPathContent(p_XmlDoc,
"/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor/wp:positionH/wp:posOffset",
"4445");
}
+DECLARE_OOXMLIMPORT_TEST(testTdf129888vml, "tdf129888vml.docx")
+{
+//the line shape has anchor in the first cell however it has to
+//be positioned to an another cell. To reach this we must handle
+//the o:allowincell attribute of the shape, and its position has
+//to be calculated from the page frame instead of the table:
+
+uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf129888vml The line shape has bad place!",
+ text::RelOrientation::PAGE_FRAME, nValue);
+}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf129888dml, "tdf129888dml.docx")
+{
+//the shape has anchor in the first cell however it has to
+//be positioned to the right side of the page. To reach this we must handle
+//the layoutInCell attribute of the shape, and its position has
+//to be calculated from the page frame instead of the table:
+
+uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf129888dml The shape has bad place!",
+ text::RelOrientation::PAGE_FRAME, nValue);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf87569v, "tdf87569_vml.docx")
{
//the original tdf87569 sample has vml shapes...
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 3fd2e98fe018..f7f24546def8 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3046,21 +3046,6 @@ void
DomainMapper::lcl_startShape(uno::Reference const& xShape)
m_pImpl->PushPendingShape(xShape);
m_pImpl->SetIsFirstParagraphInShape(true);
-
-//tdf#87569: Fix table layout with correcting anchoring
-//If anchored object is in table, Word calculates its position from cell
border
-//instead of page (what is set in the sample document)
-if (m_pImpl->m_nTableDepth > 0) //if we had a table
-{
-uno::Reference xShapePropSet(xShape,
uno::UNO_QUERY);
-sal_Int16 nCurrentHorOriRel; //A temp variable for storaging the
current setting
-xShapePropSet->getPropertyValue("HoriOrientRelation") >>=
nCurrentHorOriRel;
-//and the correction:
-if (nCurrentHorOriRel == text::RelOrientation::PAGE_FRAME)
-xShapePropSet->setPropertyValue("HoriOrientRelation",
-
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlfilter.cxx | 96 ---
reportdesign/source/filter/xml/xmlfilter.hxx |5 -
2 files changed, 43 insertions(+), 58 deletions(-)
New commits:
commit fc1f85127968d1c2e0a53dace51bf8a78f9e6ca5
Author: Noel Grandin
AuthorDate: Sun Jan 19 21:09:42 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Jan 20 07:09:20 2020 +0100
use more FastParser in ORptFilter
Change-Id: I517a26a3ea64d86a1f494e3b9ea52ee28604e0b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87046
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 69d4251fc337..d6cedca1f54a 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -590,13 +590,20 @@ namespace {
class RptXMLDocumentSettingsContext : public SvXMLImportContext
{
public:
-RptXMLDocumentSettingsContext(SvXMLImport & rImport,
- sal_uInt16 const nPrefix,
- const OUString& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+RptXMLDocumentSettingsContext(SvXMLImport & rImport)
+: SvXMLImportContext(rImport)
{
}
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList
>& ) override {}
+
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 /*nElement*/, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override
+{
+return nullptr;
+}
+
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 const nPrefix,
const OUString& rLocalName,
const uno::Reference & xAttrList) override
@@ -612,13 +619,20 @@ public:
class RptXMLDocumentStylesContext : public SvXMLImportContext
{
public:
-RptXMLDocumentStylesContext(SvXMLImport & rImport,
-sal_uInt16 const nPrefix,
-const OUString& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+RptXMLDocumentStylesContext(SvXMLImport & rImport)
+: SvXMLImportContext(rImport)
{
}
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList
>& ) override {}
+
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 /*nElement*/, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override
+{
+return nullptr;
+}
+
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 const nPrefix,
const OUString& rLocalName,
const uno::Reference & xAttrList) override
@@ -687,13 +701,20 @@ namespace {
class RptXMLDocumentContentContext : public SvXMLImportContext
{
public:
-RptXMLDocumentContentContext(SvXMLImport & rImport,
-sal_uInt16 const nPrefix,
-const OUString& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+RptXMLDocumentContentContext(SvXMLImport & rImport)
+: SvXMLImportContext(rImport)
{
}
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList
>& ) override {}
+
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 /*nElement*/, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override
+{
+return nullptr;
+}
+
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 const nPrefix,
const OUString& rLocalName,
const uno::Reference & xAttrList) override
@@ -725,30 +746,6 @@ public:
}
-SvXMLImportContext* ORptFilter::CreateDocumentContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference<
xml::sax::XAttributeList >& /*xAttrList*/ )
-{
-SvXMLImportContext *pContext = nullptr;
-
-const SvXMLTokenMap& rTokenMap = GetDocElemTokenMap();
-switch( rTokenMap.Get( nPrefix, rLocalName ) )
-{
-case XML_TOK_DOC_SETTINGS:
-GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-pContext = new RptXMLDocumentSettingsContext(*this, nPrefix,
rLocalName);
-break;
-case XML_TOK_DOC_STYLES:
-pContext = new RptXMLDocumentStylesContext(*this, nPrefix,
rLocalName);
-break;
-case XML_TOK_DOC_CONTENT:
-pContext = new RptXMLDocumentContentContext(*this, nPrefix,
rLocalName);
-break;
-}
-
-return pContext;
-}
-
SvXMLImportContext *ORptFilter::CreateFastContext( sal_Int32 nElement,
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a86fcb4461cc0e3d309f439247f3efea4c057155 Author: Roman Kuznetsov AuthorDate: Sat Jan 11 08:45:00 2020 +0100 Commit: Heiko Tietze CommitDate: Mon Jan 20 07:02:41 2020 +0100 tdf#129417 Rename "Full-sheet previews" to "Whole sheet export" in PDF option dialog Change-Id: Ib772599a68366be29f208e27f830b79015dbdc13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86593 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit b711f56b612c408560d2743bca0f01a9109f416f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87036 Reviewed-by: Heiko Tietze diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 3d59a633b027..62d9466d6fe2 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -798,7 +798,7 @@ -Full-sheet previews +Whole sheet export True True False ___ 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/uibase/docvw/edtwin.cxx | 26 --
1 file changed, 8 insertions(+), 18 deletions(-)
New commits:
commit 267d2d721c7e89a7b5f28ce0a4fee87d37ee2c61
Author: Mike Kaganski
AuthorDate: Sun Jan 19 11:42:23 2020 +0300
Commit: Mike Kaganski
CommitDate: Mon Jan 20 05:42:01 2020 +0100
Simplify getting ISO 8601 date string
Change-Id: If381276990199e4459787ffea090f342241237f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87037
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index c802664c8aeb..1a81d0851182 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include
#include
@@ -5986,24 +5987,13 @@ void QuickHelpData::FillStrArr( SwWrtShell const & rSh,
const OUString& rWord )
// Add matching current date in ISO 8601 format, for example 2016-01-30
OUString rStrToday;
-if (rWord[0] == '2')
-{
-(*pCalendar)->setGregorianDateTime(Date(Date::SYSTEM)); // tdf#130066:
reset today
-OUStringBuffer rStr("");
-rStr.append(sal::static_int_cast< sal_Int32
>((*pCalendar)->getValue(i18n::CalendarFieldIndex::YEAR))).append("-");
-sal_Int32 nMonth = sal::static_int_cast< sal_Int32
>((*pCalendar)->getValue(i18n::CalendarFieldIndex::MONTH)+1);
-sal_Int32 nDay = sal::static_int_cast< sal_Int32 >
((*pCalendar)->getValue(i18n::CalendarFieldIndex::DAY_OF_MONTH));
-if (nMonth < 10)
-rStr.append("0");
-rStr.append(nMonth).append("-");
-if (nDay < 10)
-rStr.append("0");
-rStrToday = rStr.append(nDay).toString();
-
-// do not suggest for single years, for example for "2016",
-// only for "201" or "2016-..." (to avoid unintentional text
-// insertion at line ending, for example typing "30 January 2016")
-if (rWord.getLength() != 4 && rStrToday.startsWith(rWord))
+// do not suggest for single years, for example for "2016",
+// only for "201" or "2016-..." (to avoid unintentional text
+// insertion at line ending, for example typing "30 January 2016")
+if (!rWord.isEmpty() && rWord.getLength() != 4 && rWord[0] == '2')
+{
+rStrToday =
utl::toISO8601(DateTime(Date(Date::SYSTEM)).GetUNODateTime());
+if (rStrToday.startsWith(rWord))
m_aHelpStrings.emplace_back(rStrToday, rWord.getLength());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Infra call on Tue, Jan 21 at 17:30 UTC
Hi there, The next infra call will take place at `date -d "Tue Jan 21 17:30:00 UTC 2020"` (18:30:00 Berlin time). We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes to https://pad.documentfoundation.org/p/infra . Agenda TBA. See you there! Cheers, -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/cellalignment.ui |9 + 1 file changed, 9 insertions(+) New commits: commit d1730033b4fa1f0cfeedd136dfb23ec01a194ec0 Author: andreas kainz AuthorDate: Sun Jan 19 22:58:40 2020 +0100 Commit: andreas_kainz CommitDate: Sun Jan 19 23:47:33 2020 +0100 calc cell alignment sizegroup update Change-Id: I0c63fb9a2c1d4f0cbcfd7a573a05c4fbf726ecb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87049 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui index 456456741822..ed26edc39796 100644 --- a/cui/uiconfig/ui/cellalignment.ui +++ b/cui/uiconfig/ui/cellalignment.ui @@ -532,4 +532,13 @@ + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf128290.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |7 +++
sw/source/filter/ww8/docxattributeoutput.cxx |4
3 files changed, 11 insertions(+)
New commits:
commit 8be3ae254f5b2ff76d9861ad4b9b5b5de5d14bb4
Author: Louis Meyrat
AuthorDate: Sun Jan 12 17:26:09 2020 +0100
Commit: Mike Kaganski
CommitDate: Sun Jan 19 23:30:00 2020 +0100
tdf#128290 add tblLayout element to docx export
This will disable the automatic table width feature of MS Word, which
does not exist in LO.
Now, tables in LO-generated docx have the same column width in MS
Word
Change-Id: I955c8e5667376475e7c41e3b74d88e3513fec561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86671
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128290.odt
b/sw/qa/extras/ooxmlexport/data/tdf128290.odt
new file mode 100644
index ..81ea0c6773aa
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf128290.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 1835b92bec49..922cb9183adc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -307,6 +307,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf77796,
"tdf77796.docx")
assertXPath(pXml, "/w:document/w:body/w:tbl/w:tblPr/w:tblCellMar/w:end",
"w", "108");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128290, "tdf128290.odt")
+{
+xmlDocPtr pXml = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXml);
+assertXPath(pXml, "/w:document/w:body/w:tbl/w:tblPr/w:tblLayout", "type",
"fixed");
+}
+
DECLARE_OOXMLIMPORT_TEST(testContSectBreakHeaderFooter,
"cont-sect-break-header-footer.docx")
{
// Load a document with a continuous section break on page 2.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 25b22b8df5ed..172205b11b50 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3771,6 +3771,10 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
FSNS( XML_w, XML_w ), OString::number(nPageSize),
FSNS( XML_w, XML_type ), widthType );
+// Disable layout autofit, as it does not exist in LibreOffice yet
+m_pSerializer->singleElementNS( XML_w, XML_tblLayout,
+FSNS( XML_w, XML_type ), "fixed" );
+
// Look for the table style property in the table grab bag
std::map aGrabBag =
pTableFormat->GetAttrSet().GetItem(RES_FRMATR_GRABBAG)->GetGrabBag();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/outdev.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4ee7a2bd9cab311704a47d18e44a5a17a54d3d66
Author: Caolán McNamara
AuthorDate: Sun Jan 19 19:25:30 2020 +
Commit: Caolán McNamara
CommitDate: Sun Jan 19 21:25:44 2020 +0100
flush out unused OutputDevices
Change-Id: I32052f3f37946b21564a931787b1547803c778ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87047
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 64ba3f135ad2..022edb9e2a54 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -301,7 +301,7 @@ typedef struct _cairo_surface cairo_surface_t;
* so we need to use virtual inheritance to keep the referencing counting
* OK.
*/
-class VCL_DLLPUBLIC OutputDevice : public virtual VclReferenceBase
+class SAL_WARN_UNUSED VCL_DLLPUBLIC OutputDevice : public virtual
VclReferenceBase
{
friend class Printer;
friend class VirtualDevice;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/virdev.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5dddea45d8ef3f1a3d314f105cf475255c841071
Author: Caolán McNamara
AuthorDate: Sun Jan 19 17:16:17 2020 +
Commit: Caolán McNamara
CommitDate: Sun Jan 19 21:25:23 2020 +0100
flush out unused VirtualDevices
Change-Id: I624be5423e1536aab351be21a4254d61c122a783
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87045
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index a70f8a110a5d..51053ad37e8c 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -29,7 +29,7 @@ class SalVirtualDevice;
struct SystemGraphicsData;
typedef struct _cairo_surface cairo_surface_t;
-class VCL_DLLPUBLIC VirtualDevice : public OutputDevice
+class SAL_WARN_UNUSED VCL_DLLPUBLIC VirtualDevice : public OutputDevice
{
friend class Application;
friend class ::OutputDevice;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/transfer.hxx |1 +
vcl/source/treelist/transfer.cxx | 27 ---
2 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 3f3b2aa014fd8c610825ecdf0c91fe6271a8aad3
Author: Caolán McNamara
AuthorDate: Sun Jan 19 17:06:43 2020 +
Commit: Caolán McNamara
CommitDate: Sun Jan 19 20:24:29 2020 +0100
refactor CreateFromClipboard to support not passing in a vcl::Window
Change-Id: I0474f390b34649debae18defdd1e860d7806b045
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87044
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 188e78132380..2a72fd6fab23 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -363,6 +363,7 @@ public:
css::uno::Reference GetInputStream(
SotClipboardFormatId nFormat, const OUString& rDestDoc );
css::uno::Reference GetInputStream( const
css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc );
+static TransferableDataHelper CreateFromClipboard(const
css::uno::Reference& rClipboard);
static TransferableDataHelper CreateFromSystemClipboard( vcl::Window *
pWindow );
static TransferableDataHelper CreateFromSelection( vcl::Window * pWindow
);
static bool IsEqual( const
css::datatransfer::DataFlavor& rInternalFlavor,
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 6383e43e0c70..51f6f2e14f8f 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -2118,28 +2118,21 @@ void TransferableDataHelper::StopClipboardListening( )
}
}
-
-TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard(
vcl::Window * pWindow )
+TransferableDataHelper TransferableDataHelper::CreateFromClipboard(const
css::uno::Reference& rClipboard)
{
-DBG_ASSERT( pWindow, "Window pointer is NULL" );
-
-Reference< XClipboard > xClipboard;
TransferableDataHelper aRet;
-if( pWindow )
-xClipboard = pWindow->GetClipboard();
-
-if( xClipboard.is() )
+if( rClipboard.is() )
{
try
{
-Reference< XTransferable > xTransferable(
xClipboard->getContents() );
+Reference< XTransferable > xTransferable(
rClipboard->getContents() );
if( xTransferable.is() )
{
aRet = TransferableDataHelper( xTransferable );
// also copy the clipboard
-aRet.mxClipboard = xClipboard;
+aRet.mxClipboard = rClipboard;
}
}
catch( const css::uno::Exception& )
@@ -2150,6 +2143,18 @@ TransferableDataHelper
TransferableDataHelper::CreateFromSystemClipboard( vcl::W
return aRet;
}
+TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard(
vcl::Window * pWindow )
+{
+DBG_ASSERT( pWindow, "Window pointer is NULL" );
+
+Reference< XClipboard > xClipboard;
+
+if( pWindow )
+xClipboard = pWindow->GetClipboard();
+
+return CreateFromClipboard(xClipboard);
+}
+
TransferableDataHelper TransferableDataHelper::CreateFromSelection(
vcl::Window* pWindow )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source vcl/unx
include/vcl/weld.hxx |3 +++
vcl/source/app/salvtables.cxx |4
vcl/unx/gtk3/gtk3gtkinst.cxx | 31 ---
3 files changed, 31 insertions(+), 7 deletions(-)
New commits:
commit 6afb18bc5fbc530d6404eac1c9e7191e58de27fc
Author: Caolán McNamara
AuthorDate: Sun Jan 19 17:06:02 2020 +
Commit: Caolán McNamara
CommitDate: Sun Jan 19 20:24:18 2020 +0100
add api to determine number of menu items
Change-Id: I69082c1b564c42be7a14fa36b0ba1dab34a3b5b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87043
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 9890be5d4bc0..9aa93cbe84ec 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1949,6 +1949,9 @@ public:
insert(-1, rId, rStr, nullptr, &rImage, false);
}
+// return the number of toplevel nodes
+virtual int n_children() const = 0;
+
virtual ~Menu() {}
};
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 248a62090f06..1603033ded71 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -921,6 +921,10 @@ public:
auto nInsertPos = pos == -1 ? MENU_APPEND : pos;
m_xMenu->InsertSeparator(rId.toUtf8(), nInsertPos);
}
+virtual int n_children() const override
+{
+return m_xMenu->GetItemCount();
+}
PopupMenu* getMenu() const
{
return m_xMenu.get();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index fdb8d66f68a2..f146049dffd2 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7056,6 +7056,14 @@ public:
gtk_menu_reorder_child(m_pMenu, pItem, pos);
}
+virtual int n_children() const override
+{
+GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu));
+int nLen = g_list_length(pChildren);
+g_list_free(pChildren);
+return nLen;
+}
+
virtual ~GtkInstanceMenu() override
{
clear_extras();
commit 3ed742a0dbe2566007447f9adb0f54f5424bd05d
Author: Caolán McNamara
AuthorDate: Sun Jan 19 17:02:35 2020 +
Commit: Caolán McNamara
CommitDate: Sun Jan 19 20:24:04 2020 +0100
report submenu activatation the same with/without MenuButton
as a toplevel
Change-Id: I0883281291d2084d91c2c4b6f2d2d233c3448fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87042
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index fdc09fa45581..fdb8d66f68a2 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -6841,7 +6841,7 @@ class GtkInstanceMenu : public MenuHelper, public virtual
weld::Menu
protected:
std::vector m_aExtraItems;
OString m_sActivated;
-GtkInstanceMenuButton* m_pTopLevelMenuButton;
+MenuHelper* m_pTopLevelMenuHelper;
private:
virtual void signal_activate(GtkMenuItem* pItem) override
@@ -6855,10 +6855,10 @@ private:
{
if (m_aExtraItems.empty())
return;
-if (m_pTopLevelMenuButton)
+if (m_pTopLevelMenuHelper)
{
for (auto a : m_aExtraItems)
-m_pTopLevelMenuButton->remove_from_map(a);
+m_pTopLevelMenuHelper->remove_from_map(a);
}
m_aExtraItems.clear();
}
@@ -6866,8 +6866,9 @@ private:
public:
GtkInstanceMenu(GtkMenu* pMenu, bool bTakeOwnership)
: MenuHelper(pMenu, bTakeOwnership)
-, m_pTopLevelMenuButton(nullptr)
+, m_pTopLevelMenuHelper(nullptr)
{
+g_object_set_data(G_OBJECT(m_pMenu), "g-lo-GtkInstanceMenu", this);
// tdf#122527 if we're welding a submenu of a menu of a MenuButton,
// then find that MenuButton parent so that when adding items to this
// menu we can inform the MenuButton of their addition
@@ -6884,11 +6885,18 @@ public:
}
if (pTopLevelMenu != pMenu)
{
+// maybe the toplevel is a menubutton
GtkWidget* pAttached = gtk_menu_get_attach_widget(pTopLevelMenu);
if (pAttached && GTK_IS_MENU_BUTTON(pAttached))
{
void* pData = g_object_get_data(G_OBJECT(pAttached),
"g-lo-GtkInstanceButton");
-m_pTopLevelMenuButton =
dynamic_cast(static_cast(pData));
+m_pTopLevelMenuHelper =
dynamic_cast(static_cast(pData));
+}
+// or maybe a menu
+if (!m_pTopLevelMenuHelper)
+{
+void* pData = g_object_get_data(G_OBJECT(pTopLevelMenu),
"g-lo-GtkInstanceMenu");
+m_pTopLevelMenuHelper = static_cast(pData);
}
}
}
@@ -7042,8 +7050,8 @@ public:
GtkMenuItem* pMenuItem = GTK_MENU_ITEM(pItem);
m_aExtraItems.push_back(pMenuItem);
ad
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/sdxmlimp.cxx | 21 -
xmloff/source/draw/sdxmlimp_impl.hxx |3 ---
2 files changed, 4 insertions(+), 20 deletions(-)
New commits:
commit 68a101b36d4e63b37a21688a5b5e85e9df4fa3aa
Author: Noel Grandin
AuthorDate: Sun Jan 19 12:48:58 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 19 18:36:57 2020 +0100
inline some Create methods
to make it easier to follow the flow of logic through the context
classes
Change-Id: I914c04dd0aa8148f9ff1be4ea86e83ff67d8bb76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87039
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 30a69187732d..10606f5c564e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -77,9 +77,10 @@ SdXMLBodyContext_Impl::SdXMLBodyContext_Impl( SdXMLImport&
rImport,
SvXMLImportContextRef SdXMLBodyContext_Impl::CreateChildContext(
sal_uInt16 /*nPrefix*/,
const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
{
-return GetSdImport().CreateBodyContext(rLocalName, xAttrList);
+SvXMLImportContext* pContext = new SdXMLBodyContext(GetSdImport(),
rLocalName);
+return pContext;
}
namespace {
@@ -177,7 +178,7 @@ SvXMLImportContextRef
SdXMLDocContext_Impl::CreateChildContext(
if( GetImport().getImportFlags() & SvXMLImportFlags::SCRIPTS )
{
// office:script inside office:document
-xContext = GetSdImport().CreateScriptContext( rLocalName );
+xContext = new XMLScriptContext( GetSdImport(), rLocalName,
GetSdImport().GetModel() );
}
break;
}
@@ -707,13 +708,6 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const
sal_Int32 /*nElement*/,
return pContext;
}
-SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
-const uno::Reference&)
-{
-SvXMLImportContext* pContext = new SdXMLBodyContext(*this, rLocalName);
-return pContext;
-}
-
SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString&
rLocalName,
const uno::Reference& xAttrList)
{
@@ -757,13 +751,6 @@ SvXMLImportContext
*SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa
return pFSContext;
}
-SvXMLImportContext *SdXMLImport::CreateScriptContext(
- const OUString& rLocalName )
-{
-SvXMLImportContext *pContext = new XMLScriptContext( *this, rLocalName,
GetModel() );
-return pContext;
-}
-
void SdXMLImport::SetViewSettings(const
css::uno::Sequence& aViewProps)
{
uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY
);
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx
b/xmloff/source/draw/sdxmlimp_impl.hxx
index e61f8866ff2f..7205d4867ec8 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -202,9 +202,6 @@ public:
// the root element (i.e. office:document-meta)
SvXMLImportContext* CreateMetaContext(const sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >&
xAttrList);
-SvXMLImportContext* CreateScriptContext( const OUString& rLocalName );
-SvXMLImportContext* CreateBodyContext(const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
SvXMLStylesContext* CreateStylesContext(const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
SvXMLStylesContext* CreateAutoStylesContext(const OUString& rLocalName,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLSectionSourceImportContext.cxx | 52 +--
xmloff/source/text/XMLSectionSourceImportContext.hxx |6 +-
2 files changed, 40 insertions(+), 18 deletions(-)
New commits:
commit 55f224ff57cf16057e0493ee4f9b8a14132d7ec1
Author: Noel Grandin
AuthorDate: Sun Jan 19 12:08:09 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 19 18:36:34 2020 +0100
tdf#129883 Section links are lost on save and reload
Revert "convert XMLSectionSourceImportContext to FastParser APIs"
This reverts commit ccdcc25a085299bda45bc5ea4b3594e856f2d315.
THis was one of my earliest fastparser attempts before I properly
understood the weirde workings of the SvImportXML stuff.
Change-Id: I729467cb513740d36c0483eb6f8c84ffa4cab578
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87038
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx
b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 82e01979ab0c..2ae4e671f7c0 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -32,7 +32,6 @@
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-using ::com::sun::star::xml::sax::XFastAttributeList;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -53,31 +52,54 @@
XMLSectionSourceImportContext::~XMLSectionSourceImportContext()
{
}
+namespace {
+enum XMLSectionSourceToken
+{
+XML_TOK_SECTION_XLINK_HREF,
+XML_TOK_SECTION_TEXT_FILTER_NAME,
+XML_TOK_SECTION_TEXT_SECTION_NAME
+};
+
+}
+
+static const SvXMLTokenMapEntry aSectionSourceTokenMap[] =
+{
+{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF },
+{ XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
+{ XML_NAMESPACE_TEXT, XML_SECTION_NAME,
+XML_TOK_SECTION_TEXT_SECTION_NAME },
+XML_TOKEN_MAP_END
+};
+
-void XMLSectionSourceImportContext::startFastElement(sal_Int32 /*nElement*/,
-const Reference & xAttrList)
+void XMLSectionSourceImportContext::StartElement(
+const Reference & xAttrList)
{
+static const SvXMLTokenMap aTokenMap(aSectionSourceTokenMap);
OUString sURL;
OUString sFilterName;
OUString sSectionName;
-sax_fastparser::FastAttributeList *pAttribList =
-sax_fastparser::FastAttributeList::castToFastAttributeList(
xAttrList );
-
-for (auto &aIter : *pAttribList)
+sal_Int16 nLength = xAttrList->getLength();
+for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
{
-switch (aIter.getToken())
+OUString sLocalName;
+sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
+ &sLocalName );
+
+switch (aTokenMap.Get(nPrefix, sLocalName))
{
-case XML_ELEMENT(XLINK, XML_HREF):
-sURL = aIter.toString();
+case XML_TOK_SECTION_XLINK_HREF:
+sURL = xAttrList->getValueByIndex(nAttr);
break;
-case XML_ELEMENT(TEXT, XML_FILTER_NAME):
-sFilterName = aIter.toString();
+case XML_TOK_SECTION_TEXT_FILTER_NAME:
+sFilterName = xAttrList->getValueByIndex(nAttr);
break;
-case XML_ELEMENT(TEXT, XML_SECTION_NAME):
-sSectionName = aIter.toString();
+case XML_TOK_SECTION_TEXT_SECTION_NAME:
+sSectionName = xAttrList->getValueByIndex(nAttr);
break;
default:
@@ -105,7 +127,7 @@ void
XMLSectionSourceImportContext::startFastElement(sal_Int32 /*nElement*/,
}
}
-void XMLSectionSourceImportContext::endFastElement(sal_Int32 /*nElement*/)
+void XMLSectionSourceImportContext::EndElement()
{
// this space intentionally left blank.
}
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx
b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index 838375ff7e78..865e9753ff6f 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -45,10 +45,10 @@ public:
protected:
-virtual void SAL_CALL startFastElement(sal_Int32 nElement,
-const css::uno::Reference &
xAttrList) override;
+virtual void StartElement(
+const css::uno::Reference & xAttrList)
override;
-virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
+virtual void EndElement() override;
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1d4057dab15c297ffaa0288e57457128eba56982 Author: Stanislav Horacek AuthorDate: Sun Jan 19 17:13:07 2020 +0100 Commit: Gerrit Code Review CommitDate: Sun Jan 19 17:13:07 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9fd6ef91a65053fd77a4ab19f3ce0486cd2915cb - update name of option to export whole sheet per page Change-Id: I58958f3ec3f80e15ff91bdf10c657b3942689279 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87041 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index fb0dc909685c..9fd6ef91a650 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fb0dc909685c512937906fa1c1b2ffab912907d1 +Subproject commit 9fd6ef91a65053fd77a4ab19f3ce0486cd2915cb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 51cb4c23563307417818106446152e5adc311ab7 Author: Stanislav Horacek AuthorDate: Sun Jan 19 17:13:40 2020 +0100 Commit: Gerrit Code Review CommitDate: Sun Jan 19 17:13:40 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b63d130b4eb4594a4f360b6ae240dd905a8b789a - fix typo Change-Id: I91a4c2c8053c013ce5e6f243c8413fc864a5aa2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87040 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 9fd6ef91a650..b63d130b4eb4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9fd6ef91a65053fd77a4ab19f3ce0486cd2915cb +Subproject commit b63d130b4eb4594a4f360b6ae240dd905a8b789a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05210200.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b63d130b4eb4594a4f360b6ae240dd905a8b789a Author: Stanislav Horacek AuthorDate: Sun Jan 19 12:18:31 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sun Jan 19 17:13:40 2020 +0100 fix typo Change-Id: I91a4c2c8053c013ce5e6f243c8413fc864a5aa2a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87040 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index e60375f8e..3c9b2fbcb 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -50,7 +50,7 @@ Recent colors Displays the recent selected colors. Custom Palette -Click Add to open a dialog to set a name far the custom color. The palette changes to "custom". +Click Add to open a dialog to set a name for the custom color. The palette changes to "custom". Click Delete to delete the color from the custom palette. You cannot add or delete colors of the palettes provided by your installation. Active ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/ref_pdf_export_general.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fd6ef91a65053fd77a4ab19f3ce0486cd2915cb Author: Stanislav Horacek AuthorDate: Sun Jan 19 12:19:48 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sun Jan 19 17:13:07 2020 +0100 update name of option to export whole sheet per page Change-Id: I58958f3ec3f80e15ff91bdf10c657b3942689279 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87041 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/01/ref_pdf_export_general.xhp b/source/text/shared/01/ref_pdf_export_general.xhp index 64ef08a4b..763dbb1ed 100644 --- a/source/text/shared/01/ref_pdf_export_general.xhp +++ b/source/text/shared/01/ref_pdf_export_general.xhp @@ -144,7 +144,7 @@ -Full sheet previews +Whole sheet export Export one sheet per page. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Digest, Vol 113, Issue 18
Mike Sydwest kirjoitti 19.1.2020 klo 6.33: Hi LO We have made various mods and removed bugs from our application, soon we can show opensource link, which will be good. Our current problem is what is best way register this applications so we do not see Microsoft popup blocking user from opening app. we have joined partner plan, do we need to take some special steps to do this correctly. any help will be appreciated. Michael Wilkinson For context to readers, this is the same topic as https://lists.freedesktop.org/archives/libreoffice/2019-December/083971.html Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: help in writing tests
Shivam Kumar Singh kirjoitti 18.1.2020 klo 22.07: Hi all, My patch for tdf#123847 has been pushed to master and now I need to write unit test for the bug . I went through the wiki but am still having trouble writing one.Could anyone guide me through which kind of test I need to do and how to do that ? That would be https://bugs.documentfoundation.org/show_bug.cgi?id=123841 and not 123847. Draw and Impress unit tests reside in sd/qa/unit. Someone else can comment on the nature of the needed test. Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regarding gsoc 2020
gaurav raj kirjoitti 19.1.2020 klo 7.04: Respected sir/ma'am I am a final year Computer science student and interested to participate in gsoc via linbreoffice. I have been using linbreoffice since a long time and would like to contribute to your organization. Great, we would also like to you to contribute :) Follow these steps: https://wiki.documentfoundation.org/Development/GetInvolved Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Regarding gsoc 2020
Respected sir/ma'am I am a final year Computer science student and interested to participate in gsoc via linbreoffice. I have been using linbreoffice since a long time and would like to contribute to your organization. Thankyou Gaurav Raj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: LibreOffice Digest, Vol 113, Issue 18
Hi LO We have made various mods and removed bugs from our application, soon we can show opensource link, which will be good. Our current problem is what is best way register this applications so we do not see Microsoft popup blocking user from opening app. we have joined partner plan, do we need to take some special steps to do this correctly. any help will be appreciated. Michael Wilkinson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx|4
include/vcl/window.hxx|1 +
vcl/source/outdev/map.cxx | 14 --
vcl/source/window/window3.cxx |9 -
4 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit fcc0fea62a6985699dfa88136f22cb19be6232bd
Author: Adrien Ollier
AuthorDate: Sun Nov 24 11:08:15 2019 +0100
Commit: Mike Kaganski
CommitDate: Sun Jan 19 11:33:40 2020 +0100
tdf#74702: clean up of OutputDevice::SetMapMode
All changes are formatted using clang-format utility.
Change-Id: Icfa7ae22bc06e57c7f7cb512813966dcefd4fc40
Signed-off-by: Adrien Ollier
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/83601
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index d0578b39095a..64ba3f135ad2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1673,6 +1673,10 @@ public:
voidSetRelativeMapMode( const MapMode& rNewMapMode
);
const MapMode& GetMapMode() const { return maMapMode; }
+protected:
+virtual void ImplInitMapModeObjects();
+
+public:
// #i75163#
basegfx::B2DHomMatrix GetViewTransformation() const;
basegfx::B2DHomMatrix GetInverseViewTransformation() const;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8ea622a8898e..a78259c5f222 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -746,6 +746,7 @@ protected:
void ImplClearFontData(bool bNewFontLists) override;
void ImplRefreshFontData(bool bNewFontLists) override;
+void ImplInitMapModeObjects() override;
// FIXME: this is a hack to workaround missing layout functionality
virtual voidImplAdjustNWFSizes();
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 7ac99f6b4a37..92d9e63224e7 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -666,11 +666,7 @@ void OutputDevice::SetMapMode()
// create new objects (clip region are not re-scaled)
mbNewFont = true;
mbInitFont = true;
-if ( GetOutDevType() == OUTDEV_WINDOW )
-{
-if ( static_cast(this)->mpWindowImpl->mpCursor )
-
static_cast(this)->mpWindowImpl->mpCursor->ImplNew();
-}
+ImplInitMapModeObjects();
// #106426# Adapt logical offset when changing mapmode
mnOutOffLogicX = mnOutOffOrigX; // no mapping -> equal offsets
@@ -760,11 +756,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
// create new objects (clip region are not re-scaled)
mbNewFont = true;
mbInitFont = true;
-if ( GetOutDevType() == OUTDEV_WINDOW )
-{
-if ( static_cast(this)->mpWindowImpl->mpCursor )
-static_cast(this)->mpWindowImpl->mpCursor->ImplNew();
-}
+ImplInitMapModeObjects();
// #106426# Adapt logical offset when changing mapmode
mnOutOffLogicX = ImplPixelToLogic( mnOutOffOrigX, mnDPIX,
@@ -778,6 +770,8 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
ImplInvalidateViewTransform();
}
+void OutputDevice::ImplInitMapModeObjects() {}
+
void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode )
{
// do nothing if MapMode did not change
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 565a81eb292e..c99d085f41e5 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
WaitObject::~WaitObject()
{
@@ -55,7 +56,13 @@ void Window::ImplRefreshFontData(bool bNewFontLists)
pChild->ImplRefreshFontData(bNewFontLists);
}
-} /* namespace vcl */
+void Window::ImplInitMapModeObjects()
+{
+OutputDevice::ImplInitMapModeObjects();
+if (mpWindowImpl->mpCursor)
+mpWindowImpl->mpCursor->ImplNew();
+}
+} /* namespace vcl */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
