[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmltbli.cxx | 128 ---
sw/source/filter/xml/xmltbli.hxx |4 -
2 files changed, 54 insertions(+), 78 deletions(-)
New commits:
commit e46be5018d78097f9cd75a36992a2af88652fe4c
Author: Noel
AuthorDate: Fri Nov 27 15:27:33 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 28 08:49:59 2020 +0100
fastparser in SwXMLTableContext
Change-Id: I92e70bce3418c415a1855e0dc11c09fb32040e6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106774
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index e3061074329d..e26da2ab50b0 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -714,8 +714,8 @@ class SwXMLTableColContext_Impl : public SvXMLImportContext
public:
SwXMLTableColContext_Impl(
-SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
-const Reference< xml::sax::XAttributeList > & xAttrList,
+SwXMLImport& rImport,
+const Reference< xml::sax::XFastAttributeList > & xAttrList,
SwXMLTableContext *pTable );
SwXMLImport& GetSwImport() { return
static_cast(GetImport()); }
@@ -724,45 +724,43 @@ public:
}
SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
-SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
-const Reference< xml::sax::XAttributeList > & xAttrList,
+SwXMLImport& rImport,
+const Reference< xml::sax::XFastAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
-SvXMLImportContext( rImport, nPrfx, rLName ),
+SvXMLImportContext( rImport ),
xMyTable( pTable )
{
sal_uInt32 nColRep = 1;
OUString aStyleName, aDfltCellStyleName;
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for( sal_Int16 i=0; i < nAttrCount; i++ )
+for( auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ) )
{
-const OUString& rAttrName = xAttrList->getNameByIndex( i );
-
-OUString aLocalName;
-const sal_uInt16 nPrefix =
-GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
-&aLocalName );
-const OUString& rValue = xAttrList->getValueByIndex( i );
-if( XML_NAMESPACE_TABLE == nPrefix )
+OUString sValue = aIter.toString();
+switch (aIter.getToken())
{
-if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
-aStyleName = rValue;
-else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
+case XML_ELEMENT(TABLE, XML_STYLE_NAME):
+aStyleName = sValue;
+break;
+case XML_ELEMENT(TABLE, XML_NUMBER_COLUMNS_REPEATED):
{
-nColRep = static_cast(std::max(1,
rValue.toInt32()));
+nColRep = static_cast(std::max(1,
sValue.toInt32()));
if (nColRep > 256)
{
SAL_INFO("sw.xml", "ignoring huge
table:number-columns-repeated " << nColRep);
nColRep = 1;
}
+break;
}
-else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
-aDfltCellStyleName = rValue;
-}
-else if ( (XML_NAMESPACE_XML == nPrefix) &&
- IsXMLToken( aLocalName, XML_ID ) )
-{
-//FIXME where to put this??? columns do not actually exist in writer...
+case XML_ELEMENT(TABLE, XML_DEFAULT_CELL_STYLE_NAME):
+aDfltCellStyleName = sValue;
+break;
+case XML_ELEMENT(XML, XML_ID):
+{
+//FIXME where to put this??? columns do not actually exist in
writer...
+break;
+}
+default:
+XMLOFF_WARN_UNKNOWN("sw", aIter);
}
}
@@ -803,13 +801,11 @@ class SwXMLTableColsContext_Impl : public
SvXMLImportContext
public:
SwXMLTableColsContext_Impl(
-SwXMLImport& rImport, sal_uInt16 nPrfx,
-const OUString& rLName,
+SwXMLImport& rImport,
SwXMLTableContext *pTable );
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList > & xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 Element, const css::uno::Reference<
css::xml::sax::XFastAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return
static_cast(GetImport()); }
};
@@ -817,26 +813,23 @@ public:
}
SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl(
-SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLNam
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlconti.cxx | 28
sc/source/filter/xml/xmlconti.hxx |4
2 files changed, 32 deletions(-)
New commits:
commit 19382197332ee94b4725160267e987b447b49245
Author: Noel
AuthorDate: Fri Nov 27 15:12:34 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 28 08:33:19 2020 +0100
fastparser in ScXMLContentContext
Change-Id: Ie189edfb150f90ab079f40d526df06b21845e9da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106772
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/xml/xmlconti.cxx
b/sc/source/filter/xml/xmlconti.cxx
index 1c5d55292fdc..871cabf888be 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -46,34 +46,6 @@ ScXMLContentContext::~ScXMLContentContext()
{
}
-SvXMLImportContextRef ScXMLContentContext::CreateChildContext( sal_uInt16
nPrefix,
-const OUString& rLName,
-const
css::uno::Reference& xAttrList )
-{
-if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_S))
-{
-sal_Int32 nRepeat(0);
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-for( sal_Int16 i=0; i < nAttrCount; ++i )
-{
-const OUString& sAttrName(xAttrList->getNameByIndex( i ));
-const OUString& sAttrValue(xAttrList->getValueByIndex( i ));
-OUString aLocalName;
-sal_uInt16 nPrfx =
GetScImport().GetNamespaceMap().GetKeyByAttrName(
-sAttrName, &aLocalName );
-if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C))
-nRepeat = sAttrValue.toInt32();
-}
-if (nRepeat)
-for (sal_Int32 j = 0; j < nRepeat; ++j)
-sValue.append(' ');
-else
-sValue.append(' ');
-}
-
-return new SvXMLImportContext( GetImport(), nPrefix, rLName );
-}
-
css::uno::Reference< css::xml::sax::XFastContextHandler >
ScXMLContentContext::createFastChildContext(
sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttrList )
{
diff --git a/sc/source/filter/xml/xmlconti.hxx
b/sc/source/filter/xml/xmlconti.hxx
index 7fd2cb0274db..2eb568a27e24 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -36,10 +36,6 @@ public:
virtual ~ScXMLContentContext() override;
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const
css::uno::Reference& xAttrList ) 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;
___
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/draw/ximpstyl.cxx | 23 +++
xmloff/source/draw/ximpstyl.hxx |5 -
2 files changed, 7 insertions(+), 21 deletions(-)
New commits:
commit abdf72c6dc8e021de29459f129e39d6ff279c05c
Author: Noel
AuthorDate: Fri Nov 27 15:03:56 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 28 07:46:35 2020 +0100
fastparser in SdXMLMasterStylesContext
Change-Id: Ia521fe187f69e7efd3ec87b9ed1e2cbb395b26e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106771
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 8cf89f450484..3a25c4c65027 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1307,7 +1307,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler
> SdXMLMasterStylesConte
sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
{
-if( nElement == XML_ELEMENT(STYLE, XML_MASTER_PAGE) )
+if( nElement == XML_ELEMENT(DRAW, XML_LAYER_SET) )
+{
+return new SdXMLLayerSetContext( GetImport() );
+}
+else if( nElement == XML_ELEMENT(STYLE, XML_MASTER_PAGE) )
{
// style:masterpage inside office:styles context
uno::Reference< drawing::XDrawPage > xNewMasterPage;
@@ -1357,24 +1361,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler
> SdXMLMasterStylesConte
}
}
}
+else
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
return nullptr;
}
-SvXMLImportContextRef SdXMLMasterStylesContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/)
-{
-SvXMLImportContextRef xContext;
-
-if( (nPrefix == XML_NAMESPACE_DRAW) && IsXMLToken( rLocalName,
XML_LAYER_SET ) )
-{
-xContext = new SdXMLLayerSetContext( GetImport() );
-}
-
-return xContext;
-}
-
SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport&
rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList)
: SvXMLStyleContext( rImport )
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index a7eee862783c..cebb2f93c3bf 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -224,11 +224,6 @@ public:
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& AttrList ) override;
-
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList
) override;
};
// , and
___
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/XMLFootnoteBodyImportContext.cxx |7 +--
xmloff/source/text/XMLFootnoteBodyImportContext.hxx |6 ---
xmloff/source/text/XMLFootnoteImportContext.cxx | 38 +++-
xmloff/source/text/XMLFootnoteImportContext.hxx |6 +--
4 files changed, 19 insertions(+), 38 deletions(-)
New commits:
commit 818be5ed71d6c4eb515c907add4179100eed6072
Author: Noel
AuthorDate: Fri Nov 27 14:56:19 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 28 06:53:45 2020 +0100
fastparser in XMLFootnoteBodyImportContext
Change-Id: Id822765b23c7251f89f2c3f24136cf5f14762449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106769
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index dc560f624c10..8b0268318355 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -28,11 +28,8 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
-XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext(
-SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName ) :
-SvXMLImportContext(rImport, nPrfx, rLocalName)
+XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext( SvXMLImport&
rImport ) :
+SvXMLImportContext(rImport)
{
}
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 647867a5cdcf..19007558899e 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -37,11 +37,7 @@ class XMLFootnoteBodyImportContext : public
SvXMLImportContext
public:
-
-XMLFootnoteBodyImportContext(
-SvXMLImport& rImport,
-sal_uInt16 nPrfx,
-const OUString& rLocalName );
+XMLFootnoteBodyImportContext( SvXMLImport& rImport );
protected:
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx
b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 645e910c8a36..95a30097675e 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star::uno;
@@ -164,49 +165,38 @@ void XMLFootnoteImportContext::endFastElement(sal_Int32 )
}
}
-SvXMLImportContextRef XMLFootnoteImportContext::CreateChildContext(
-sal_uInt16 p_nPrefix,
-const OUString& rLocalName,
-const Reference & xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler >
XMLFootnoteImportContext::createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttrList )
{
SvXMLImportContextRef xContext;
-static const SvXMLTokenMap aTokenMap(aFootnoteChildTokenMap);
-
-switch(aTokenMap.Get(p_nPrefix, rLocalName))
+switch(nElement)
{
-case XML_TOK_FTN_NOTE_CITATION:
+case XML_ELEMENT(TEXT, XML_NOTE_CITATION):
{
// little hack: we only care for one attribute of the citation
// element. We handle that here, and then return a
// default context.
-sal_Int16 nLength = xAttrList->getLength();
-for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
+for( auto& aIter :
sax_fastparser::castToFastAttributeList(xAttrList) )
{
-OUString sLocalName;
-sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
- &sLocalName );
-
-if ( (nPrefix == XML_NAMESPACE_TEXT) &&
- IsXMLToken( sLocalName, XML_LABEL ) )
-{
-xFootnote->setLabel(xAttrList->getValueByIndex(nAttr));
-}
+if ( aIter.getToken() == XML_ELEMENT(TEXT, XML_LABEL) )
+xFootnote->setLabel(aIter.toString());
}
// ignore content: return default context
break;
}
-case XML_TOK_FTN_NOTE_BODY:
+case XML_ELEMENT(TEXT, XML_NOTE_BODY):
// return footnote body
-xContext = new XMLFootnoteBodyImportContext(GetImport(),
-p_nPrefix, rLocalName);
+xContext = new XMLFootnoteBodyImportContext(GetImport());
break;
+
+default:
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
}
-return xContext;
+return xContext.get();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx
b/xmloff/source/text/XMLFootnoteImportContext.hxx
index 72ad330c876
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/addressbooksource.png |binary icon-themes/elementary/cmd/32/bmpmask.png|binary icon-themes/elementary/cmd/32/decrementlevel.png |binary icon-themes/elementary/cmd/32/decrementsublevels.png |binary icon-themes/elementary/cmd/32/downsearch.png |binary icon-themes/elementary/cmd/32/duplicatepage.png |binary icon-themes/elementary/cmd/32/firstpage.png |binary icon-themes/elementary/cmd/32/firstrecord.png|binary icon-themes/elementary/cmd/32/incrementlevel.png |binary icon-themes/elementary/cmd/32/incrementsublevels.png |binary icon-themes/elementary/cmd/32/lastpage.png |binary icon-themes/elementary/cmd/32/lastrecord.png |binary icon-themes/elementary/cmd/32/movedown.png |binary icon-themes/elementary/cmd/32/movedownsubitems.png |binary icon-themes/elementary/cmd/32/movepagefirst.png |binary icon-themes/elementary/cmd/32/movepagelast.png |binary icon-themes/elementary/cmd/32/moveup.png |binary icon-themes/elementary/cmd/32/moveupsubitems.png |binary icon-themes/elementary/cmd/32/nextpage.png |binary icon-themes/elementary/cmd/32/nextrecord.png |binary icon-themes/elementary/cmd/32/previouspage.png |binary icon-themes/elementary/cmd/32/prevrecord.png |binary icon-themes/elementary/cmd/32/upsearch.png |binary icon-themes/elementary/cmd/lc_addressbooksource.png |binary icon-themes/elementary/cmd/lc_bmpmask.png|binary icon-themes/elementary/cmd/lc_decrementlevel.png |binary icon-themes/elementary/cmd/lc_decrementsublevels.png |binary icon-themes/elementary/cmd/lc_downsearch.png |binary icon-themes/elementary/cmd/lc_firstpage.png |binary icon-themes/elementary/cmd/lc_firstrecord.png|binary icon-themes/elementary/cmd/lc_incrementlevel.png |binary icon-themes/elementary/cmd/lc_incrementsublevels.png |binary icon-themes/elementary/cmd/lc_lastpage.png |binary icon-themes/elementary/cmd/lc_lastrecord.png |binary icon-themes/elementary/cmd/lc_movedown.png |binary icon-themes/elementary/cmd/lc_movedownsubitems.png |binary icon-themes/elementary/cmd/lc_movepagefirst.png |binary icon-themes/elementary/cmd/lc_movepagelast.png |binary icon-themes/elementary/cmd/lc_moveup.png |binary icon-themes/elementary/cmd/lc_moveupsubitems.png |binary icon-themes/elementary/cmd/lc_nextpage.png |binary icon-themes/elementary/cmd/lc_nextrecord.png |binary icon-themes/elementary/cmd/lc_previouspage.png |binary icon-themes/elementary/cmd/lc_prevrecord.png |binary icon-themes/elementary/cmd/lc_upsearch.png |binary icon-themes/elementary/cmd/sc_addressbooksource.png |binary icon-themes/elementary/cmd/sc_bmpmask.png|binary icon-themes/elementary/cmd/sc_decrementlevel.png |binary icon-themes/elementary/cmd/sc_decrementsublevels.png |binary icon-themes/elementary/cmd/sc_downsearch.png |binary icon-themes/elementary/cmd/sc_firstpage.png |binary icon-themes/elementary/cmd/sc_firstrecord.png|binary icon-themes/elementary/cmd/sc_incrementlevel.png |binary icon-themes/elementary/cmd/sc_incrementsublevels.png |binary icon-themes/elementary/cmd/sc_lastpage.png |binary icon-themes/elementary/cmd/sc_lastrecord.png |binary icon-themes/elementary/cmd/sc_movedown.png |binary icon-themes/elementary/cmd/sc_movedownsubitems.png |binary icon-themes/elementary/cmd/sc_movepagefirst.png |binary icon-themes/elementary/cmd/sc_movepagelast.png |binary icon-themes/elementary/cmd/sc_moveup.png |binary icon-themes/elementary/cmd/sc_moveupsubitems.png |binary icon-themes/elementary/cmd/sc_nextpage.png |binary icon-themes/elementary/cmd/sc_nextrecord.png |binary icon-themes/elementary/cmd/sc_previouspage.png |binary icon-themes/elementary/cmd/sc_prevrecord.png |binary icon-themes/elementary/cmd/sc_upsearch.png |binary icon-themes/elementary/links.txt | 87 +-- icon-themes/elementary_svg/cmd/32/addressbooksource.svg |2 icon-themes/elementary_svg/cmd/32/bmpmask.svg|2 icon-themes/elementary_svg/cmd/32/decrementlevel.svg |1 icon-themes/elementary_svg/cmd/32/decrementsublevels.svg |2 icon-themes/elementary_svg/cmd/32/downsearch.svg |2 icon-themes/elementary_svg/cmd/32/duplicatepage.svg |2 icon-themes/elementary_svg/cmd/32/firstpage.svg |1 icon-themes/elementary_svg/cmd/32
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/addressbooksource.png |binary icon-themes/elementary/cmd/32/bmpmask.png|binary icon-themes/elementary/cmd/32/decrementlevel.png |binary icon-themes/elementary/cmd/32/decrementsublevels.png |binary icon-themes/elementary/cmd/32/downsearch.png |binary icon-themes/elementary/cmd/32/duplicatepage.png |binary icon-themes/elementary/cmd/32/firstpage.png |binary icon-themes/elementary/cmd/32/firstrecord.png|binary icon-themes/elementary/cmd/32/incrementlevel.png |binary icon-themes/elementary/cmd/32/incrementsublevels.png |binary icon-themes/elementary/cmd/32/lastpage.png |binary icon-themes/elementary/cmd/32/lastrecord.png |binary icon-themes/elementary/cmd/32/movedown.png |binary icon-themes/elementary/cmd/32/movedownsubitems.png |binary icon-themes/elementary/cmd/32/movepagefirst.png |binary icon-themes/elementary/cmd/32/movepagelast.png |binary icon-themes/elementary/cmd/32/moveup.png |binary icon-themes/elementary/cmd/32/moveupsubitems.png |binary icon-themes/elementary/cmd/32/nextpage.png |binary icon-themes/elementary/cmd/32/nextrecord.png |binary icon-themes/elementary/cmd/32/previouspage.png |binary icon-themes/elementary/cmd/32/prevrecord.png |binary icon-themes/elementary/cmd/32/upsearch.png |binary icon-themes/elementary/cmd/lc_addressbooksource.png |binary icon-themes/elementary/cmd/lc_bmpmask.png|binary icon-themes/elementary/cmd/lc_decrementlevel.png |binary icon-themes/elementary/cmd/lc_decrementsublevels.png |binary icon-themes/elementary/cmd/lc_downsearch.png |binary icon-themes/elementary/cmd/lc_firstpage.png |binary icon-themes/elementary/cmd/lc_firstrecord.png|binary icon-themes/elementary/cmd/lc_incrementlevel.png |binary icon-themes/elementary/cmd/lc_incrementsublevels.png |binary icon-themes/elementary/cmd/lc_lastpage.png |binary icon-themes/elementary/cmd/lc_lastrecord.png |binary icon-themes/elementary/cmd/lc_movedown.png |binary icon-themes/elementary/cmd/lc_movedownsubitems.png |binary icon-themes/elementary/cmd/lc_movepagefirst.png |binary icon-themes/elementary/cmd/lc_movepagelast.png |binary icon-themes/elementary/cmd/lc_moveup.png |binary icon-themes/elementary/cmd/lc_moveupsubitems.png |binary icon-themes/elementary/cmd/lc_nextpage.png |binary icon-themes/elementary/cmd/lc_nextrecord.png |binary icon-themes/elementary/cmd/lc_previouspage.png |binary icon-themes/elementary/cmd/lc_prevrecord.png |binary icon-themes/elementary/cmd/lc_upsearch.png |binary icon-themes/elementary/cmd/sc_addressbooksource.png |binary icon-themes/elementary/cmd/sc_bmpmask.png|binary icon-themes/elementary/cmd/sc_decrementlevel.png |binary icon-themes/elementary/cmd/sc_decrementsublevels.png |binary icon-themes/elementary/cmd/sc_downsearch.png |binary icon-themes/elementary/cmd/sc_firstpage.png |binary icon-themes/elementary/cmd/sc_firstrecord.png|binary icon-themes/elementary/cmd/sc_incrementlevel.png |binary icon-themes/elementary/cmd/sc_incrementsublevels.png |binary icon-themes/elementary/cmd/sc_lastpage.png |binary icon-themes/elementary/cmd/sc_lastrecord.png |binary icon-themes/elementary/cmd/sc_movedown.png |binary icon-themes/elementary/cmd/sc_movedownsubitems.png |binary icon-themes/elementary/cmd/sc_movepagefirst.png |binary icon-themes/elementary/cmd/sc_movepagelast.png |binary icon-themes/elementary/cmd/sc_moveup.png |binary icon-themes/elementary/cmd/sc_moveupsubitems.png |binary icon-themes/elementary/cmd/sc_nextpage.png |binary icon-themes/elementary/cmd/sc_nextrecord.png |binary icon-themes/elementary/cmd/sc_previouspage.png |binary icon-themes/elementary/cmd/sc_prevrecord.png |binary icon-themes/elementary/cmd/sc_upsearch.png |binary icon-themes/elementary/links.txt | 87 +-- icon-themes/elementary_svg/cmd/32/addressbooksource.svg |2 icon-themes/elementary_svg/cmd/32/bmpmask.svg|2 icon-themes/elementary_svg/cmd/32/decrementlevel.svg |1 icon-themes/elementary_svg/cmd/32/decrementsublevels.svg |2 icon-themes/elementary_svg/cmd/32/downsearch.svg |2 icon-themes/elementary_svg/cmd/32/duplicatepage.svg |2 icon-themes/elementary_svg/cmd/32/firstpage.svg |1 icon-themes/elementary_svg/cmd/32
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - connectivity/source
connectivity/source/commontools/TTableHelper.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 5dae252e76da9c95049ba8124422a1f7b2f10596
Author: Julien Nabet
AuthorDate: Thu Nov 26 23:12:46 2020 +0100
Commit: Julien Nabet
CommitDate: Fri Nov 27 23:01:48 2020 +0100
tdf#137745: crash, when deleting tables and changed relationship isn't
changed
bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=166782
some explanations here:
https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8
Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715
(cherry picked from commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106742
Reviewed-by: Lionel Mamane
Tested-by: Jenkins
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index e86af9673052..03724d669704 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -72,6 +72,11 @@ public:
}
virtual void SAL_CALL elementRemoved( const
css::container::ContainerEvent& Event ) override
{
+// tdf#137745, perhaps connectivity::OTableHelper::disposing() has
been called
+// which called OTableContainerListener::clear(), so m_pComponent may
be null
+if (m_pComponent == nullptr)
+return;
+
OUString sName;
Event.Accessor >>= sName;
if ( m_aRefNames.find(sName) != m_aRefNames.end() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/inc extras/source vcl/Package_tipoftheday.mk
cui/inc/tipoftheday.hrc |8
extras/source/tipoftheday/formdocuments.png |binary
extras/source/tipoftheday/masterdocument.png |binary
extras/source/tipoftheday/printnote.png |binary
extras/source/tipoftheday/statusbar.png |binary
vcl/Package_tipoftheday.mk |4
6 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit dca40f028a6e050ed990a7604c09653af09e5d13
Author: andreas kainz
AuthorDate: Fri Nov 27 08:54:43 2020 +0100
Commit: Andreas Kainz
CommitDate: Fri Nov 27 22:43:52 2020 +0100
tdf#127294 add ToD Previews
Change-Id: Icd049b0ae313e4c3095975a98f8765372fa22abf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106719
Tested-by: Jenkins
Reviewed-by: Andreas Kainz
(cherry picked from commit c12bc5757c021f8ba3f802b26805964a11aaa71d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106733
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f5d06db9657e..95806eb9bff1 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -47,13 +47,13 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user
interface options to make you feel at home"), ".uno:ToolbarModeUI",
"toolbarmode.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a
read-only document in Writer? Insert frames or sections that can authorize
changes."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html";,
"tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ Impress tab and select Notes under Document ▸ Type."), "",
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ Impress tab and select Notes under Document ▸ Type."), "",
"printnote.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user
profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master
document lets you manage large documents as a container for individual
%PRODUCTNAME Writer files."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html";,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF";, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the
status bar (at the bottom of the document window). Place the cursor over each
field for an explanation. If not visible, use View ▸ Status Bar."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets?
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "",
"tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
"formdocuments.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
@@ -66,7 +66,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "",
"tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected
cells/grey background."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html";,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per
toolbar or right click in slide p
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar.ui | 51 +++--- 1 file changed, 41 insertions(+), 10 deletions(-) New commits: commit 9ffec868f9f42eaca7282e70fa0fd85182831777 Author: andreas kainz AuthorDate: Fri Nov 27 09:39:52 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 22:43:26 2020 +0100 writer notebookbar update for 7.1 Change-Id: Id754c59acd5a548fb96b085e63d1e8f39805ca46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106721 Tested-by: Jenkins Reviewed-by: Andreas Kainz (cherry picked from commit c8ca030367180330359ad3b0c6e0fcd8759741e8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106738 diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index b2db8be91554..3a5e5b195fba 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -3365,6 +3365,8 @@ True True +center +True both-horiz False @@ -3389,6 +3391,8 @@ True True +center +True both-horiz False @@ -3442,10 +3446,13 @@ True False +center +True True True +center True @@ -3470,6 +3477,7 @@ True True +center 5 @@ -3493,6 +3501,7 @@ True True +center icons False @@ -3536,10 +3545,12 @@ True False center +True True True +center icons False @@ -3608,6 +3619,7 @@ True False end +center 5 5 True @@ -3624,6 +3636,7 @@ True True +center icons False @@ -3659,6 +3672,7 @@ True False +center 5 5 vertical @@ -3674,6 +3688,7 @@ True True +center icons False @@ -3741,8 +3756,6 @@ True False -center -True True @@ -3769,10 +3782,12 @@ True False center +True True
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/uiconfig
sd/uiconfig/sdraw/ui/notebookbar.ui| 12 ++-- sd/uiconfig/simpress/ui/notebookbar.ui | 49 - 2 files changed, 47 insertions(+), 14 deletions(-) New commits: commit 9273b8bb8dee8ee627d59efa610b18aa4a4ebc4c Author: andreas kainz AuthorDate: Fri Nov 27 10:10:56 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 22:42:58 2020 +0100 impress/draw notebookbar update for 7.1 Change-Id: I85b8fcc5cdc58752d1a9079046e2be26e64a3b74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106724 Tested-by: Jenkins Reviewed-by: Andreas Kainz (cherry picked from commit 364e440e024a4af6a0bdd354ae2bd4bcdd9536c6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106744 diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 918e487e7ed3..512ddb512df7 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -11852,7 +11852,6 @@ False -130 True False center @@ -11877,12 +11876,11 @@ both-horiz False - -130 + True False center -.uno:GrafTransparence +.uno:GrafContrast False @@ -11933,12 +11931,11 @@ both-horiz False - -130 + True False center -.uno:GrafContrast +.uno:GrafTransparence False @@ -11960,7 +11957,6 @@ False -130 True False center diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 72d4edb0c0fb..318f7c61fd67 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3540,6 +3540,8 @@ True True +center +True both-horiz False @@ -3564,6 +3566,8 @@ True True +center +True both-horiz False @@ -3617,10 +3621,13 @@ True False +center +True True True +center True @@ -3645,6 +3652,7 @@ True True +center 5 @@ -3669,6 +3677,7 @@ True True end +center icons False @@ -3712,6 +3721,7 @@ True False center +True
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui | 71 +++- 1 file changed, 63 insertions(+), 8 deletions(-) New commits: commit 50df08ba0b1a54710af4c868d457ee15b865da4b Author: andreas kainz AuthorDate: Fri Nov 27 10:03:37 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 21:36:31 2020 +0100 calc notebookbar update for 7.1 Change-Id: I9b9e09c1ce0681e9a17ca79677d03200b1fc536d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106723 Tested-by: Jenkins Reviewed-by: Andreas Kainz (cherry picked from commit 3fbda6517e4ee345966873d2930c226b890f33e9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106739 diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index f34610b1fc7b..ba90157318e1 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -3229,6 +3229,8 @@ True True +center +True both-horiz False @@ -3253,6 +3255,8 @@ True True +center +True both-horiz False @@ -3312,10 +3316,12 @@ True False +True True True +center True @@ -3340,6 +3346,7 @@ True True +center 5 5 @@ -3364,6 +3371,7 @@ True True +center icons False @@ -3407,10 +3415,12 @@ True False center +True True True +center icons False @@ -3484,6 +3494,7 @@ True True +center icons False @@ -3534,6 +3545,7 @@ True True +center icons False @@ -3639,10 +3651,12 @@ True False center +True True True +center icons False @@ -3697,10 +3711,12 @@ True False center +True True True +center icons False @@ -3784,6 +3800
[Libreoffice-commits] core.git: oox/inc oox/source solenv/clang-format
oox/inc/drawingml/effectpropertiescontext.hxx|5 + oox/source/drawingml/effectpropertiescontext.cxx |2 +- oox/source/drawingml/shapepropertiescontext.cxx |2 +- oox/source/drawingml/themeelementscontext.cxx|2 +- solenv/clang-format/excludelist |2 +- 5 files changed, 5 insertions(+), 8 deletions(-) New commits: commit f2e1685e489c054ea10afc0df52451c74da10cc0 Author: Miklos Vajna AuthorDate: Fri Nov 27 16:58:38 2020 +0100 Commit: Miklos Vajna CommitDate: Fri Nov 27 21:33:33 2020 +0100 oox: make effectpropertiescontext available to everyone in oox/ I plan to use this from oox/source/drawingml/table/tablecontext.cxx for tdf#129961. Change-Id: Id5177467341f9ddf73c6043796ad35e9cc655d37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106781 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/inc/drawingml/effectpropertiescontext.hxx similarity index 85% rename from oox/source/drawingml/effectpropertiescontext.hxx rename to oox/inc/drawingml/effectpropertiescontext.hxx index ce7b5b3ef363..09ec2f02ec80 100644 --- a/oox/source/drawingml/effectpropertiescontext.hxx +++ b/oox/inc/drawingml/effectpropertiescontext.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX +#pragma once #include @@ -35,6 +34,4 @@ private: } -#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index f287c897d891..b7cb03bc08b6 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "effectpropertiescontext.hxx" +#include #include "effectproperties.hxx" #include #include diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index 4591cb834489..574e0793c89a 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "effectpropertiescontext.hxx" +#include #include #include #include diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index e5f84e5a02a0..6fbd62e91d18 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -27,7 +27,7 @@ #include #include #include "effectproperties.hxx" -#include "effectpropertiescontext.hxx" +#include #include #include diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index c7eee25f0f8c..5249848a75d8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -7185,6 +7185,7 @@ oox/inc/drawingml/clrschemecontext.hxx oox/inc/drawingml/colorchoicecontext.hxx oox/inc/drawingml/customshapegeometry.hxx oox/inc/drawingml/customshapeproperties.hxx +oox/inc/drawingml/effectpropertiescontext.hxx oox/inc/drawingml/embeddedwavaudiofile.hxx oox/inc/drawingml/fillproperties.hxx oox/inc/drawingml/graphicproperties.hxx @@ -7303,7 +7304,6 @@ oox/source/drawingml/drawingmltypes.cxx oox/source/drawingml/effectproperties.cxx oox/source/drawingml/effectproperties.hxx oox/source/drawingml/effectpropertiescontext.cxx -oox/source/drawingml/effectpropertiescontext.hxx oox/source/drawingml/fillproperties.cxx oox/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/guidcontext.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/notebookbar.ui| 12 ++-- sd/uiconfig/simpress/ui/notebookbar.ui | 49 - 2 files changed, 47 insertions(+), 14 deletions(-) New commits: commit 364e440e024a4af6a0bdd354ae2bd4bcdd9536c6 Author: andreas kainz AuthorDate: Fri Nov 27 10:10:56 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 21:29:32 2020 +0100 impress/draw notebookbar update for 7.1 Change-Id: I85b8fcc5cdc58752d1a9079046e2be26e64a3b74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106724 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 918e487e7ed3..512ddb512df7 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -11852,7 +11852,6 @@ False -130 True False center @@ -11877,12 +11876,11 @@ both-horiz False - -130 + True False center -.uno:GrafTransparence +.uno:GrafContrast False @@ -11933,12 +11931,11 @@ both-horiz False - -130 + True False center -.uno:GrafContrast +.uno:GrafTransparence False @@ -11960,7 +11957,6 @@ False -130 True False center diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 72d4edb0c0fb..318f7c61fd67 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3540,6 +3540,8 @@ True True +center +True both-horiz False @@ -3564,6 +3566,8 @@ True True +center +True both-horiz False @@ -3617,10 +3621,13 @@ True False +center +True True True +center True @@ -3645,6 +3652,7 @@ True True +center 5 @@ -3669,6 +3677,7 @@ True True end +center icons False @@ -3712,6 +3721,7 @@ True False center +True True @@ -3801,6 +3811,7 @@
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/salgdi.hxx |4 +++-
vcl/source/gdi/salgdilayout.cxx | 28
2 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 0c5f58114cea0fbb7c638726b1ce6bc214fea504
Author: Caolán McNamara
AuthorDate: Fri Nov 27 11:47:35 2020 +
Commit: Caolán McNamara
CommitDate: Fri Nov 27 21:03:47 2020 +0100
with RTL UI the LTR scrollbar in 'gen' calc is rendered incorrectly
this is noticable since...
commit 4deadc3c78949c18bb886eb1f66caa8f3cd7a2df
Date: Fri Sep 25 13:30:11 2020 +0200
disentangle AA and B2D use in VCL drawing
but is probably a problem since around...
commit b5f081e1ac14f60497f62a27be86b07b0baa42f7
Date: Thu Aug 30 23:41:36 2018 +0200
Support RTL layout in VCL using Matrices
Change-Id: I6bcad30982ee1eaee96bc6721d73e1e545f0d86a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 9fa687123bfa..6ed360105d24 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -596,7 +596,9 @@ private:
// for buffering the Mirror-Matrix, see ::getMirror
basegfx::B2DHomMatrix m_aLastMirror;
-tools::Longm_aLastMirrorW;
+tools::Long m_aLastMirrorW;
+tools::Long m_nLastMirrorDeviceLTRButBiDiRtlTranslate;
+boolm_bLastMirrorDeviceLTRButBiDiRtlSet;
protected:
/// flags which hold the SetAntialiasing() value from OutputDevice
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 89089d9755a2..5638cb9bb856 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -58,6 +58,8 @@ SalGraphics::SalGraphics()
: m_nLayout( SalLayoutFlags::NONE ),
m_aLastMirror(),
m_aLastMirrorW(0),
+m_nLastMirrorDeviceLTRButBiDiRtlTranslate(0),
+m_bLastMirrorDeviceLTRButBiDiRtlSet(false),
m_bAntiAlias(false)
{
// read global RTL settings
@@ -316,14 +318,33 @@ const basegfx::B2DHomMatrix& SalGraphics::getMirror(
const OutputDevice* i_pOutD
const tools::Long w = GetDeviceWidth(i_pOutDev);
SAL_WARN_IF( !w, "vcl", "missing graphics width" );
-if(w != m_aLastMirrorW)
+const bool bMirrorDeviceLTRButBiDiRtlSet = i_pOutDev &&
!i_pOutDev->IsRTLEnabled();
+tools::Long nMirrorDeviceLTRButBiDiRtlTranslate(0);
+if (bMirrorDeviceLTRButBiDiRtlSet)
+nMirrorDeviceLTRButBiDiRtlTranslate = w -
i_pOutDev->GetOutputWidthPixel() - (2 * i_pOutDev->GetOutOffXPixel());
+
+// if the device width, or mirror state of the device changed, then
m_aLastMirror is invalid
+bool bLastMirrorValid = w == m_aLastMirrorW &&
bMirrorDeviceLTRButBiDiRtlSet == m_bLastMirrorDeviceLTRButBiDiRtlSet;
+if (bLastMirrorValid && bMirrorDeviceLTRButBiDiRtlSet)
+{
+// if the device is in in the unusual mode of a LTR device, but layout
flags of SalLayoutFlags::BiDiRtl are
+// in use, then the m_aLastMirror is invalid if the distance it should
translate has changed
+bLastMirrorValid = nMirrorDeviceLTRButBiDiRtlTranslate ==
m_nLastMirrorDeviceLTRButBiDiRtlTranslate;
+}
+
+if (!bLastMirrorValid)
{
const_cast(this)->m_aLastMirrorW = w;
+const_cast(this)->m_bLastMirrorDeviceLTRButBiDiRtlSet =
bMirrorDeviceLTRButBiDiRtlSet;
+
const_cast(this)->m_nLastMirrorDeviceLTRButBiDiRtlTranslate =
nMirrorDeviceLTRButBiDiRtlTranslate;
if(w)
{
-if(nullptr != i_pOutDev && !i_pOutDev->IsRTLEnabled())
+if (bMirrorDeviceLTRButBiDiRtlSet)
{
+/* This path gets exercised in calc's RTL UI (e.g.
SAL_RTL_ENABLED=1)
+ with its LTR horizontal scrollbar */
+
// Original code was (removed here already
pOutDevRef->i_pOutDev):
// // mirror this window back
// double devX =
w-i_pOutDev->GetOutputWidthPixel()-i_pOutDev->GetOutOffXPixel(); //
re-mirrored mnOutOffX
@@ -332,8 +353,7 @@ const basegfx::B2DHomMatrix& SalGraphics::getMirror( const
OutputDevice* i_pOutD
// that this works as before, but I have reduced this (by
re-placing and re-formatting) to
// a simple translation:
const_cast(this)->m_aLastMirror =
basegfx::utils::createTranslateB2DHomMatrix(
-w - i_pOutDev->GetOutputWidthPixel() - (2 *
i_pOutDev->GetOutOffXPixel()),
-0.0);
+nMirrorDeviceLTRButBiDiRtlTranslate, 0.0);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/TTableHelper.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd
Author: Julien Nabet
AuthorDate: Thu Nov 26 23:12:46 2020 +0100
Commit: Lionel Mamane
CommitDate: Fri Nov 27 19:08:09 2020 +0100
tdf#137745: crash, when deleting tables and changed relationship isn't
changed
bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=166782
some explanations here:
https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8
Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715
Tested-by: Jenkins
Reviewed-by: Lionel Mamane
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index e86af9673052..03724d669704 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -72,6 +72,11 @@ public:
}
virtual void SAL_CALL elementRemoved( const
css::container::ContainerEvent& Event ) override
{
+// tdf#137745, perhaps connectivity::OTableHelper::disposing() has
been called
+// which called OTableContainerListener::clear(), so m_pComponent may
be null
+if (m_pComponent == nullptr)
+return;
+
OUString sName;
Event.Accessor >>= sName;
if ( m_aRefNames.find(sName) != m_aRefNames.end() )
___
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.2' - download.lst external/pdfium RepositoryExternal.mk svx/source vcl/qa
RepositoryExternal.mk |1 download.lst |4 - external/pdfium/Library_pdfium.mk | 116 +- external/pdfium/UnpackedTarball_pdfium.mk | 13 ++- external/pdfium/build.patch.1 | 110 external/pdfium/c++20-comparison.patch| 13 +++ external/pdfium/ubsan.patch | 26 +++--- external/pdfium/visibility.patch.1| 30 --- external/pdfium/windows7.patch.1 | 34 svx/source/svdraw/svdpdf.cxx | 31 vcl/qa/cppunit/pdfexport/pdfexport.cxx|6 - 11 files changed, 162 insertions(+), 222 deletions(-) New commits: commit d38a0c077ff47de61519f5e0edf65c844651e1c5 Author: Miklos Vajna AuthorDate: Mon Nov 19 09:03:40 2018 +0100 Commit: Miklos Vajna CommitDate: Fri Nov 27 18:32:36 2020 +0100 external: update pdfium from 3550 to 4137 This is a combination of 9 commits, which brings pdfium to the same version as cp-6.4 (ignoring recent changes). This is the 1st commit message: external: update pdfium to 3613 (cherry picked from commit ec11c1aee04eacb00d94a6359f959b990ddb6923) This is the commit message #2: external: update pdfium to 3667 (cherry picked from commit 2044475c8cb33b76591aa6de77dd43a0bf9f5145) Conflicts: solenv/flatpak-manifest.in This is the commit message #3: external: update pdfium to 3730 (cherry picked from commit 8743247493ba90098e3e32cf30de0e8995569852) This is the commit message #4: pdfium: avoid problems with SetForm using WIN32_LEAN_AND_MEAN So that it does not get defined to SetFormA() or SetFormW() and still requires no patching. (cherry picked from commit 66c29fd202f22a36edbb929ddcc1f1cadb0a6e8f) This is the commit message #5: external: update pdfium to 3794 (cherry picked from commit 3dbe66b7895a412ad7ad9aede4be383489d805de) Conflicts: external/pdfium/Library_pdfium.mk This is the commit message #6: external: update pdfium to 3849 (cherry picked from commit 0ee0ca3036629b69bf20b448d74991fd133f08ac) Conflicts: external/pdfium/inc/pch/precompiled_pdfium.hxx This is the commit message #7: external: update pdfium to 3896 (cherry picked from commit 735af14843eab3e75ac9ed6f0773ce7bb3241c8a) Conflicts: external/pdfium/inc/pch/precompiled_pdfium.hxx solenv/flatpak-manifest.in This is the commit message #8: external: update pdfium to 3963 Also simplify visibility.patch.1. (cherry picked from commit 71cb2705af38df7f382014fb68f43bed98abf9b4) Conflicts: solenv/flatpak-manifest.in svx/source/svdraw/svdpdf.cxx This is the commit message #9: external: update pdfium from 3963 to 4137 This is a combination of 6 commits, which brings pdfium to the same version as libreoffice-7-0. (cherry picked from commit 2cd3ddad396043c8c1af2e03bd1c53db084ccbf0) Conflicts: external/pdfium/inc/pch/precompiled_pdfium.hxx solenv/flatpak-manifest.in vcl/qa/cppunit/pdfexport/pdfexport.cxx vcl/source/pdf/PDFiumLibrary.cxx Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106779 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index def5fa9a0e72..5db8ff9b9f06 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4192,6 +4192,7 @@ ifneq ($(ENABLE_PDFIUM),) define gb_LinkTarget__use_pdfium $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,pdfium)/public \ + -DCOMPONENT_BUILD \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),pdfium) diff --git a/download.lst b/download.lst index a265d508d677..5b30906cad23 100644 --- a/download.lst +++ b/download.lst @@ -222,8 +222,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz -export PDFIUM_SHA256SUM := 572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679 -export PDFIUM_TARBALL := pdfium-3550.tar.bz2 +export PDFIUM_SHA256SUM := 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6 +export PDFIUM_TARBALL := pdfium-4137.tar.bz2 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1a0f9a9c56e7b7952b813b3efd34f9be6c853957
Author: Eike Rathke
AuthorDate: Fri Nov 27 13:26:26 2020 +0100
Commit: Eike Rathke
CommitDate: Fri Nov 27 17:24:35 2020 +0100
Consistently use RTL_CONSTASCII_LENGTH(), tdf#136272 follow-up
The mix with SAL_N_ELEMENTS() was confusing and even wrong in one
case.
Change-Id: Ife73342b0efc01ed4e76e217d372fc32500c9b2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106764
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 81fa0cf925b7..6ed4906270e0 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -292,7 +292,7 @@ void doubleToString(typename T::String ** pResult,
constexpr char pDig[] = "7976931348623157";
constexpr char pRou[] = "8087931459623267"; // the only up-carry
is 80
static_assert(SAL_N_ELEMENTS(pDig) == SAL_N_ELEMENTS(pRou), "digit
count mismatch");
-constexpr sal_Int32 nDig2 = SAL_N_ELEMENTS(pRou) - 2;
+constexpr sal_Int32 nDig2 = RTL_CONSTASCII_LENGTH(pRou) - 2;
sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH(pRou) + 8; // + "-1.E+308"
const char pSlot[5][2][3] =
{ // rounded, not
@@ -314,7 +314,7 @@ void doubleToString(typename T::String ** pResult,
T::appendAscii(pResult, pResultCapacity, &nResultOffset,
RTL_CONSTASCII_STRINGPARAM("-"));
-nDecPlaces = std::clamp( nDecPlaces, 0,
SAL_N_ELEMENTS(pRou));
+nDecPlaces = std::clamp( nDecPlaces, 0,
RTL_CONSTASCII_LENGTH(pRou));
if (nDecPlaces == 0)
{
T::appendAscii(pResult, pResultCapacity, &nResultOffset,
@@ -342,7 +342,7 @@ void doubleToString(typename T::String ** pResult,
const size_t nSlot = ((fValue < fB3) ? 4 : ((fValue < fB2) ? 3
: ((fValue < fB1) ? 2 : ((fValue < DBL_MAX) ? 1 :
0;
-T::appendAscii(pResult, pResultCapacity, &nResultOffset, pDig,
nDecPlaces - 1);
+T::appendAscii(pResult, pResultCapacity, &nResultOffset, pDig,
nDecPlaces);
T::appendAscii(pResult, pResultCapacity, &nResultOffset,
pSlot[nSlot][nDec-1], nDec);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/tdf138507.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 14 ++
2 files changed, 14 insertions(+)
New commits:
commit 33e0221cac467d32debe4fab6592517b0c1c195e
Author: Xisco Fauli
AuthorDate: Thu Nov 26 21:16:43 2020 +0100
Commit: Xisco Fauli
CommitDate: Fri Nov 27 15:36:08 2020 +0100
tdf#138507: sc_subsequent_filters: Add unittest
Change-Id: I1b9271d03c6bc61a63436054a74e455ad78bc68a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106712
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf138507.ods
b/sc/qa/unit/data/ods/tdf138507.ods
new file mode 100644
index ..5b83a0dccd5a
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf138507.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2323ee50b4c5..9c087549ec3e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -248,6 +248,7 @@ public:
void testTdf132278();
void testTdf130959();
void testTdf129410();
+void testTdf138507();
void testTdf131380();
void testTdf129681();
void testTdf111974XLSM();
@@ -427,6 +428,7 @@ public:
CPPUNIT_TEST(testTdf132278);
CPPUNIT_TEST(testTdf130959);
CPPUNIT_TEST(testTdf129410);
+CPPUNIT_TEST(testTdf138507);
CPPUNIT_TEST(testTdf131380);
CPPUNIT_TEST(testTdf129681);
CPPUNIT_TEST(testTdf111974XLSM);
@@ -3737,6 +3739,18 @@ void ScFiltersTest::testTdf129410()
xDocSh->DoClose();
}
+void ScFiltersTest::testTdf138507()
+{
+// Would fail to load without the fix
+ScDocShellRef xDocSh = loadDoc("tdf138507.", FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+rDoc.CalcAll(); // perform hard re-calculation.
+
+xDocSh->DoClose();
+}
+
void ScFiltersTest::testTdf131380()
{
ScDocShellRef xDocSh = loadDoc("tdf131380.", FORMAT_XLSX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/inc vcl/source
vcl/inc/salgdi.hxx |4 +++-
vcl/source/gdi/salgdilayout.cxx | 28
2 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 7f876fd0d49527fef03d0248f776143e150feb33
Author: Caolán McNamara
AuthorDate: Fri Nov 27 11:47:35 2020 +
Commit: Caolán McNamara
CommitDate: Fri Nov 27 15:32:56 2020 +0100
with RTL UI the LRT scrollbar in 'gen' calc is rendered incorrectly
this is noticable since...
commit 4deadc3c78949c18bb886eb1f66caa8f3cd7a2df
Date: Fri Sep 25 13:30:11 2020 +0200
disentangle AA and B2D use in VCL drawing
but is probably a problem since around...
commit b5f081e1ac14f60497f62a27be86b07b0baa42f7
Date: Thu Aug 30 23:41:36 2018 +0200
Support RTL layout in VCL using Matrices
Change-Id: I6bcad30982ee1eaee96bc6721d73e1e545f0d86a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106737
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 9fa687123bfa..6ed360105d24 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -596,7 +596,9 @@ private:
// for buffering the Mirror-Matrix, see ::getMirror
basegfx::B2DHomMatrix m_aLastMirror;
-tools::Longm_aLastMirrorW;
+tools::Long m_aLastMirrorW;
+tools::Long m_nLastMirrorDeviceLTRButBiDiRtlTranslate;
+boolm_bLastMirrorDeviceLTRButBiDiRtlSet;
protected:
/// flags which hold the SetAntialiasing() value from OutputDevice
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 89089d9755a2..5638cb9bb856 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -58,6 +58,8 @@ SalGraphics::SalGraphics()
: m_nLayout( SalLayoutFlags::NONE ),
m_aLastMirror(),
m_aLastMirrorW(0),
+m_nLastMirrorDeviceLTRButBiDiRtlTranslate(0),
+m_bLastMirrorDeviceLTRButBiDiRtlSet(false),
m_bAntiAlias(false)
{
// read global RTL settings
@@ -316,14 +318,33 @@ const basegfx::B2DHomMatrix& SalGraphics::getMirror(
const OutputDevice* i_pOutD
const tools::Long w = GetDeviceWidth(i_pOutDev);
SAL_WARN_IF( !w, "vcl", "missing graphics width" );
-if(w != m_aLastMirrorW)
+const bool bMirrorDeviceLTRButBiDiRtlSet = i_pOutDev &&
!i_pOutDev->IsRTLEnabled();
+tools::Long nMirrorDeviceLTRButBiDiRtlTranslate(0);
+if (bMirrorDeviceLTRButBiDiRtlSet)
+nMirrorDeviceLTRButBiDiRtlTranslate = w -
i_pOutDev->GetOutputWidthPixel() - (2 * i_pOutDev->GetOutOffXPixel());
+
+// if the device width, or mirror state of the device changed, then
m_aLastMirror is invalid
+bool bLastMirrorValid = w == m_aLastMirrorW &&
bMirrorDeviceLTRButBiDiRtlSet == m_bLastMirrorDeviceLTRButBiDiRtlSet;
+if (bLastMirrorValid && bMirrorDeviceLTRButBiDiRtlSet)
+{
+// if the device is in in the unusual mode of a LTR device, but layout
flags of SalLayoutFlags::BiDiRtl are
+// in use, then the m_aLastMirror is invalid if the distance it should
translate has changed
+bLastMirrorValid = nMirrorDeviceLTRButBiDiRtlTranslate ==
m_nLastMirrorDeviceLTRButBiDiRtlTranslate;
+}
+
+if (!bLastMirrorValid)
{
const_cast(this)->m_aLastMirrorW = w;
+const_cast(this)->m_bLastMirrorDeviceLTRButBiDiRtlSet =
bMirrorDeviceLTRButBiDiRtlSet;
+
const_cast(this)->m_nLastMirrorDeviceLTRButBiDiRtlTranslate =
nMirrorDeviceLTRButBiDiRtlTranslate;
if(w)
{
-if(nullptr != i_pOutDev && !i_pOutDev->IsRTLEnabled())
+if (bMirrorDeviceLTRButBiDiRtlSet)
{
+/* This path gets exercised in calc's RTL UI (e.g.
SAL_RTL_ENABLED=1)
+ with its LTR horizontal scrollbar */
+
// Original code was (removed here already
pOutDevRef->i_pOutDev):
// // mirror this window back
// double devX =
w-i_pOutDev->GetOutputWidthPixel()-i_pOutDev->GetOutOffXPixel(); //
re-mirrored mnOutOffX
@@ -332,8 +353,7 @@ const basegfx::B2DHomMatrix& SalGraphics::getMirror( const
OutputDevice* i_pOutD
// that this works as before, but I have reduced this (by
re-placing and re-formatting) to
// a simple translation:
const_cast(this)->m_aLastMirror =
basegfx::utils::createTranslateB2DHomMatrix(
-w - i_pOutDev->GetOutputWidthPixel() - (2 *
i_pOutDev->GetOutOffXPixel()),
-0.0);
+nMirrorDeviceLTRButBiDiRtlTranslate, 0.0);
}
else
{
___
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' - desktop/source
desktop/source/lib/init.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 455cd8fe00d1c756da1bb50a50bac68a1ad645ef
Author: Mert Tumer
AuthorDate: Fri Nov 27 16:56:53 2020 +0300
Commit: Mert Tumer
CommitDate: Fri Nov 27 15:31:59 2020 +0100
Fix unmodified pdf does forced-save
This is a problem when dealing with the large
pdfs which take long amount of time to save.
Adding or removing annotations do change the state of
IsModified()
Change-Id: I872cb3aec5188986cc13c6659e1bb741a6870409
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106778
Reviewed-by: Michael Meeks
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b37c85ffbc63..c9d5e7d1d489 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3841,7 +3841,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument*
pThis, const char* pComma
{
// Check if saving a PDF file
OUString aMimeType = lcl_getCurrentDocumentMimeType(pDocument);
-if (aMimeType == "application/pdf")
+if (pDocSh->IsModified() && aMimeType == "application/pdf")
{
// If we have a PDF file (for saving annotations for example), we
need
// to run save-as to the same file as the opened document. Plain
save
___
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.2' - include/vcl vcl/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben
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/inc/pdfio/pdfdocument.hxx |2
xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p1.pdf |binary
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 27 +-
xmlsecurity/source/helper/pdfsignaturehelper.cxx|5 -
xmlsecurity/source/pdfio/pdfdocument.cxx| 18 ++--
xmlsecurity/workben/pdfverify.cxx |3
10 files changed, 131 insertions(+), 26 deletions(-)
New commits:
commit 9fda2bf1da07f89c1e8613d2b92ea423f68d0c6e
Author: Miklos Vajna
AuthorDate: Mon Oct 19 16:50:07 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Nov 27 15:31:09 2020 +0100
xmlsecurity: handle MDP permission during PDF verify
(cherry picked from commit 586f6abee92af3cdabdce034b607b9a046ed3946)
Conflicts:
include/vcl/filter/PDFiumLibrary.hxx
vcl/source/filter/ipdf/pdfdocument.cxx
vcl/source/pdf/PDFiumLibrary.cxx
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
xmlsecurity/source/helper/pdfsignaturehelper.cxx
(cherry picked from commit 00479937dc071246cc27f33fd6397668448a7ed9)
Change-Id: I626fca7c03079fb0374c577dcfe024e7db6ed5b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106766
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index 7e8ef4e3ad48..33a982b7bf51 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -58,7 +58,7 @@ public:
FPDF_PAGE getPointer() { return mpPage; }
/// Get bitmap checksum of the page, without annotations/commenting.
-BitmapChecksum getChecksum();
+BitmapChecksum getChecksum(int nMDPPerm);
};
struct PDFiumLibrary : public rtl::StaticWithInit,
PDFiumLibrary>
diff --git a/include/vcl/filter/pdfdocument.hxx
b/include/vcl/filter/pdfdocument.hxx
index 56debd53e8c7..06a2618a94ab 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -375,6 +375,7 @@ public:
size_t GetObjectOffset(size_t nIndex) const;
const std::vector>& GetElements();
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.
@@ -400,6 +401,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 655450e28aa0..b668cb2d654a 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -1857,10 +1857,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;
@@ -1880,11 +1878,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");
@@ -1957,6 +1962,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
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e94c60090efe417c2eaf540428bce93b2cc22d60 Author: Seth Chaiklin AuthorDate: Fri Nov 27 15:00:53 2020 +0100 Commit: Gerrit Code Review CommitDate: Fri Nov 27 15:00:53 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to f7bffa21c346dc8ce9db41e8753bef8d033968d9 - tdf#137680 update Options - View help page, including Skia + Add "Shortcut" label and description + Add "from" label * "User Interface" --> "Icon Size" * change OpenGL to "Skia" and add sys switch to only show for WIN * Re-organize order of presentation of controls to correspond to dialog box - remove sys switch for screen font antialiasing - remove inline sys switch for Win and its content about icon size (Thanks to Ilmari Lauhakangas for help about sys differences and Luboš Luňák for explanations about Skia and hardware acceleration.) Change-Id: I4eca72fb3e2a6aa312dc0b06d0a060df453cc3ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106140 Tested-by: Jenkins Reviewed-by: Luboš Luňák Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index e95e2a6d94ac..f7bffa21c346 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e95e2a6d94ac5c08d3821f3da198a7982b7d0af8 +Subproject commit f7bffa21c346dc8ce9db41e8753bef8d033968d9 ___ 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/optionen/01010800.xhp | 89 +++ 1 file changed, 45 insertions(+), 44 deletions(-) New commits: commit f7bffa21c346dc8ce9db41e8753bef8d033968d9 Author: Seth Chaiklin AuthorDate: Fri Nov 20 00:53:43 2020 +0100 Commit: Seth Chaiklin CommitDate: Fri Nov 27 15:00:53 2020 +0100 tdf#137680 update Options - View help page, including Skia + Add "Shortcut" label and description + Add "from" label * "User Interface" --> "Icon Size" * change OpenGL to "Skia" and add sys switch to only show for WIN * Re-organize order of presentation of controls to correspond to dialog box - remove sys switch for screen font antialiasing - remove inline sys switch for Win and its content about icon size (Thanks to Ilmari Lauhakangas for help about sys differences and Luboš Luňák for explanations about Skia and hardware acceleration.) Change-Id: I4eca72fb3e2a6aa312dc0b06d0a060df453cc3ac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106140 Tested-by: Jenkins Reviewed-by: Luboš Luňák Reviewed-by: Seth Chaiklin diff --git a/source/text/shared/optionen/01010800.xhp b/source/text/shared/optionen/01010800.xhp index 414c02147..2849884b7 100644 --- a/source/text/shared/optionen/01010800.xhp +++ b/source/text/shared/optionen/01010800.xhp @@ -26,8 +26,6 @@ - - views; defaults @@ -40,12 +38,11 @@ font lists font name box mouse; positioning + mouse; middle button clipboard; selection clipboard selection clipboard - OpenGL;settings - OpenGL;blacklist - OpenGL;whitelist - OpenGL;graphics output + Skia;settings + Skia;graphics output notebook bar;icon size @@ -60,42 +57,41 @@ -User Interface - + + +Icon style +Specifies the icon style for icons in toolbars and dialogs. -Toolbar icon size -Specifies the display size of toolbar icons. The Automatic option uses the font size settings of your operating system for menus. - - +Icon Size + -Sidebar icon size -Specifies the display size of sidebar icons. +Toolbar +Specifies the display size of toolbar icons. -Notebook bar icon size +Notebookbar Specifies the display size of notebook bar icons. - -Icon style -Specifies the icon style for icons in toolbars and dialogs. - - - + +Sidebar +Specifies the display size of sidebar icons. -Screen font antialiasing -Select to smooth the screen appearance of text. - -Enter the smallest font size to apply antialiasing. - - +Visibility + + +Menu icons +Displays icons next to the corresponding menu items. Select from "Automatic", "Hide" and "Show". "Automatic" displays icons according to system settings and themes. + +Shortcuts +Displays shortcut keys next to corresponding menu items. Select from "Automatic", "Hide", and "Show". "Automatic" displays shortcut keys according to system settings. Mouse -Mouse positioning +Positioning Specifies if and how the mouse pointer will be positioned in newly opened dialogs. -Middle mouse button +Middle button Defines the function of the middle mouse button. @@ -154,10 +150,9 @@ - -Graphics output - Press Shift+Ctrl+R to restore or refresh the view of the current document. +Graphics Output + Use hardware acceleration @@ -167,23 +162,29 @@ Use Anti-Aliasing When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts. -Use OpenGL for all rendering (on restart) -Use the high performance Open Graphics Library (OpenGL) to render all visual elements of the application, including windows, menus, toolbars and icons. OpenGL uses the computer graphics device to accelerate the graphics rendering. If the device is blacklisted (see below) this option will not be effective. - -Force OpenGL even if blacklisted (on restart) -Forces the use of OpenGL even if the graphics device is blacklisted. A device is blacklisted when it is buggy or may render graphics with poor quality. - -Menu - - -Icons in menus -Displays icons next to the corresponding menu items. Select from "Automatic", "Hide" and "Show". "Automatic" displays icons according to system settings and themes. +Only WIN gets Skia controls in 7.1 + + +Use Skia for all rendering (on restart) +Use the high performance Skia graphics engine to render all visual elements of the application, including windows, menus, toolbars and icons. Skia uses the computer graphics device to accelerate the graphics rendering. + +Force Skia software rendering (on restart) +Select this control to disable Skia's use of the computer graphics device. +During installation, %PRODUCTNAME chooses the best options for configuring the Skia graphics engine. Normally you do not need to change the default settings if Skia is enabled. +If you experience graphical display problems (e.g., with t
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/win/salframe.h |4 ++--
vcl/win/window/salframe.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f4a021a196e8f71b92d9e6b4021a99526cb5cc72
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 11:15:07 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 14:27:21 2020 +0100
WinSalFrame::mnWidth/Height should presumably be of type LONG
...as they are only ever set to LO-/HIWORD values cast to a signed integer
type
Change-Id: I82f9a80bab7c3b7e3ee5545725efd0d88601b8c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106755
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 05f907dc66b9..5068ecd987aa 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -41,8 +41,8 @@ public:
SystemEnvData maSysData; // system data
SalFrameState maState = {}; // frame state
int mnShowState;// show state
-longmnWidth;// client width in pixeln
-longmnHeight; // client height in pixeln
+LONGmnWidth;// client width in pixeln
+LONGmnHeight; // client height in pixeln
int mnMinWidth; // min. client width in
pixeln
int mnMinHeight;// min. client height in
pixeln
int mnMaxWidth; // max. client width in
pixeln
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 34a569be39ab..3454ebf885c8 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -4025,8 +4025,8 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam,
LPARAM lParam )
{
UpdateFrameGeometry( hWnd, pFrame );
-pFrame->mnWidth = static_cast(LOWORD(lParam));
-pFrame->mnHeight = static_cast(HIWORD(lParam));
+pFrame->mnWidth = static_cast(LOWORD(lParam));
+pFrame->mnHeight = static_cast(HIWORD(lParam));
// save state
ImplSaveFrameState( pFrame );
// Call Hdl
___
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/DWriteTextRenderer.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 092ec538045f443dce3e45ff73064eb46d0a4fc0
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 11:10:56 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 14:26:58 2020 +0100
DWRITE_GLYPH_METRICS members are of INT32 and UINT32 types
Change-Id: Ie09e0150bf73efd552e3a3b455ffc395d6b6370c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106754
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx
b/vcl/win/gdi/DWriteTextRenderer.cxx
index 185925ae7967..abf9be7d5f86 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -349,10 +349,10 @@ std::vector
D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t
auto pOut = aOut.begin();
for (auto &m : metrics)
{
-const long left = m.leftSideBearing,
- top = m.topSideBearing - m.verticalOriginY,
- right = m.advanceWidth - m.rightSideBearing,
- bottom = INT32(m.advanceHeight) - m.verticalOriginY -
m.bottomSideBearing;
+const auto left = m.leftSideBearing;
+const auto top = m.topSideBearing - m.verticalOriginY;
+const auto right = m.advanceWidth - m.rightSideBearing;
+const auto bottom = INT32(m.advanceHeight) - m.verticalOriginY -
m.bottomSideBearing;
// Scale to screen space.
pOut->SetLeft( std::floor(left * mlfEmHeight /
aFontMetrics.designUnitsPerEm) );
___
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/salnativewidgets-luna.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4ca0a15af2a1bd9386f5a0d93e9616cf1d818535
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 11:07:53 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 14:26:31 2020 +0100
RECT members are of type LONG
Change-Id: I8c0ad0878903c729be7149f81f5844a4baea7883
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106753
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index 793b061e0e5c..9b50c7405d52 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -437,10 +437,10 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
{
if ( rc.top == 0 && bHorizontal )
{
-const long GRADIENT_HEIGHT = 32;
+const int GRADIENT_HEIGHT = 32;
-long gradient_break = rc.top;
-long gradient_bottom = rc.bottom - 1;
+LONG gradient_break = rc.top;
+LONG gradient_bottom = rc.bottom - 1;
GRADIENT_RECT g_rect[1] = { { 0, 1 } };
// very slow gradient at the top (if we have space for that)
@@ -478,7 +478,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
// when done for the vertical ones too
if ( bHorizontal )
{
-long from_x, from_y, to_x, to_y;
+LONG from_x, from_y, to_x, to_y;
from_x = rc.left;
to_x = rc.right;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-15'
Tag 'cp-6.4-15' created by Andras Timar at 2020-11-27 13:09 + cp-6.4-15 Changes since co-6.4-15: Tor Lillqvist (1): tdf#138481: Trust the break iterator character data in a bundled ICU --- i18npool/CustomTarget_breakiterator.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-15'
Tag 'cp-6.4-15' created by Andras Timar at 2020-11-27 13:09 + cp-6.4-15 Changes since cp-6.4-9-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-15'
Tag 'cp-6.4-15' created by Andras Timar at 2020-11-27 13:09 + cp-6.4-15 Changes since cp-6.4-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-15'
Tag 'cp-6.4-15' created by Andras Timar at 2020-11-27 13:09 + cp-6.4-15 Changes since cp-6.4-7: Andras Timar (1): more/better suggestions for Spanish --- es/es_ANY.aff |3 +++ es/es_ANY.dic | 20 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) --- ___ 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/salnativewidgets-luna.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25aad15042f45682211ab318dc0e2c004d61c72c
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 11:05:57 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 14:03:35 2020 +0100
LOGFONTW::lfHeight is of type LONG
Change-Id: Iec7e8e84b8a6ee9e4ddbbbf5708bf9040418bbb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106752
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index 95b95861586f..793b061e0e5c 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1425,7 +1425,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType
nType,
aNonClientMetrics.cbSize = sizeof( aNonClientMetrics );
if ( SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, sizeof(
aNonClientMetrics ), &aNonClientMetrics, 0 ) )
{
-long nFontHeight = aNonClientMetrics.lfMessageFont.lfHeight;
+LONG nFontHeight = aNonClientMetrics.lfMessageFont.lfHeight;
if( nFontHeight < 0 )
nFontHeight = -nFontHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui | 71 +++- 1 file changed, 63 insertions(+), 8 deletions(-) New commits: commit 3fbda6517e4ee345966873d2930c226b890f33e9 Author: andreas kainz AuthorDate: Fri Nov 27 10:03:37 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 13:57:09 2020 +0100 calc notebookbar update for 7.1 Change-Id: I9b9e09c1ce0681e9a17ca79677d03200b1fc536d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106723 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index f34610b1fc7b..ba90157318e1 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -3229,6 +3229,8 @@ True True +center +True both-horiz False @@ -3253,6 +3255,8 @@ True True +center +True both-horiz False @@ -3312,10 +3316,12 @@ True False +True True True +center True @@ -3340,6 +3346,7 @@ True True +center 5 5 @@ -3364,6 +3371,7 @@ True True +center icons False @@ -3407,10 +3415,12 @@ True False center +True True True +center icons False @@ -3484,6 +3494,7 @@ True True +center icons False @@ -3534,6 +3545,7 @@ True True +center icons False @@ -3639,10 +3651,12 @@ True False center +True True True +center icons False @@ -3697,10 +3711,12 @@ True False center +True True True +center icons False @@ -3784,6 +3800,7 @@ True False center +
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/salprn.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f813a5d68af4e856a260cc1b6ec8813ed99db3bf
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:56:25 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:49:14 2020 +0100
DocumentPropertiesW returns LONG
Change-Id: I1ee167ef1bca530be9399dd081d7d25bd4155794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106750
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0deb814880e4..e7a6936364f5 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -281,7 +281,7 @@ static bool ImplTestSalJobSetup( WinSalInfoPrinter const *
pPrinter,
BYTE const * pDriverData = reinterpret_cast(pSalDriverData) + pSalDriverData->mnDriverOffset;
pDevModeW = reinterpret_cast(pDriverData);
-long nSysJobSize = -1;
+LONG nSysJobSize = -1;
if( pPrinter && pDevModeW )
{
// just too many driver crashes in that area -> check the
dmSpecVersion and dmDriverVersion fields always !!!
___
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/salnativewidgets-luna.cxx | 12 ++--
vcl/win/window/salframe.cxx |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e99897ff2854c1f37bbbe3cc7bf8738495403f6e
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 11:01:35 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:48:47 2020 +0100
loplugin:toolslong (Library_vclplug_win)
Change-Id: I1e8c02a4fdb42a7bbc25764ceaf96972f175130a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106751
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index 68a18b020733..95b95861586f 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1008,7 +1008,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME
hTheme, RECT rc,
if( vsAPI.GetThemeBackgroundContentRect( hTheme, hDC, PP_BAR, iState,
&rc, &aProgressRect) != S_OK )
return false;
-long nProgressWidth = aValue.getNumericVal();
+tools::Long nProgressWidth = aValue.getNumericVal();
nProgressWidth *= (aProgressRect.right - aProgressRect.left);
nProgressWidth /= (rc.right - rc.left);
if( AllSettings::GetLayoutRTL() )
@@ -1028,13 +1028,13 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME
hTheme, RECT rc,
RECT aTRect = rc;
if( nPart == ControlPart::TrackHorzArea )
{
-long nH = aTrackRect.GetHeight();
+tools::Long nH = aTrackRect.GetHeight();
aTRect.top += (rc.bottom - rc.top - nH)/2;
aTRect.bottom = aTRect.top + nH;
}
else
{
-long nW = aTrackRect.GetWidth();
+tools::Long nW = aTrackRect.GetWidth();
aTRect.left += (rc.right - rc.left - nW)/2;
aTRect.right = aTRect.left + nW;
}
@@ -1138,7 +1138,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME
hTheme, RECT rc,
tools::Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
MENU_POPUPSEPARATOR, 0, tools::Rectangle( rc.left, rc.top,
rc.right, rc.bottom ) ) );
// center the separator inside the passed rectangle
-long nDY = ((rc.bottom - rc.top + 1) - aRect.GetHeight()) / 2;
+auto const nDY = ((rc.bottom - rc.top + 1) -
aRect.GetHeight()) / 2;
rc.top += nDY;
rc.bottom = rc.top+aRect.GetHeight()-1;
return ImplDrawTheme( hTheme, hDC, MENU_POPUPSEPARATOR, 0, rc,
aCaption );
@@ -1478,7 +1478,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType
nType,
tools::Rectangle aThumbRect = ImplGetThemeRect( hTheme, hDC,
iPart, iState, tools::Rectangle() );
if( nPart == ControlPart::ThumbHorz )
{
-long nW = aThumbRect.GetWidth();
+tools::Long nW = aThumbRect.GetWidth();
tools::Rectangle aRect( rControlRegion );
aRect.SetRight( aRect.Left() + nW - 1 );
rNativeContentRegion = aRect;
@@ -1486,7 +1486,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType
nType,
}
else
{
-long nH = aThumbRect.GetHeight();
+tools::Long nH = aThumbRect.GetHeight();
tools::Rectangle aRect( rControlRegion );
aRect.SetBottom( aRect.Top() + nH - 1 );
rNativeContentRegion = aRect;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index e016430611ad..34a569be39ab 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2580,7 +2580,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const
LOGFONTW& rLogFont, vcl::Fon
static tools::Long ImplW2I( const wchar_t* pStr )
{
-longn = 0;
+tools::Long n = 0;
int nSign = 1;
if ( *pStr == '-' )
___
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.2' - include/vcl vcl/source xmlsecurity/Library_xmlsecurity.mk xmlsecurity/qa xmlsecurity/source xmlsecurity/workben
include/vcl/filter/PDFiumLibrary.hxx |
30
vcl/source/pdf/PDFiumLibrary.cxx |
32
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|
18 ++
xmlsecurity/source/pdfio/pdfdocument.cxx |
70 ++
xmlsecurity/workben/pdfverify.cxx |
5
7 files changed, 157 insertions(+), 3 deletions(-)
New commits:
commit 9d27b59f64a1c04a27cf5fa0c91245a74b063bdf
Author: Miklos Vajna
AuthorDate: Fri Sep 4 17:17:48 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Nov 27 13:38:20 2020 +0100
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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106762
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index bc7912c17e81..7e8ef4e3ad48 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -17,6 +17,9 @@
#include
#include
#include
+#include
+
+#include
namespace vcl::pdf
{
@@ -31,6 +34,33 @@ 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);
+}
+
+FPDF_PAGE getPointer() { return mpPage; }
+
+/// Get bitmap checksum of the page, without annotations/commenting.
+BitmapChecksum getChecksum();
+};
+
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..5b4c56a3cef3 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -15,6 +15,10 @@
#include
#include
+#include
+
+#include
+
namespace vcl::pdf
{
PDFium::PDFium()
@@ -29,6 +33,34 @@ PDFium::PDFium()
PDFium::~PDFium() { FPDF_DestroyLibrary(); }
+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=*/0, /*flags=*/0);
+Bitmap aBitmap(Size(nPageWidth, nPageHeight), 24);
+{
+BitmapScopedWriteAccess pWriteAccess(aBitmap);
+const auto pPdfBuffer =
static_cast(FPDFBitmap_GetBuffer(pPdfBitmap));
+const int nStride = FPDFBitmap_GetStride(pPdfBitmap);
+for (size_t nRow = 0; nRow < nPageHeight; ++nRow)
+{
+ConstScanline pPdfLine = pPdfBuffer + (nStride * nRow);
+pWriteAccess->CopyScanline(nRow, pPdfLine,
ScanlineFormat::N32BitTcBgra, nStride);
+}
+}
+return aBitmap.GetChecksum();
+}
+
} // end vcl::pdf
#endif // HAVE_FEATURE_PDFIUM
diff --git a/xmlsecurity/Library_xmlsecurity.mk
b/xmlsecurity/Library_xmlsecurity.mk
index 9a65dd2152a9..0ad912d5e0cc 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -20,7 +20,10 @@ $(eval $(call gb_Library_add_defs,xmlsecurity,\
-DXMLSECURITY_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_use_externals,xmlsecurity,boost_headers))
+$(eval $(call gb_Library_use_externals,xmlsecurity,\
+ boost_headers \
+ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
+))
$(eval $(call
gb_Library_set_precompiled_header,xmlsecurity,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xmlsecurity))
diff --git
a/xmlsecurity/qa/unit/signing/data/hide-and-replace-shadow-file-signed-2.pdf
b/xmlsecurity/qa/unit/signing/data/hide-and-replace-shadow-file-signed-2.pdf
n
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4743b3153f4a191f9430ff962033b39526206fb1
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 08:22:33 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Nov 27 13:25:44 2020 +0100
Adapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601
..."Update language-subtag-registry to 2020-09-29"
Change-Id: Idea4df8f6a920cbceb37d5156417f6979d7a4fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106718
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 25bb4c31a68acd4526176580be72a9d4d626d013)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106731
Reviewed-by: Caolán McNamara
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0719073025ed..1da85580037d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -255,10 +255,10 @@
"dest-filename":
"external/tarballs/libfreehand-0.1.2.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";,
-"sha256":
"fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da",
+"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";,
+"sha256":
"cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f",
"type": "file",
-"dest-filename":
"external/tarballs/language-subtag-registry-2020-04-01.tar.bz2"
+"dest-filename":
"external/tarballs/language-subtag-registry-2020-09-29.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
___
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/salprn.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a27fbebc5bcb69a1b2664a5ffa31e5d8bb7d225
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:54:48 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:20:14 2020 +0100
GetLastError returns DWORD
Change-Id: I4e886d1d5f94f8a25591c41e9f03300cfba641dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106729
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index d552d17ed96b..0deb814880e4 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1509,7 +1509,7 @@ bool WinSalPrinter::StartJob( const OUString* pFileName,
if ( nRet <= 0 )
{
-long nError = GetLastError();
+DWORD nError = GetLastError();
if ( (nRet == SP_USERABORT) || (nRet == SP_APPABORT) || (nError ==
ERROR_PRINT_CANCELLED) || (nError == ERROR_CANCELLED) )
mnError = SalPrinterError::Abort;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/win32/spsupp/registrar.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a63087f58090418b6a7c8b046698b372ddc903cf
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:52:12 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:19:24 2020 +0100
RegCreateKeyExW etc. return LSTATUS
Change-Id: I78ebfd3e9eec9437ee405e99e2bcb96c53b1b84b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106728
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/win32/spsupp/registrar.cxx
b/shell/source/win32/spsupp/registrar.cxx
index 008c2ac59c82..1d647f3a556c 100644
--- a/shell/source/win32/spsupp/registrar.cxx
+++ b/shell/source/win32/spsupp/registrar.cxx
@@ -16,7 +16,7 @@ namespace {
HRESULT RegRead(HKEY hRootKey, const wchar_t* subKey, const wchar_t*
valName, wchar_t* valData, size_t cchData)
{
HKEY hKey;
-long iRetVal = RegCreateKeyExW(
+LSTATUS iRetVal = RegCreateKeyExW(
hRootKey,
subKey,
0,
@@ -43,7 +43,7 @@ namespace {
HRESULT RegWrite(HKEY hRootKey, const wchar_t* subKey, const wchar_t*
valName, const wchar_t* valData, HKEY *hKeyResult = nullptr)
{
HKEY hKey;
-long iRetVal = RegCreateKeyExW(
+LSTATUS iRetVal = RegCreateKeyExW(
hRootKey,
subKey,
0,
@@ -72,7 +72,7 @@ namespace {
HRESULT RegDel(HKEY hRootKey, const wchar_t* subKey)
{
-long iRetVal = RegDeleteKeyW(hRootKey, subKey);
+LSTATUS iRetVal = RegDeleteKeyW(hRootKey, subKey);
return HRESULT_FROM_WIN32(iRetVal);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/win32/shlxthandler/util/utilities.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d52ea2baa0885d49f3b5eaa74d782315d01d36ea
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:49:33 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:17:49 2020 +0100
GetShortPathNameW returns DWORD
Change-Id: I5e86f9d0fd9832d0c8500c5d38805ddef5d5304b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106727
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 80bd6a1cb4fa..489474b53baf 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -121,7 +121,7 @@ bool HasOnlySpaces(const std::wstring& String)
std::wstring getShortPathName( const std::wstring& aLongName )
{
std::wstring shortName = aLongName;
-long length= GetShortPathNameW( aLongName.c_str(), nullptr, 0
);
+DWORDlength= GetShortPathNameW( aLongName.c_str(), nullptr, 0
);
if ( length != 0 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/inc shell/source vcl/win
shell/inc/columninfo.hxx|4 ++--
shell/inc/global.hxx|2 +-
shell/inc/infotips.hxx |4 ++--
shell/inc/propertyhdl.hxx |8
shell/inc/propsheets.hxx|4 ++--
shell/inc/spsupp/COMOpenDocuments.hpp |4 ++--
shell/inc/spsupp/COMRefCounted.hpp |2 +-
shell/inc/spsupp/spsuppClassFactory.hpp |8
shell/inc/thumbviewer.hxx |4 ++--
shell/source/win32/shlxthandler/classfactory.cxx|4 ++--
shell/source/win32/shlxthandler/classfactory.hxx|4 ++--
shell/source/win32/shlxthandler/columninfo/columninfo.cxx |4 ++--
shell/source/win32/shlxthandler/infotips/infotips.cxx |4 ++--
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx |6 +++---
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 10 +-
shell/source/win32/shlxthandler/propsheets/propsheets.cxx |8
shell/source/win32/shlxthandler/shlxthdl.cxx|2 +-
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx |6 +++---
shell/source/win32/spsupp/COMOpenDocuments.cxx |4 ++--
shell/source/win32/spsupp/spsuppClassFactory.cxx|4 ++--
vcl/win/dtrans/source.cxx |2 +-
vcl/win/dtrans/source.hxx |2 +-
22 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 2a78e9ddafcfa644e771bb2fc47d5ca23f46af59
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:38:05 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:16:46 2020 +0100
Windows InterlockedIncrement/Decrement use LONG
Change-Id: Ib3e8e89332399eba443d9ff291f694cfceb95af1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106726
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/inc/columninfo.hxx b/shell/inc/columninfo.hxx
index 6a6710a65ac6..de122ad1f361 100644
--- a/shell/inc/columninfo.hxx
+++ b/shell/inc/columninfo.hxx
@@ -26,7 +26,7 @@
class CColumnInfo : public IColumnProvider
{
public:
-CColumnInfo(long RefCnt = 1);
+CColumnInfo(LONG RefCnt = 1);
virtual ~CColumnInfo();
@@ -53,7 +53,7 @@ public:
LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) override;
private:
-longm_RefCnt;
+LONGm_RefCnt;
};
#endif
diff --git a/shell/inc/global.hxx b/shell/inc/global.hxx
index fb812bcf8140..a729d59301e8 100644
--- a/shell/inc/global.hxx
+++ b/shell/inc/global.hxx
@@ -25,7 +25,7 @@
#endif
#include
-extern long g_DllRefCnt;
+extern LONG g_DllRefCnt;
#endif
diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx
index ac9218a71762..5a1128cb7d61 100644
--- a/shell/inc/infotips.hxx
+++ b/shell/inc/infotips.hxx
@@ -28,7 +28,7 @@
class CInfoTip : public IQueryInfo, public IPersistFile
{
public:
-CInfoTip(long RefCnt = 1);
+CInfoTip(LONG RefCnt = 1);
virtual ~CInfoTip();
@@ -78,7 +78,7 @@ public:
/* [out] */ LPOLESTR __RPC_FAR *ppszFileName) override;
private:
-longm_RefCnt;
+LONGm_RefCnt;
Filepath_char_t m_szFileName[MAX_PATH];
std::wstringm_FileNameOnly;
};
diff --git a/shell/inc/propertyhdl.hxx b/shell/inc/propertyhdl.hxx
index 725885525de6..44c848e403cc 100644
--- a/shell/inc/propertyhdl.hxx
+++ b/shell/inc/propertyhdl.hxx
@@ -33,7 +33,7 @@ class CPropertyHdl : public IPropertyStore,
public IInitializeWithStream
{
public:
- CPropertyHdl(long RefCnt = 1);
+ CPropertyHdl(LONG RefCnt = 1);
virtual ~CPropertyHdl();
@@ -68,7 +68,7 @@ private:
voidLoadProperties( CMetaInfoReader *pMetaInfoReader );
private:
-long m_RefCnt;
+LONG m_RefCnt;
IPropertyStoreCache* m_pCache;
};
@@ -99,9 +99,9 @@ public:
static bool IsLocked();
private:
-long m_RefCnt;
+LONG m_RefCnt;
CLSID m_Clsid;
-static long s_ServerLocks;
+static LONG s_ServerLocks;
};
#endif
diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx
index 2c3883555d1e..68e28192922d 100644
--- a/shell/inc/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -30,7 +30,7 @@
class CPropertySheet : public IShellExtInit, public IShellPropSheetExt
{
public:
-CPropertySheet(long RefCnt = 1);
+CPropertySheet(LONG RefCnt = 1);
virtual ~CPropertySheet();
@@ -74,7 +74,7 @@ private:
void InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE lppsp);
private:
-long m_RefCnt;
+LONG m_RefCnt;
Filepath_char_t m_szFileName[MAX_PATH];
};
diff --git a/shell/inc/spsupp/COMOpenDocuments.hpp
b/shell/inc/spsupp/COMOpenDocuments.hpp
index 21b378d895e6..
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/unoconversionutilities.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a93b47c0a788771cc761f37e610985cbeb971a1e
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 10:27:48 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 13:15:59 2020 +0100
CComVariant.lVal is of type LONG
Change-Id: I2f27089b37a5a73242bfb56d68db765a29dc4efe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106725
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index 32788abc4ad5..449941b202d9 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1957,7 +1957,7 @@ void
UnoConversionUtilities::dispatchExObject2Sequence( const VARIANTARG* pva
if( FAILED( VariantChangeType( &result, &result, 0, VT_I4)))
throw BridgeRuntimeError("[automation bridge]
UnoConversionUtilities::dispatchExObject2Sequence \n"
"Conversion of dispatch object to
Sequence failed!");
-long length= result.lVal;
+LONG length= result.lVal;
result.Clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa svx/source sw/qa
chart2/qa/extras/chart2export.cxx | 20 +++-
chart2/qa/extras/chart2import.cxx |2 --
chart2/qa/extras/data/ods/tdf72776.ods |binary
svx/source/svdraw/svdoashp.cxx |6 ++
svx/source/unodraw/unoshtxt.cxx|5 -
sw/qa/extras/layout/layout2.cxx|9 -
6 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit 71b66b0039819f38c935b4eb5d5951ceaf6e8468
Author: Balazs Varga
AuthorDate: Tue Oct 27 21:19:36 2020 +0100
Commit: László Németh
CommitDate: Fri Nov 27 13:09:33 2020 +0100
tdf#138307 Chart import: fix lost custom shape text
Do not set empty text to SdrOutliner, if it is already set.
Note: Also fix the missing custom shape problem in
tdf#72776 and tdf#93641. The wrong position (X:0, Y:0) of
these shapes is another problem.
Regression from commit 6f62a5c4ee2c1b7654c7fcaa618fb495e0d32f0a
(tdf#128985: ODP: Style text directions revert to RTL on save and re-open)
Change-Id: I07d8cb12836daf15db347f6bb19c17ed9373189e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104909
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 a39b36234862..d92e06cdc01c 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -184,6 +184,7 @@ public:
void testTdf137917();
void testTdf138204();
void testTdf138181();
+void testCustomShapeText();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -330,6 +331,7 @@ public:
CPPUNIT_TEST(testTdf137917);
CPPUNIT_TEST(testTdf138204);
CPPUNIT_TEST(testTdf138181);
+CPPUNIT_TEST(testCustomShapeText);
CPPUNIT_TEST_SUITE_END();
@@ -3016,7 +3018,7 @@ void Chart2ExportTest::testTdf138181()
{
load("/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
Reference xChartDoc(getChartDocFromSheet(0,
mxComponent),
- UNO_QUERY_THROW);
+UNO_QUERY_THROW);
Reference xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
Reference xDrawPage(xDrawPageSupplier->getDrawPage(),
UNO_SET_THROW);
Reference xShapes(xDrawPage->getByIndex(0),
UNO_QUERY_THROW);
@@ -3038,6 +3040,22 @@ void Chart2ExportTest::testTdf138181()
CPPUNIT_ASSERT(xLegendEntry3.is());
}
+void Chart2ExportTest::testCustomShapeText()
+{
+load("/chart2/qa/extras/data/ods/", "tdf72776.ods");
+reload("calc8");
+Reference xChartDoc(getChartDocFromSheet(0,
mxComponent),
+UNO_QUERY_THROW);
+// test that the text of custom shape exists inside the chart
+Reference xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
+Reference xDrawPage(xDrawPageSupplier->getDrawPage(),
UNO_SET_THROW);
+Reference xCustomShape(xDrawPage->getByIndex(1),
UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xCustomShape.is());
+
+Reference< text::XText > xRange(xCustomShape, uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(!xRange->getString().isEmpty());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 490b2ce2698d..cb8c08c0697e 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -30,8 +30,6 @@
#include
#include
#include
-#include
-#include
#include
#include
diff --git a/chart2/qa/extras/data/ods/tdf72776.ods
b/chart2/qa/extras/data/ods/tdf72776.ods
new file mode 100644
index ..4ddad64a5ef5
Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf72776.ods differ
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 29461df169a5..35812345b27b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2162,10 +2162,8 @@ void SdrObjCustomShape::SetVerticalWriting( bool
bVertical )
DBG_ASSERT( pOutlinerParaObject, "SdrTextObj::SetVerticalWriting() without
OutlinerParaObject!" );
-if( !pOutlinerParaObject )
-return;
-
-if(pOutlinerParaObject->IsVertical() == bVertical)
+if( !pOutlinerParaObject ||
+(pOutlinerParaObject->IsVertical() == bVertical) )
return;
// get item settings
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index e0ade5699832..7f2a8af49606 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -545,7 +545,10 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( pOutlinerParaObject && ( bOwnParaObj ||
!mpObject->IsEmptyPresObj() ||
mpObject->getSdrPageFromSdrObject()->IsMasterPage() ) )
{
-mpOutliner->SetText( *pOutlinerParaObject );
+// tdf#72776: do not set empty text to SdrOutliner, if it is
already set
+if( !mpOutliner->GetEditEngine()
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - vcl/CppunitTest_vcl_graphic_test.mk vcl/Module_vcl.mk vcl/qa vcl/source
vcl/CppunitTest_vcl_graphic_test.mk | 48 +++
vcl/Module_vcl.mk |1
vcl/qa/cppunit/GraphicTest.cxx | 90
vcl/qa/cppunit/data/roundtrip.wmf |binary
vcl/source/filter/graphicfilter.cxx | 31 ++--
5 files changed, 165 insertions(+), 5 deletions(-)
New commits:
commit 66db3307b75ce21767328a00371a8683207ddc99
Author: Miklos Vajna
AuthorDate: Wed Nov 25 18:01:08 2020 +0100
Commit: Miklos Vajna
CommitDate: Fri Nov 27 13:07:40 2020 +0100
WMF export: just write the source data as is for from-WMF graphics
This was already working on master since commit
5868745db74ae930edb0058490076d82aaeafbe9 (emfplus: make VectorFormats
Emf/Wmf/Svg work, 2017-06-12), but a matching testcase was missing.
[ And on this branch, fix the actual problem by picking the small
relevant subset of the above commit. ]
(cherry picked from commit 6bb0e09e2423ae00e06e6b7ae2c5a0af6ca100a1)
Conflicts:
vcl/qa/cppunit/GraphicTest.cxx
Change-Id: I7661cd5e66d13b1750f16c0c423c4b69420577a0
diff --git a/vcl/CppunitTest_vcl_graphic_test.mk
b/vcl/CppunitTest_vcl_graphic_test.mk
new file mode 100644
index ..98eaae8800e7
--- /dev/null
+++ b/vcl/CppunitTest_vcl_graphic_test.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_graphic_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_graphic_test, \
+vcl/qa/cppunit/GraphicTest \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test,\
+ boost_headers \
+ glm_headers \
+))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_graphic_test,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_graphic_test, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+svt \
+ test \
+ tl \
+ unotest \
+ vcl \
+ utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_graphic_test))
+$(eval $(call gb_CppunitTest_use_ure,vcl_graphic_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_graphic_test))
+$(eval $(call gb_CppunitTest_use_rdb,vcl_graphic_test,services))
+$(eval $(call gb_CppunitTest_use_configuration,vcl_graphic_test))
+
+# we need to explicitly depend on Library_gie because it's dynamically loaded
for .gif
+$(call gb_CppunitTest_get_target,vcl_graphic_test) : $(call
gb_Library_get_target,gie)
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a5e4bf5d68d2..b74bc2e67208 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -154,6 +154,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_svm_test \
CppunitTest_vcl_pdfexport \
CppunitTest_vcl_errorhandler \
+ CppunitTest_vcl_graphic_test \
))
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
new file mode 100644
index ..d71a85ebf07b
--- /dev/null
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace css;
+
+namespace
+{
+class GraphicTest : public CppUnit::TestFixture
+{
+public:
+~GraphicTest();
+
+private:
+void testWMFRoundtrip();
+
+CPPUNIT_TEST_SUITE(GraphicTest);
+CPPUNIT_TEST(testWMFRoundtrip);
+CPPUNIT_TEST_SUITE_END();
+};
+
+GraphicTest::~GraphicTest()
+{
+}
+
+void GraphicTest::testWMFRoundtrip()
+{
+// Load a WMF file.
+test::Directories aDirectories;
+OUString aURL =
aDirectories.getURLFromSrc("vcl/qa/cppunit/data/roundtrip.wmf");
+SvFileStream aStream(aURL, StreamMode::READ);
+sal_uInt64 nPos = aStream.Tell();
+aStream.Seek(STREAM_SEEK_TO_END);
+sal_uInt64 nExpectedSize = aStream.Tell();
+aStream.Seek(nPos);
+GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
+Graphic aGraphic;
+rGraphicFilter.ImportGraphic(aGraphic, OUString(), aStream);
+
+// Save as WMF.
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+sal_uInt16 nFormat =
rGraphicFilter.GetExportFormatNumberForShortName(u"WMF");
+SvStream& rOutStream = *aTempFile.GetStr
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - i18npool/CustomTarget_breakiterator.mk i18npool/source
i18npool/CustomTarget_breakiterator.mk |1
i18npool/source/breakiterator/data/char.txt | 119
2 files changed, 120 deletions(-)
New commits:
commit 27efeeb7a80c84dbe243f2301f1dbf10cff7ce8d
Author: Tor Lillqvist
AuthorDate: Thu Nov 26 15:47:26 2020 +0200
Commit: Caolán McNamara
CommitDate: Fri Nov 27 12:59:41 2020 +0100
tdf#138481: Trust the built-in break iterator character data in ICU
Don't use our own char.txt.
Quite possibly we wouldn't need to use the other data in the
i18npool/source/breakiterator/data folder either. See the README file
there for the sad details.
Change-Id: I82923ae76407fdd3fa3642d818d43427fe4f5591
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106632
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
(cherry picked from commit 8578a1c9d167c19f1d8038fac5946b4b3cae305e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106688
Reviewed-by: Caolán McNamara
diff --git a/i18npool/CustomTarget_breakiterator.mk
b/i18npool/CustomTarget_breakiterator.mk
index dee46a31f0b1..e6d658f01405 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -51,7 +51,6 @@ endif
i18npool_BRKTXTS := \
$(if $(i18npool_breakiterator_want_in),char_in.brk) \
-char.brk \
count_word.brk \
$(call gb_Helper_optional_locale,he,dict_word_he.brk) \
$(call gb_Helper_optional_locale,hu,dict_word_hu.brk) \
diff --git a/i18npool/source/breakiterator/data/char.txt
b/i18npool/source/breakiterator/data/char.txt
deleted file mode 100644
index 3b9f801a7ace..
--- a/i18npool/source/breakiterator/data/char.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2002-2009, International Business Machines Corporation and
others.
-# All Rights Reserved.
-#
-# file: char.txt
-#
-# ICU Character Break Rules, also known as Grapheme Cluster Boundaries
-# See Unicode Standard Annex #29.
-# These rules are based on TR29 Revision 13, for Unicode Version 5.1
-# Modifications to SpacingMark and Prepend by M. Hosken.
-#
-
-#
-# Character Class Definitions.
-#
-$CR = [\p{Grapheme_Cluster_Break = CR}];
-$LF = [\p{Grapheme_Cluster_Break = LF}];
-$Control = [\p{Grapheme_Cluster_Break = Control}];
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
-$Extend = [\p{Grapheme_Cluster_Break = Extend}];
-$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
-# True Indic wants to move by syllables. Break up SpacingMark. This based on
Unicode 6.0 data
-# In effect it is [\p{Grapheme_Cluster_Break = SpacingMark} - \u0E30 \u0E32
\u0E45 \u0EB0 \u0EB2 \u102B \u102C \u1038
-# \u1062-\u1064 \u1067-\u106D \u1083 \u1087-\u108C \u108F \u109A-\u109C
\u19B0-\u19B4 \u19B8-\u19C0 \u19C8 \u19C9
-# \u1A61 \u1A63 \u1A64 \u1BE7 \u1BEA-\u1BEC \u1BEE \u1BF2 \u1BF3 \uAA7B
-$IndicSpacing = [\u0903 \u093B \u093E-\u0940 \u0949-\u094C \u094E \u094F
\u0982 \u0983 \u09BF \u09C0 \u09C7 \u09C8 \u09CB \u09CC \u0A03 \u0A3E-\u0A40
\u0A83 \u0ABE-\u0AC0 \u0AC9 \u0ACB \u0ACC \u0B02 \u0B03 \u0B40 \u0B47 \u0B48
\u0B4B-\u0B4C \u0BBF \u0BC1 \u0BC2 \u0BC6-\u0BC8 \u0BCA-\u0BCC \u0C01-\u0C03
\u0C41-\u0C44 \u0C82 \u0C83 \u0CBE \u0CC0 \u0CC1 \u0CC3 \u0CC4 \u0CC7 \u0CC8
\u0CCA \u0CCB \u0D02 \u0D03 \u0D3F \u0D40 \u0D46-\u0D48 \u0D4A-\u0D4C \u0D82
\u0D83 \u0DD0 \u0DD1 \u0DD8-\u0DDE \u0F3E \u0F3F \u0F7F \u1923-\u1926
\u1929-\u192B \u1930 \u1931 \u1933-\u1938 \u1A19-\u1A1B \u1B04 \u1B35 \u1B3B
\u1B3D-\u1B41 \u1B43 \u1B44 \u1B82 \u1BA1 \u1BA6 \u1BA7 \u1BAA \u1C24-\u1C2B
\u1C34 \u1C35 \u1CE1 \u1CF2 \uA880 \uA881 \uA8B4-\uA8C3 \uA952 \uA953 \uA983
\uA9B4 \uA9B5 \uA9BA \uA9BB \uA9BD-\uA9C0 \uAA2F \uAA30 \uAA33 \uAA34 \uABE3
\uABE4 \uABE6 \uABE7 \uABE9 \uABEA \uABEC \U00011000 \U00011002 \U00011082
\U000110B0-\U000110B2 \U000110B7 \U000100B8 \U0001D166 \U0001D16D];
-# SEAsian (Thai, Lao, Burmese, Tai Lue, Tai Tham, Batak) are cluster based not
syllable based
-$SEASpacing = [\u0E33 \u0EB3 \u1031 \u103B \u103C \u1056 \u1057 \u1084 \u17B6
\u17BE-\u17C5 \u17C7 \u17C8 \u1A55 \u1A57 \u1A6D-\u1A72 \uA823 \uA824 \uA827
\uAA4D];
-$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-$BengaliSignVirama = \u09CD;
-$GujaratiLetter = [\u0A85-\u0A8C \u0A8F-\u0A90 \u0A93-\u0AB9 \u0AE0-\u0AE1];
-$GujaratiSignVirama = \u0ACD;
-$DevanagariLetter = [\u0904-\u0939 \u0958-\u0961 \u0972-\u097F];
-$DevanagariSignVirama = \u094D;
-$KannadaLetter = [\u0C85-\u0CB9 \u0CDE-\u0CE1];
-$KannadaSignVirama = \u0CCD;
-$MalayalamLetter = [\u0D05-\u0D39 \u0D60-\u0D61 \u0D7A-\u0D7F];
-$MalayalamSignVirama = \u0D4D;
-$OdiaLetter = [\u0B05-\u0B39 \u0B5C-\u0B61 \u0B71];
-$OdiaSignVirama = \u0B4D;
-$GurmukhiLetter = [\u0A05-\u0A39 \u0A59-\u0A5E];
-$GurmukhiSignVirama = \u0A4D;
-$TamilKa = \u0B95;
-$TamilSignVirama = \u0BCD;
-$TamilSsa = \u0BB7;
-$TeluguLetter = [\u0C05-\u0C39 \u0C58-\u0C61];
-$TeluguSignVirama = \u0C4D;
-
-#
-# Korean Syll
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source
sw/source/core/doc/docbm.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit fd596591b385a8b03459a7dd3f79e65a59f530f4
Author: Michael Stahl
AuthorDate: Thu Nov 26 19:55:27 2020 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 27 12:50:19 2020 +0100
sw_fieldmarkhide: fix getFieldMarkFor() to return innermost field
... like it's supposed to; if it finds the outer field and then the next
field is inside but ends *before* the rPos then the loop is erroneously
terminated.
Change-Id: Ic5e469d1c05cecd7feca275dc1689af2c40567f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106710
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 6a11f94ab366e1d736e97e31e908e86aa5d8b533)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106689
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 406685c58691..c71178e1f005 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1405,10 +1405,11 @@ namespace sw::mark
return nullptr;
auto pFieldmark(*itFieldmark);
for ( ; itFieldmark != m_vFieldmarks.end()
-&& (**itFieldmark).IsCoveringPosition(rPos); ++itFieldmark)
+&& (**itFieldmark).GetMarkStart() <= rPos; ++itFieldmark)
{ // find the innermost fieldmark
-if (pFieldmark->GetMarkStart() < (**itFieldmark).GetMarkStart()
-|| (**itFieldmark).GetMarkEnd() < pFieldmark->GetMarkEnd())
+if (rPos < (**itFieldmark).GetMarkEnd()
+&& (pFieldmark->GetMarkStart() < (**itFieldmark).GetMarkStart()
+|| (**itFieldmark).GetMarkEnd() <
pFieldmark->GetMarkEnd()))
{
pFieldmark = *itFieldmark;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/inc
vcl/inc/bitmap/impoctree.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ace0af37f2f79561cb52d695e3aa00eab3e2f547
Author: Noel Grandin
AuthorDate: Thu Nov 26 20:10:43 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Nov 27 12:30:53 2020 +0100
tdf#138486 Artifacts in some impress templates
fields need to be signed
regression from
commit 548d77d0c06f7088dd3eb408797aa1fc1d7eb277
Author: Noel
Date: Fri Nov 13 10:23:36 2020 +0200
tools::Long->sal_uInt16 in ImpErrorQuad
Change-Id: Ia2a70d55d9af2ea3712ace3394c0de3931bee95c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106709
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 31f2b4b23e5d16c1b04035f08ebbb11c1abf62e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106735
diff --git a/vcl/inc/bitmap/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx
index 7c464dbb9758..b77e964f4f79 100644
--- a/vcl/inc/bitmap/impoctree.hxx
+++ b/vcl/inc/bitmap/impoctree.hxx
@@ -24,9 +24,9 @@
class ImpErrorQuad
{
-sal_uInt32 nRed;
-sal_uInt32 nGreen;
-sal_uInt32 nBlue;
+sal_Int16 nRed;
+sal_Int16 nGreen;
+sal_Int16 nBlue;
public:
ImpErrorQuad()
@@ -100,9 +100,9 @@ inline void ImpErrorQuad::ImplAddColorError7(const
ImpErrorQuad& rErrQuad)
inline BitmapColor ImpErrorQuad::ImplGetColor()
{
-return BitmapColor(std::clamp(nRed, 0, 8160) >> 5,
- std::clamp(nGreen, 0, 8160) >> 5,
- std::clamp(nBlue, 0, 8160) >> 5);
+return BitmapColor(std::clamp(nRed, sal_Int16(0), sal_Int16(8160)) >> 5,
+ std::clamp(nGreen, sal_Int16(0), sal_Int16(8160)) >> 5,
+ std::clamp(nBlue, sal_Int16(0), sal_Int16(8160)) >> 5);
}
#endif // INCLUDED_VCL_INC_IMPOCTREE_HXX
___
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/globalfilter/data/tdf138345_charstyle_highlight.odt |binary
sw/qa/extras/globalfilter/globalfilter.cxx | 46
++
sw/source/filter/ww8/ww8atr.cxx |7 +
3 files changed, 53 insertions(+)
New commits:
commit 5951a867b87cbb6968c1e2059f2cf461d11c
Author: Justin Luth
AuthorDate: Thu Nov 19 19:58:16 2020 +0300
Commit: Miklos Vajna
CommitDate: Fri Nov 27 12:15:18 2020 +0100
tdf#138345 sw ms export: Char highlight: no export to char-style
MS Word ignores w:highlight in a character style.
It only accepts it as direct formatting or in para-styles.
So never export the character background as w:highlight,
but always as w:shd for character styles.
Change-Id: I7c9f4f00d957a8add848746051d3c4b1522d1520
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106182
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/globalfilter/data/tdf138345_charstyle_highlight.odt
b/sw/qa/extras/globalfilter/data/tdf138345_charstyle_highlight.odt
new file mode 100644
index ..6886ed8f71c6
Binary files /dev/null and
b/sw/qa/extras/globalfilter/data/tdf138345_charstyle_highlight.odt differ
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index a2ef4d318ca6..bb9521823783 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -48,6 +48,7 @@ public:
void testCharHighlight();
void testCharHighlightODF();
void testCharHighlightBody();
+void testCharStyleHighlight();
void testMSCharBackgroundEditing();
void testCharBackgroundToHighlighting();
#if !defined(_WIN32)
@@ -574,16 +575,61 @@ void Test::testCharHighlightBody()
}
}
+void Test::testCharStyleHighlight()
+{
+// MS Word has two kind of character backgrounds called character shading
and highlighting.
+// However, their character style can only accept shading. It ignores the
highlighting value.
+
+const OUString aFilterNames[] = {
+"Rich Text Format",
+"MS Word 97",
+"Office Open XML Text",
+};
+
+for (OUString const & rFilterName : aFilterNames)
+{
+if (mxComponent.is())
+mxComponent->dispose();
+mxComponent =
loadFromDesktop(m_directories.getURLFromSrc("/sw/qa/extras/globalfilter/data/tdf138345_charstyle_highlight.odt"),
+ "com.sun.star.text.TextDocument");
+
+const OString sFailedMessage = OStringLiteral("Failed on filter: ") +
rFilterName.toUtf8();
+
+// Export the document and import again for a check
+uno::Reference xStorable(mxComponent,
uno::UNO_QUERY);
+
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= rFilterName;
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+uno::Reference< lang::XComponent > xComponent(xStorable,
uno::UNO_QUERY);
+xComponent->dispose();
+mxComponent = loadFromDesktop(aTempFile.GetURL(),
"com.sun.star.text.TextDocument");
+
+uno::Reference xCharStyle;
+getStyles("CharacterStyles")->getByName("charBackground") >>=
xCharStyle;
+const sal_Int32 nBackColor(0xFFDBB6); //orange-y
+
+// Always export character style's background colour as shading, never
as highlighting.
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast(COL_TRANSPARENT),
getProperty(xCharStyle,"CharHighlight"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor,
getProperty(xCharStyle,"CharBackColor"));
+}
+}
+
void Test::testCharHighlight()
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
rOpt.SetCharBackground2Shading();
testCharHighlightBody();
+testCharStyleHighlight();
rOpt.SetCharBackground2Highlighting();
testCharHighlightBody();
+testCharStyleHighlight();
}
void Test::testCharHighlightODF()
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 0da5f1fb4c1c..ef5ea8b38ae6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5556,6 +5556,13 @@ void AttributeOutputBase::CharBackgroundBase( const
SvxBrushItem& rBrush )
bool bConvertToShading =
SvtFilterOptions::Get().IsCharBackground2Shading();
bool bHasShadingMarker = false;
+// MS Word doesn't support highlight in character styles. Always export
those as shading.
+if ( !bConvertToShading && GetExport().m_bStyDef )
+{
+const SwFormat* pFormat = dynamic_cast(
GetExport().m_pOutFormatNode );
+bConvertToShading = pFormat && pFormat->Which() == RES_CHRFMT;
+}
+
// Check shading marker
const SfxPoolItem* pItem = GetE
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/CppunitTest_vcl_filter_ipdf.mk vcl/Module_vcl.mk vcl/qa vcl/source
vcl/CppunitTest_vcl_filter_ipdf.mk | 49 +
vcl/Module_vcl.mk |1
vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf | 55 +++
vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 100
vcl/source/filter/ipdf/pdfdocument.cxx | 13 ++
5 files changed, 216 insertions(+), 2 deletions(-)
New commits:
commit 82b9c35264b62b16dd02837a64580ea5be6a2844
Author: Miklos Vajna
AuthorDate: Fri Oct 16 18:15:21 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Nov 27 12:13:04 2020 +0100
vcl pdf tokenizer: fix handling of dict -> array -> dict tokens
Needed to be able to parse the /Reference key of signatures.
(cherry picked from commit 056c1284d6a68525002c54bef10834cc135385db)
Conflicts:
vcl/qa/cppunit/filter/ipdf/ipdf.cxx
Change-Id: I6b81089a3f58a2de461ad92ca5a891c284f8686a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106757
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/CppunitTest_vcl_filter_ipdf.mk
b/vcl/CppunitTest_vcl_filter_ipdf.mk
new file mode 100644
index ..403836ac781a
--- /dev/null
+++ b/vcl/CppunitTest_vcl_filter_ipdf.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_filter_ipdf,\
+ boost_headers \
+ pdfium \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_filter_ipdf, \
+vcl/qa/cppunit/filter/ipdf/ipdf \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_filter_ipdf, \
+comphelper \
+cppu \
+sal \
+sfx \
+svx \
+test \
+tl \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_filter_ipdf))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_filter_ipdf))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_filter_ipdf,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,vcl_filter_ipdf,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_filter_ipdf))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 737f8a101b8d..a83097a765e0 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -219,6 +219,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_pdfexport \
+ CppunitTest_vcl_filter_ipdf \
))
endif
diff --git a/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
new file mode 100644
index ..73de3117b9a6
--- /dev/null
+++ b/vcl/qa/cppunit/filter/ipdf/data/dict-array-dict.pdf
@@ -0,0 +1,55 @@
+%PDF-1.7
+%���
+1 0 obj <<
+ /Type /Catalog
+ /Pages 2 0 R
+>>
+endobj
+2 0 obj <<
+ /Type /Pages
+ /MediaBox [0 0 200 300]
+ /Count 1
+ /Kids [3 0 R]
+>>
+endobj
+3 0 obj <<
+ /Type /Page
+ /Parent 2 0 R
+ /Contents 4 0 R
+ /Key[<>]
+>>
+endobj
+4 0 obj <<
+ /Length 188
+>>
+stream
+q
+0 0 0 rg
+0 290 10 10 re B*
+10 150 50 30 re B*
+0 0 1 rg
+190 290 10 10 re B*
+70 232 50 30 re B*
+0 1 0 rg
+190 0 10 10 re B*
+130 150 50 30 re B*
+1 0 0 rg
+0 0 10 10 re B*
+70 67 50 30 re B*
+Q
+endstream
+endobj
+xref
+0 5
+00 65535 f
+15 0 n
+68 0 n
+000157 0 n
+000251 0 n
+trailer <<
+ /Root 1 0 R
+ /Size 5
+>>
+startxref
+491
+%%EOF
diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
new file mode 100644
index ..2a3357322b50
--- /dev/null
+++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace ::com::sun::star;
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/vcl/qa/cppunit/filter/ipdf/data/";
+}
+
+/// Covers vcl/source/filter/ipdf/ fixes
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - xmloff/source
xmloff/source/forms/elementimport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 274cb276b2542b782988b1ced7347f2e8ce76c26
Author: Noel Grandin
AuthorDate: Thu Nov 26 19:49:19 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Nov 27 11:55:48 2020 +0100
tdf#138507 error in loading form
regression from
commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a
Author: Noel Grandin
Date: Tue Nov 10 19:20:06 2020 +0200
use fastparser in forms
Change-Id: I995677d4e381e8229e7f052cf54a134bdf49d378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106708
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 3faf503b1a389affcff1bcbd63630963f634e486)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106734
Reviewed-by: Xisco Fauli
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 0b14b3155956..896aaf3cd3cc 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -140,7 +140,7 @@ namespace xmloff
{
ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" );
-const OUString sControlImplementation = _rxAttrList->getValue(
XML_ELEMENT(FORM, XML_CONTROL_IMPLEMENTATION) );
+const OUString sControlImplementation = _rxAttrList->getOptionalValue(
XML_ELEMENT(FORM, XML_CONTROL_IMPLEMENTATION) );
// retrieve the service name
if ( !sControlImplementation.isEmpty() )
___
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/jsdialog vcl/source
include/vcl/toolkit/dialog.hxx |2 ++
vcl/jsdialog/executor.cxx| 12
vcl/jsdialog/jsdialogbuilder.cxx |3 +++
vcl/source/window/dialog.cxx |7 +++
4 files changed, 24 insertions(+)
New commits:
commit 60ec1659924be692de2985d2b1a5363976db6ca1
Author: Szymon Kłos
AuthorDate: Thu Nov 19 13:50:30 2020 +0100
Commit: Szymon Kłos
CommitDate: Fri Nov 27 11:42:54 2020 +0100
jsdialog: dump dialog title
Change-Id: Id4c9f336039f8a0b8d1d43fdff4852f32e2c7ae6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106707
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 3c519d0a5004..1d3064784bd4 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -154,6 +154,8 @@ public:
voidset_default_response(int nResponse);
int get_default_response() const;
vcl::Window*get_widget_for_response(int nResponse);
+
+voidDumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
override;
};
#endif // INCLUDED_VCL_DIALOG_HXX
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5618af225d4c..c6aed4909b87 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -60,6 +60,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1614,4 +1615,10 @@ void TopLevelWindowLocker::decBusy()
m_aBusyStack.pop();
}
+void Dialog::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
+{
+SystemWindow::DumpAsPropertyTree(rJsonWriter);
+rJsonWriter.put("title", GetText());
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b6d634d74c0231173d6b43357b7cd3cecb76407d
Author: Szymon Kłos
AuthorDate: Wed Nov 18 12:14:35 2020 +0100
Commit: Szymon Kłos
CommitDate: Fri Nov 27 11:42:38 2020 +0100
jsdialog: remember dialog instance & handle close
Change-Id: I1b10d12edfa7ffca1061f50b5219baae1ac3caeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106706
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 13ffc1a33e06..83d19fd7b657 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -242,6 +242,18 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString&
rWidget, StringMap& rDat
}
}
}
+else if (sControlType == "dialog")
+{
+auto pDialog = dynamic_cast(pWidget);
+if (pDialog)
+{
+if (sAction == "close")
+{
+pDialog->response(RET_CANCEL);
+return true;
+}
+}
+}
}
return false;
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 58c8c64d1108..13b438022e7e 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -365,6 +365,9 @@ std::unique_ptr
JSInstanceBuilder::weld_dialog(const OString& id)
std::unique_ptr pRet(pDialog ? new
JSDialog(m_aOwnedToplevel, m_aOwnedToplevel,
pDialog, this,
false, m_sTypeOfJSON)
: nullptr);
+
+RememberWidget("__DIALOG__", pRet.get());
+
if (pDialog)
{
assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog
vcl/inc/jsdialog/jsdialogbuilder.hxx | 55 +++
vcl/jsdialog/executor.cxx| 21 +
vcl/jsdialog/jsdialogbuilder.cxx | 123 +++
3 files changed, 199 insertions(+)
New commits:
commit 3000f3ee1ac63deff58fa5725a6f6c2f05aec9bb
Author: Szymon Kłos
AuthorDate: Wed Nov 18 10:12:38 2020 +0100
Commit: Szymon Kłos
CommitDate: Fri Nov 27 11:42:16 2020 +0100
jsdialog: drag and drop support for TreeView
Change-Id: I67e2eb986b48591b7f758bbb5c1d72b6a322d4d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106705
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 4b9e042960f4..ab7c038648d3 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -19,6 +19,11 @@
#include
#include
+#include
+#include
+#include
+#include
+
class ToolBox;
class ComboBox;
class VclMultiLineEdit;
@@ -58,6 +63,40 @@ public:
void notifyDialogState(bool bForce = false);
};
+class JSDropTarget final
+: public cppu::WeakComponentImplHelper
+{
+osl::Mutex m_aMutex;
+
std::vector>
m_aListeners;
+
+public:
+JSDropTarget();
+
+// XInitialization
+virtual void SAL_CALL initialize(const css::uno::Sequence&
rArgs) override;
+
+// XDropTarget
+virtual void SAL_CALL addDropTargetListener(
+const
css::uno::Reference&) override;
+virtual void SAL_CALL removeDropTargetListener(
+const
css::uno::Reference&) override;
+virtual sal_Bool SAL_CALL isActive() override;
+virtual void SAL_CALL setActive(sal_Bool active) override;
+virtual sal_Int8 SAL_CALL getDefaultActions() override;
+virtual void SAL_CALL setDefaultActions(sal_Int8 actions) override;
+
+OUString SAL_CALL getImplementationName() override;
+
+sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override;
+
+css::uno::Sequence SAL_CALL getSupportedServiceNames() override;
+
+void fire_drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde);
+
+void fire_dragEnter(const
css::datatransfer::dnd::DropTargetDragEnterEvent& dtde);
+};
+
class JSInstanceBuilder : public SalInstanceBuilder
{
sal_uInt64 m_nWindowId;
@@ -128,6 +167,9 @@ private:
template
class JSWidget : public BaseInstanceClass, public JSDialogSender
{
+protected:
+rtl::Reference m_xDropTarget;
+
public:
JSWidget(VclPtr aNotifierWindow, VclPtr
aContentWindow,
VclClass* pObject, SalInstanceBuilder* pBuilder, bool
bTakeOwnership,
@@ -155,6 +197,14 @@ public:
BaseInstanceClass::set_sensitive(sensitive);
notifyDialogState();
}
+
+virtual css::uno::Reference
get_drop_target() override
+{
+if (!m_xDropTarget)
+m_xDropTarget.set(new JSDropTarget);
+
+return m_xDropTarget.get();
+}
};
class JSDialog : public JSWidget
@@ -309,6 +359,11 @@ public:
using SalInstanceTreeView::select;
/// pos is used differently here, it defines how many steps of iterator we
need to perform to take entry
virtual void select(int pos) override;
+
+virtual weld::TreeView* get_drag_source() const override;
+
+void drag_start();
+void drag_end();
};
class JSExpander : public JSWidget
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 24e3eb1f14d3..13ffc1a33e06 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -206,6 +206,27 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString&
rWidget, StringMap& rDat
pTreeView->select(nRow);
LOKTrigger::trigger_row_activated(*pTreeView);
+return true;
+}
+else if (sAction == "dragstart")
+{
+OString nRowString
+= OUStringToOString(rData["data"],
RTL_TEXTENCODING_ASCII_US);
+int nRow = std::atoi(nRowString.getStr());
+
+pTreeView->select(nRow);
+
+JSTreeView* pJSTreeView =
dynamic_cast(pTreeView);
+if (pJSTreeView)
+pJSTreeView->drag_start();
+return true;
+}
+else if (sAction == "dragend")
+{
+JSTreeView* pJSTreeView =
dynamic_cast(pTreeView);
+if (pJSTreeView)
+pJSTreeView->drag_end();
+return true;
}
}
}
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 4fb351b5439f..58c8c64d1108 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr aNotifierWindow,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bbb5b5ea98a8f77c3dc501d4f7e497bd3a9fbd3c
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 08:22:33 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 11:18:12 2020 +0100
Adapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601
..."Update language-subtag-registry to 2020-09-29"
Change-Id: Idea4df8f6a920cbceb37d5156417f6979d7a4fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106718
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 25bb4c31a68acd4526176580be72a9d4d626d013)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106730
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d1529d4768f1..b4e31e620a03 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -255,10 +255,10 @@
"dest-filename":
"external/tarballs/libfreehand-0.1.2.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";,
-"sha256":
"fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da",
+"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";,
+"sha256":
"cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f",
"type": "file",
-"dest-filename":
"external/tarballs/language-subtag-registry-2020-04-01.tar.bz2"
+"dest-filename":
"external/tarballs/language-subtag-registry-2020-09-29.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/qa sc/source
sc/IwyuFilter_sc.yaml| 207 ++- sc/inc/NumberFormatControl.hxx |1 sc/inc/dpdimsave.hxx |2 sc/inc/dpfilteredcache.hxx |1 sc/inc/dpoutput.hxx |2 sc/inc/dpresfilter.hxx |1 sc/inc/formularesult.hxx |1 sc/inc/global.hxx|2 sc/inc/inputopt.hxx |1 sc/inc/rechead.hxx |1 sc/inc/sc.hrc|1 sc/inc/scmod.hxx |1 sc/inc/sheetlimits.hxx |1 sc/inc/userdat.hxx |1 sc/qa/extras/anchor.cxx |1 sc/qa/unit/copy_paste_test.cxx |1 sc/qa/unit/filters-test.cxx |1 sc/qa/unit/helper/debughelper.hxx|2 sc/qa/unit/jumbosheets-test.cxx |2 sc/qa/unit/scshapetest.cxx |3 sc/qa/unit/subsequent_export-test.cxx|3 sc/qa/unit/subsequent_filters-test.cxx |2 sc/qa/unit/tiledrendering/tiledrendering.cxx |4 sc/qa/unit/ucalc_sort.cxx|1 sc/qa/unit/uicalc/uicalc.cxx |7 sc/source/core/data/column2.cxx |1 sc/source/core/data/docpool.cxx |1 sc/source/core/data/documen2.cxx |1 sc/source/core/data/documen3.cxx |1 sc/source/core/data/documen7.cxx |1 sc/source/core/data/documen8.cxx |2 sc/source/core/data/document.cxx |6 sc/source/core/data/document10.cxx |1 sc/source/core/data/dptabsrc.cxx |2 sc/source/core/data/drwlayer.cxx |2 sc/source/core/data/formulacell.cxx |1 sc/source/core/data/markarr.cxx |3 sc/source/core/data/markmulti.cxx|2 sc/source/core/data/poolhelp.cxx |1 sc/source/core/data/segmenttree.cxx |1 sc/source/core/data/table4.cxx |1 sc/source/core/data/validat.cxx |2 sc/source/core/inc/arraysumfunctor.hxx |4 sc/source/core/inc/grouptokenconverter.hxx |1 sc/source/core/inc/interpre.hxx |1 sc/source/core/opencl/opinlinefun_math.hxx |2 sc/source/core/tool/addincol.cxx |4 sc/source/core/tool/addinhelpid.cxx |1 sc/source/core/tool/addinlis.cxx |1 sc/source/core/tool/adiasync.cxx |2 sc/source/core/tool/appoptio.cxx |4 sc/source/core/tool/autoform.cxx |9 sc/source/core/tool/calcconfig.cxx |5 sc/source/core/tool/callform.cxx |3 sc/source/core/tool/cellform.cxx |2 sc/source/core/tool/cellkeytranslator.cxx|1 sc/source/core/tool/chartarr.cxx |4 sc/source/core/tool/chartlock.cxx|1 sc/source/core/tool/chartpos.cxx |1 sc/source/core/tool/chgtrack.cxx |8 sc/source/core/tool/chgviset.cxx |1 sc/source/core/tool/compiler.cxx |4 sc/source/core/tool/consoli.cxx |1 sc/source/core/tool/dbdata.cxx |1 sc/source/core/tool/defaultsoptions.cxx |4 sc/source/core/tool/detdata.cxx |1 sc/source/core/tool/detfunc.cxx |7 sc/source/core/tool/docoptio.cxx |3 sc/source/core/tool/doubleref.cxx|1 sc/source/core/tool/editutil.cxx |4 sc/source/core/tool/formulagroup.cxx |8 sc/source/core/tool/formulaopt.cxx |1 sc/source/core/tool/inputopt.cxx |2 sc/source/core/tool/interpr1.cxx |5 sc/source/core/tool/interpr2.cxx | 10 sc/source/core/tool/interpr3.cxx
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8404ae521a9c2d183d4e076a7884627ba353e4b
Author: Eike Rathke
AuthorDate: Fri Nov 27 10:50:49 2020 +0100
Commit: Eike Rathke
CommitDate: Fri Nov 27 10:51:29 2020 +0100
Fix comment
Change-Id: I2ae6e3cadc0f182c4798e5d33b0c7f07fbcbbff6
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 7d46c754b433..81fa0cf925b7 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -338,7 +338,7 @@ void doubleToString(typename T::String ** pResult,
{
const sal_Int32 nDec = nDecPlaces - nDig2;
nDecPlaces -= nDec;
-// nDec-1 is also offset into slot, rounded(-1=0) or not(-2=1)
+// nDec-1 is also offset into slot, rounded(1-1=0) or
not(2-1=1)
const size_t nSlot = ((fValue < fB3) ? 4 : ((fValue < fB2) ? 3
: ((fValue < fB1) ? 2 : ((fValue < DBL_MAX) ? 1 :
0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/inc/inscodlg.hxx| 15
sc/source/ui/miscdlgs/inscodlg.cxx | 136 +++---
sc/uiconfig/scalc/ui/pastespecial.ui | 723 +++
3 files changed, 484 insertions(+), 390 deletions(-)
New commits:
commit 4c0c77f10c3967c720cb0511dc26986a5b003f33
Author: Heiko Tietze
AuthorDate: Tue Nov 24 17:14:08 2020 +0100
Commit: Heiko Tietze
CommitDate: Fri Nov 27 10:39:55 2020 +0100
Resolves tdf#134802 - Improved "Paste Special" dialog box
* New design
* Paste Format Only added
* Code clean-up
Change-Id: Id414b5f0d4cc27ffd861c2272d755f7ccbd06d64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106540
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 9f23194c66ae..7cb2ce637f34 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -34,6 +34,7 @@ public:
InsertDeleteFlags GetInsContentsCmdBits() const;
ScPasteFunc GetFormulaCmdBits() const;
+
boolIsSkipEmptyCells() const;
boolIsTranspose() const;
boolIsLink() const;
@@ -50,11 +51,10 @@ private:
bool bChangeTrack;
bool bMoveDownDisabled;
bool bMoveRightDisabled;
-bool bUsedShortCut;
-
-InsertDeleteFlags nShortCutInsContentsCmdBits;
-bool bShortCutTranspose;
-
+void SetInsContentsCmdBits(const InsertDeleteFlags eFlags);
+void SetFormulaCmdBits(const ScPasteFunc eFlags);
+void SetCellCmdFlags(const InsCellCmd eFlags);
+void SetContentsFlags(const InsertContentsFlags eFlags);
std::unique_ptrmxBtnInsAll;
std::unique_ptrmxBtnInsStrings;
@@ -82,12 +82,15 @@ private:
std::unique_ptr mxBtnShortCutPasteValuesOnly;
std::unique_ptr mxBtnShortCutPasteValuesFormats;
std::unique_ptr mxBtnShortCutPasteTranspose;
+std::unique_ptr mxBtnShortCutPasteFormats;
+
+std::unique_ptr mxImmediately;
static bool bPreviousAllCheck;
static InsertDeleteFlags nPreviousChecks;
static InsertContentsFlags nPreviousChecks2;
static ScPasteFunc nPreviousFormulaChecks;
-static sal_uInt16 nPreviousMoveMode; // enum InsCellCmd
+static InsCellCmd nPreviousMoveMode;
void DisableChecks( bool bInsAllChecked );
void TestModes();
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx
b/sc/source/ui/miscdlgs/inscodlg.cxx
index d3edb5855c34..772f207a4afe 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -21,11 +21,10 @@
#include
-bool ScInsertContentsDlg::bPreviousAllCheck = false;
InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks =
InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME |
InsertDeleteFlags::STRING;
ScPasteFunc ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE;
InsertContentsFlags ScInsertContentsDlg::nPreviousChecks2 =
InsertContentsFlags::NONE;
-sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum
InsCellCmd
+InsCellCmd ScInsertContentsDlg::nPreviousMoveMode = InsCellCmd::INS_NONE;
ScInsertContentsDlg::ScInsertContentsDlg(weld::Window* pParent,
const OUString* pStrTitle )
@@ -35,9 +34,6 @@ ScInsertContentsDlg::ScInsertContentsDlg(weld::Window*
pParent,
, bChangeTrack(false)
, bMoveDownDisabled(false)
, bMoveRightDisabled(false)
-, bUsedShortCut(false)
-, nShortCutInsContentsCmdBits(InsertDeleteFlags::NONE )
-, bShortCutTranspose(false)
, mxBtnInsAll(m_xBuilder->weld_check_button("paste_all"))
, mxBtnInsStrings(m_xBuilder->weld_check_button("text"))
, mxBtnInsNumbers(m_xBuilder->weld_check_button("numbers"))
@@ -60,47 +56,25 @@ ScInsertContentsDlg::ScInsertContentsDlg(weld::Window*
pParent,
,
mxBtnShortCutPasteValuesOnly(m_xBuilder->weld_button("paste_values_only"))
,
mxBtnShortCutPasteValuesFormats(m_xBuilder->weld_button("paste_values_formats"))
, mxBtnShortCutPasteTranspose(m_xBuilder->weld_button("paste_transpose"))
+, mxBtnShortCutPasteFormats(m_xBuilder->weld_button("paste_formats"))
+, mxImmediately(m_xBuilder->weld_check_button("cbImmediately"))
{
if (pStrTitle)
m_xDialog->set_title(*pStrTitle);
-mxBtnInsAll->set_active( ScInsertContentsDlg::bPreviousAllCheck );
-mxBtnInsStrings->set_active( bool(InsertDeleteFlags::STRING &
ScInsertContentsDlg::nPreviousChecks) );
-mxBtnInsNumbers->set_active( bool(InsertDeleteFlags::VALUE &
ScInsertContentsDlg::nPreviousChecks) );
-mxBtnInsDateTime->set_active( bool(InsertDeleteFlags::DATETIME &
ScInsertContentsDlg::nPreviousChecks) );
-mxBtnInsFormulas->set_active( bool(InsertDeleteFlags::FORMULA &
ScInsertContentsDlg::nPreviousChecks) );
-mxBtnInsNotes->set_active( bool(InsertDeleteFlags::N
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar.ui | 51 +++--- 1 file changed, 41 insertions(+), 10 deletions(-) New commits: commit c8ca030367180330359ad3b0c6e0fcd8759741e8 Author: andreas kainz AuthorDate: Fri Nov 27 09:39:52 2020 +0100 Commit: Andreas Kainz CommitDate: Fri Nov 27 10:36:15 2020 +0100 writer notebookbar update for 7.2 Change-Id: Id754c59acd5a548fb96b085e63d1e8f39805ca46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106721 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index b2db8be91554..3a5e5b195fba 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -3365,6 +3365,8 @@ True True +center +True both-horiz False @@ -3389,6 +3391,8 @@ True True +center +True both-horiz False @@ -3442,10 +3446,13 @@ True False +center +True True True +center True @@ -3470,6 +3477,7 @@ True True +center 5 @@ -3493,6 +3501,7 @@ True True +center icons False @@ -3536,10 +3545,12 @@ True False center +True True True +center icons False @@ -3608,6 +3619,7 @@ True False end +center 5 5 True @@ -3624,6 +3636,7 @@ True True +center icons False @@ -3659,6 +3672,7 @@ True False +center 5 5 vertical @@ -3674,6 +3688,7 @@ True True +center icons False @@ -3741,8 +3756,6 @@ True False -center -True True @@ -3769,10 +3782,12 @@ True False center +True True True +center icons
Re: FastSaxParser ans XFastParser
On 27.11.20 01:20, Regina Henschel wrote: The API has an interface XDTDHandler in com::sun::star::xml::sax with the methods "notationDecl" and "unparsedEntityDecl". An OpenGrok search leads to /core/sax/source/expatwrap/sax_expat.cxx. So it seems you need to implement a class which supports this interface. But I'm still a novice in many aspects and it would be better a professional developer gives you ideas for further steps. true, but * FastParser doesn't use XDTDHandler, it's only used with the "old" expatwrap parser that isn't "fast". * XDTDHandler is only for unparsed entities, whereas here internal entities would be required and those are always parsed entities there isn't any UNO API for internal entities. the internal entities should be handled by libxml2 itself, the problem is that the DTD isn't read (it's not bundled?) so they aren't declared. so i guess you could either figure out how to get this DTD bundled (note that there are different versions of MathML, and that you should ask your local Debian Developer what they think about its license before bundling it), or to provide these entities as built-in via some hook as Noel proposed in https://gerrit.libreoffice.org/c/core/+/106630. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/vba_tests/cint.vb |4
basic/qa/vba_tests/isnumeric.vb |4
basic/source/sbx/sbxscan.cxx|4 +++-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit ceb69f85c2c77827642be47aa14cb15ca87f683a
Author: Anshu
AuthorDate: Wed Nov 25 09:19:31 2020 +0530
Commit: Mike Kaganski
CommitDate: Fri Nov 27 10:14:56 2020 +0100
tdf#136801 : IsNumeric("+2") and CInt("+2") return correct values
Change-Id: I036f21c8196530973d2cdc366da7654ccd930892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106556
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/qa/vba_tests/cint.vb b/basic/qa/vba_tests/cint.vb
index 6c1d53c93c61..a178a0f97d62 100644
--- a/basic/qa/vba_tests/cint.vb
+++ b/basic/qa/vba_tests/cint.vb
@@ -73,6 +73,10 @@ REMTestLog_ASSERT nr1 = nr2, "the return CInt is: " & nr1
nr1 = CInt("&H754")
TestLog_ASSERT nr1 = nr2, "the return CInt is: " & nr1
+nr2 = 21
+nr1 = CInt("+21")
+TestLog_ASSERT nr1 = nr2, "the return CInt is:" & nr1
+
result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
verify_testCInt = result
diff --git a/basic/qa/vba_tests/isnumeric.vb b/basic/qa/vba_tests/isnumeric.vb
index 2383f4bfe299..511a51bd9106 100644
--- a/basic/qa/vba_tests/isnumeric.vb
+++ b/basic/qa/vba_tests/isnumeric.vb
@@ -51,6 +51,10 @@ remTestLog_ASSERT date1 = date2, "the return IsNumeric
is: " & date1
date1 = IsNumeric("123")
TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+date2 = True
+date1 = IsNumeric("+123")
+TestLog_ASSERT date1 = date2, "the return IsNumeric is: " & date1
+
result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
verify_testIsNumeric = result
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index d2f5c91e3483..de3d50dbed38 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -108,7 +108,9 @@ ErrCode ImpScan( const OUString& rWSrc, double& nVal,
SbxDataType& rType,
SbxDataType eScanType = SbxSINGLE;
while( *p == ' ' || *p == '\t' )
p++;
-if( *p == '-' )
+if (*p == '+')
+p++;
+else if( *p == '-' )
{
p++;
bMinus = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 25bb4c31a68acd4526176580be72a9d4d626d013
Author: Stephan Bergmann
AuthorDate: Fri Nov 27 08:22:33 2020 +0100
Commit: Stephan Bergmann
CommitDate: Fri Nov 27 09:48:53 2020 +0100
Adapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601
..."Update language-subtag-registry to 2020-09-29"
Change-Id: Idea4df8f6a920cbceb37d5156417f6979d7a4fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106718
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 66ced179cb17..fd8d63d1797e 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -255,10 +255,10 @@
"dest-filename":
"external/tarballs/libfreehand-0.1.2.tar.xz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";,
-"sha256":
"fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da",
+"url":
"https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";,
+"sha256":
"cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f",
"type": "file",
-"dest-filename":
"external/tarballs/language-subtag-registry-2020-04-01.tar.bz2"
+"dest-filename":
"external/tarballs/language-subtag-registry-2020-09-29.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docbm.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6a11f94ab366e1d736e97e31e908e86aa5d8b533
Author: Michael Stahl
AuthorDate: Thu Nov 26 19:55:27 2020 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 27 09:46:29 2020 +0100
sw_fieldmarkhide: fix getFieldMarkFor() to return innermost field
... like it's supposed to; if it finds the outer field and then the next
field is inside but ends *before* the rPos then the loop is erroneously
terminated.
Change-Id: Ic5e469d1c05cecd7feca275dc1689af2c40567f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106710
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 406685c58691..c71178e1f005 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1405,10 +1405,11 @@ namespace sw::mark
return nullptr;
auto pFieldmark(*itFieldmark);
for ( ; itFieldmark != m_vFieldmarks.end()
-&& (**itFieldmark).IsCoveringPosition(rPos); ++itFieldmark)
+&& (**itFieldmark).GetMarkStart() <= rPos; ++itFieldmark)
{ // find the innermost fieldmark
-if (pFieldmark->GetMarkStart() < (**itFieldmark).GetMarkStart()
-|| (**itFieldmark).GetMarkEnd() < pFieldmark->GetMarkEnd())
+if (rPos < (**itFieldmark).GetMarkEnd()
+&& (pFieldmark->GetMarkStart() < (**itFieldmark).GetMarkStart()
+|| (**itFieldmark).GetMarkEnd() <
pFieldmark->GetMarkEnd()))
{
pFieldmark = *itFieldmark;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |4 1 file changed, 4 insertions(+) New commits: commit 283124fcf07fe8e38417579ce6d94ecf56715ac1 Author: Caolán McNamara AuthorDate: Thu Nov 26 17:13:28 2020 + Commit: Caolán McNamara CommitDate: Fri Nov 27 09:45:53 2020 +0100 silence warnings about negative widths under RTL I don't see any visual problems, but there are these annoying warnings Change-Id: Ifc8830503cdc57084272a973b09927069caabada Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106713 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 4680acf77a67..bb636e7874f8 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2953,6 +2953,10 @@ void GtkSalFrame::damaged(sal_Int32 nExtentsX, sal_Int32 nExtentsY, } #endif +// quite a bit of noise in RTL mode with negative widths +if (nExtentsWidth <= 0 || nExtentsHeight <= 0) +return; + gtk_widget_queue_draw_area(GTK_WIDGET(m_pFixedContainer), nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc extras/source vcl/Package_tipoftheday.mk
cui/inc/tipoftheday.hrc |8
extras/source/tipoftheday/formdocuments.png |binary
extras/source/tipoftheday/masterdocument.png |binary
extras/source/tipoftheday/printnote.png |binary
extras/source/tipoftheday/statusbar.png |binary
vcl/Package_tipoftheday.mk |4
6 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit c12bc5757c021f8ba3f802b26805964a11aaa71d
Author: andreas kainz
AuthorDate: Fri Nov 27 08:54:43 2020 +0100
Commit: Andreas Kainz
CommitDate: Fri Nov 27 09:35:38 2020 +0100
tdf#127294 add ToD Previews
Change-Id: Icd049b0ae313e4c3095975a98f8765372fa22abf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106719
Tested-by: Jenkins
Reviewed-by: Andreas Kainz
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f5d06db9657e..95806eb9bff1 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -47,13 +47,13 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user
interface options to make you feel at home"), ".uno:ToolbarModeUI",
"toolbarmode.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a
read-only document in Writer? Insert frames or sections that can authorize
changes."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html";,
"tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ Impress tab and select Notes under Document ▸ Type."), "",
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ Impress tab and select Notes under Document ▸ Type."), "",
"printnote.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user
profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master
document lets you manage large documents as a container for individual
%PRODUCTNAME Writer files."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html";,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF";, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the
status bar (at the bottom of the document window). Place the cursor over each
field for an explanation. If not visible, use View ▸ Status Bar."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets?
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "",
"tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
"formdocuments.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
@@ -66,7 +66,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "",
"tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected
cells/grey background."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html";,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸
