[Libreoffice-commits] core.git: connectivity/source

[Lionel Elie Mamane (via logerrit)]

 connectivity/source/drivers/postgresql/pq_baseresultset.cxx   |2 +-
 connectivity/source/drivers/postgresql/pq_connection.cxx  |3 ++-
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx   |2 +-
 connectivity/source/drivers/postgresql/pq_tools.hxx   |8 

 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 177792660697f85763b39f455d7ebff0f83084fd
Author: Lionel Elie Mamane 
AuthorDate: Tue Nov 17 02:14:15 2020 +0100
Commit: Lionel Mamane 
CommitDate: Fri Dec 18 08:49:56 2020 +0100

pgsql-sdbc: use libpq's custom free()...

... for stuff allocated by libpq

Their documentation says this is important on Microsoft Windows:

 It is particularly important that this function, rather than free(),
 be used on Microsoft Windows. This is because allocating memory in a
 DLL and releasing it in the application works only if
 multithreaded/single-threaded, release/debug, and static/dynamic
 flags are the same for the DLL and the application.

Also use const unique_ptr since we don't need the value to survive the
scope in any way.

Change-Id: If4637ea0cd1c05125d63e2f3d37dbeaf716973f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105967
Tested-by: Lionel Mamane 
Reviewed-by: Lionel Mamane 

diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 8fc7140e4817..9ff5e01e098a 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -456,7 +456,7 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 
columnIndex )
 char * res = reinterpret_cast(PQunescapeBytea( 
reinterpret_cast(val.getStr()), &length));
 ret = Sequence< sal_Int8 > ( reinterpret_cast(res), length 
);
 if( res )
-free( res );
+PQfreemem( res );
 }
 return ret;
 }
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 5d97f2b2436d..e4716fe8855d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -41,6 +41,7 @@
 
 #include "pq_connection.hxx"
 #include "pq_statement.hxx"
+#include "pq_tools.hxx"
 #include "pq_preparedstatement.hxx"
 #include "pq_databasemetadata.hxx"
 #include "pq_xtables.hxx"
@@ -461,7 +462,7 @@ void Connection::initialize( const Sequence< Any >& 
aArguments )
 if ( err != nullptr)
 {
 errorMessage = OUString( err, strlen(err), 
ConnectionSettings::encoding );
-free(err);
+PQfreemem(err);
 }
 else
 errorMessage = "#no error message#";
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index c1d9a4f66731..344c27175850 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -481,7 +481,7 @@ void PreparedStatement::setBytes(
 checkClosed();
 checkColumnIndex( parameterIndex );
 size_t len;
-std::unique_ptr escapedString(
+const std::unique_ptr> 
escapedString(
 PQescapeBytea( reinterpret_cast(x.getConstArray()), x.getLength(), &len));
 if( ! escapedString )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx 
b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 90490be81eb6..18b105870705 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -51,6 +51,14 @@
 #include 
 #include 
 
+namespace
+{
+// helper to create one-time deleters
+template 
+using deleter_from_fn = std::integral_constant;
+
+}
+
 namespace pq_sdbc_driver
 {
 bool isWhitespace( sal_Unicode c );
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 
b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 880adc647c7e..d8780e76c563 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -481,7 +481,7 @@ void UpdateableResultSet::updateBytes( sal_Int32 
columnIndex, const css::uno::Se
 
 m_updateableField[columnIndex-1].value <<=
 OUString( reinterpret_cast(escapedString), len, 
RTL_TEXTENCODING_ASCII_US );
-free( escapedString );
+PQfreemem( escapedString );
 }
 
 void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const 
css::util::Date& x )
___
Libreoffice-commits mailing list
libreof

[Libreoffice-commits] core.git: connectivity/source

[Lionel Elie Mamane (via logerrit)]

 connectivity/source/drivers/postgresql/pq_connection.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b815bc466695cd1700a2c8d0cdc5201ed5a95032
Author: Lionel Elie Mamane 
AuthorDate: Tue Nov 17 02:23:56 2020 +0100
Commit: Lionel Mamane 
CommitDate: Fri Dec 18 08:48:29 2020 +0100

pgsql-sdbc small optimisation

1) use const unique_ptr since we don't need the value to survive the
   scope in any way.

2) put the custom deleter function (PQconninfoFree) in the ptr class
   rather than at runtime. Saves one pointer in the ptr class and
   reduces the ptr class overhead...

Change-Id: I914baa0d8ae0426322fd343f5163d09f43c4c41c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105968
Tested-by: Jenkins
Reviewed-by: Lionel Mamane 

diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 4d56d52ec9a9..5d97f2b2436d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -453,7 +453,8 @@ void Connection::initialize( const Sequence< Any >& 
aArguments )
 if ( o.getLength() > 0 )
 {
 char *err;
-std::shared_ptr 
oOpts(PQconninfoParse(o.getStr(), &err), PQconninfoFree);
+const std::unique_ptr>
+oOpts(PQconninfoParse(o.getStr(), &err));
 if (oOpts == nullptr)
 {
 OUString errorMessage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff reportdesign/source xmloff/source

[Noel (via logerrit)]

 include/xmloff/xmltoken.hxx |5 +
 include/xmloff/xmluconv.hxx |   38 
++
 reportdesign/source/filter/xml/xmlGroup.cxx |4 -
 reportdesign/source/filter/xml/xmlImage.cxx |2 
 reportdesign/source/filter/xml/xmlReport.cxx|2 
 reportdesign/source/filter/xml/xmlSection.cxx   |6 -
 reportdesign/source/filter/xml/xmlTable.cxx |6 -
 xmloff/source/chart/SchXMLAxisContext.cxx   |4 -
 xmloff/source/core/xmltoken.cxx |   11 ++
 xmloff/source/core/xmluconv.cxx |   19 +
 xmloff/source/draw/animationimport.cxx  |   30 +++
 xmloff/source/draw/animimp.cxx  |6 -
 xmloff/source/draw/eventimp.cxx |8 +-
 xmloff/source/draw/ximpcustomshape.cxx  |4 -
 xmloff/source/draw/ximpshap.cxx |8 +-
 xmloff/source/style/DashStyle.cxx   |2 
 xmloff/source/style/GradientStyle.cxx   |2 
 xmloff/source/style/HatchStyle.cxx  |2 
 xmloff/source/style/TransGradientStyle.cxx  |2 
 xmloff/source/style/XMLBackgroundImageContext.cxx   |   11 +-
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx  |4 -
 xmloff/source/style/xmlnumfi.cxx|4 -
 xmloff/source/text/XMLAnchorTypePropHdl.hxx |2 
 xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |4 -
 xmloff/source/text/XMLIndexBibliographyEntryContext.cxx |2 
 xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx  |2 
 xmloff/source/text/XMLIndexTableSourceContext.cxx   |2 
 xmloff/source/text/XMLIndexTemplateContext.cxx  |2 
 xmloff/source/text/XMLTextColumnsContext.cxx|4 -
 xmloff/source/text/XMLTextFrameContext.cxx  |4 -
 xmloff/source/text/XMLTextShapeImportHelper.cxx |2 
 xmloff/source/text/txtfldi.cxx  |2 
 xmloff/source/text/txtprhdl.cxx |2 
 33 files changed, 140 insertions(+), 68 deletions(-)

New commits:
commit d9b8670548561f7f53a546b8fe53212c6b1ce26e
Author: Noel 
AuthorDate: Thu Dec 17 16:23:57 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 18 07:56:54 2020 +0100

use more string_view in convertEnum

Change-Id: I859de4b908672722e1873c5b41cb456b42258ddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107885
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e0f3ef898c65..0a8a12381240 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3410,6 +3410,11 @@ namespace xmloff::token {
 const OUString& rString,
 enum XMLTokenEnum eToken );
 
+/// compare eToken to the string
+XMLOFF_DLLPUBLIC bool IsXMLToken(
+std::string_view rString,
+enum XMLTokenEnum eToken );
+
 XMLOFF_DLLPUBLIC bool IsXMLToken(
 const sax_fastparser::FastAttributeList::FastAttributeIter& aIter,
 enum XMLTokenEnum eToken );
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 3a9950edbd64..daca3b617f7f 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -147,6 +147,21 @@ public:
 return bRet;
 }
 
+/** convert string to enum using given enum map, if the enum is
+not found in the map, this method will return false */
+template
+static bool convertEnum( EnumT& rEnum,
+ std::string_view rValue,
+ const SvXMLEnumMapEntry *pMap )
+{
+sal_uInt16 nTmp;
+bool bRet = convertEnumImpl(nTmp, rValue,
+reinterpret_cast*>(pMap));
+if (bRet)
+rEnum = static_cast(nTmp);
+return bRet;
+}
+
 /** convert string to enum using given token map, if the enum is
 not found in the map, this method will return false */
 template
@@ -162,6 +177,21 @@ public:
 return bRet;
 }
 
+/** convert string to enum using given token map, if the enum is
+not found in the map, this method will return false */
+template
+static bool convertEnum( EnumT& rEnum,
+ std::string_view rValue,
+ const SvXMLEnumStringMapEntry *pMap )
+{
+sal_uInt16 nTmp;
+bool bRet = convertEnumImpl(nTmp, rValue,
+reinterpret_cast*>(pMap));
+if (bRet)
+rEnum = sta

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - drawinglayer/source

[Armin Le Grand (allotropia) (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   48 +++-
 1 file changed, 34 insertions(+), 14 deletions(-)

New commits:
commit 5592d5e97810e68bcc0a70b2892c4ad487a06f81
Author: Armin Le Grand (allotropia) 
AuthorDate: Tue Dec 15 00:52:05 2020 +0100
Commit: Michael Weghorn 
CommitDate: Fri Dec 18 07:46:18 2020 +0100

tdf#131281 Always draw FormControls when TiledRendering

When FormControls are not in layout mode it would be necessary
to have real VCL ChildWindows in the client (usually the office).
While this is done in the office itself and thus the visualization
of FormControls (and their usage) is guaranteed, this is currently
not the case for existing clients of TiledRendering.

The big solution would be an API for the TiledRendering client
to get infos for FormControls and create these locally (what would
allow to have these editable/interactive and in the style of the
client system). As long as this is not the case, I add this fallback
to render the FormControls as content to the tiles to get them
visualized at all.

Change-Id: I0f7a5e7dc028373145a6a19b639ce82bdafc149d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107735
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit bcb8d2d3a08991b4e57189b81f8702aaa8af8a89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107805
Reviewed-by: Michael Weghorn 

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 2e7aa5c96bad..f64d2b474246 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -20,6 +20,7 @@
 #include "vclpixelprocessor2d.hxx"
 #include "vclhelperbufferdevice.hxx"
 #include "helperwrongspellrenderer.hxx"
+#include 
 
 #include 
 #include 
@@ -663,31 +664,50 @@ void VclPixelProcessor2D::processControlPrimitive2D(
 
 if (xNewGraphics.is())
 {
-// link graphics and view
-xControlView->setGraphics(xNewGraphics);
-
-// get position
-const basegfx::B2DHomMatrix aObjectToPixel(maCurrentTransformation
-   * 
rControlPrimitive.getTransform());
-const basegfx::B2DPoint aTopLeftPixel(aObjectToPixel * 
basegfx::B2DPoint(0.0, 0.0));
-
 // find out if the control is already visualized as a 
VCL-ChildWindow. If yes,
 // it does not need to be painted at all.
 uno::Reference xControlWindow(rXControl, 
uno::UNO_QUERY_THROW);
-const bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is()
-  && 
xControlWindow->isVisible());
+bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is()
+&& 
xControlWindow->isVisible());
+
+// tdf#131281 The FormControls are not painted when using the 
Tiled Rendering for a simple
+// reason: when e.g. bControlIsVisibleAsChildWindow is true. This 
is the case because the
+// office is in non-layout mode (default for controls at startup). 
For the common office
+// this means that there exists a real VCL-System-Window for the 
control, so it is *not*
+// painted here due to being exactly obscured by that real Window 
(and creates danger of
+// flickering, too).
+// Tiled Rendering clients usually do *not* have real VCL-Windows 
for the controls, but
+// exactly that would be needed on each client displaying the 
tiles (what would be hard
+// to do but also would have advantages - the clients would have 
real controls in the
+//  shape of their traget system which could be interacted 
with...). It is also what the
+// office does.
+// For now, fallback to just render these controls when Tiled 
Rendering is active to just
+// have them displayed on all clients.
+if (bControlIsVisibleAsChildWindow && 
comphelper::LibreOfficeKit::isActive())
+{
+// Do force paint when we are in Tiled Renderer and 
FormControl is 'visible'
+bControlIsVisibleAsChildWindow = false;
+}
 
 if (!bControlIsVisibleAsChildWindow)
 {
-// draw it. Do not forget to use the evtl. offsetted origin of 
the target device,
+// Needs to be drawn. Link new graphics and view
+xControlView->setGraphics(xNewGraphics);
+
+// get position
+const basegfx::B2DHomMatrix 
aObjectToPixel(maCurrentTransformation
+   * 
rControlPrimitive.getTransform());
+const basegfx::B2DPoint aTopLeftPixel(a

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - drawinglayer/source

[Armin Le Grand (allotropia) (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   48 +++-
 1 file changed, 34 insertions(+), 14 deletions(-)

New commits:
commit f5331b17cb71096ee6f149db841b7802efa0c4c4
Author: Armin Le Grand (allotropia) 
AuthorDate: Tue Dec 15 00:52:05 2020 +0100
Commit: Michael Weghorn 
CommitDate: Fri Dec 18 07:45:58 2020 +0100

tdf#131281 Always draw FormControls when TiledRendering

When FormControls are not in layout mode it would be necessary
to have real VCL ChildWindows in the client (usually the office).
While this is done in the office itself and thus the visualization
of FormControls (and their usage) is guaranteed, this is currently
not the case for existing clients of TiledRendering.

The big solution would be an API for the TiledRendering client
to get infos for FormControls and create these locally (what would
allow to have these editable/interactive and in the style of the
client system). As long as this is not the case, I add this fallback
to render the FormControls as content to the tiles to get them
visualized at all.

Change-Id: I0f7a5e7dc028373145a6a19b639ce82bdafc149d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107735
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit bcb8d2d3a08991b4e57189b81f8702aaa8af8a89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107804
Reviewed-by: Michael Weghorn 

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 0aceee40a631..ebbc41744734 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -20,6 +20,7 @@
 #include "vclpixelprocessor2d.hxx"
 #include "vclhelperbufferdevice.hxx"
 #include "helperwrongspellrenderer.hxx"
+#include 
 
 #include 
 #include 
@@ -695,31 +696,50 @@ void VclPixelProcessor2D::processControlPrimitive2D(
 
 if (xNewGraphics.is())
 {
-// link graphics and view
-xControlView->setGraphics(xNewGraphics);
-
-// get position
-const basegfx::B2DHomMatrix aObjectToPixel(maCurrentTransformation
-   * 
rControlPrimitive.getTransform());
-const basegfx::B2DPoint aTopLeftPixel(aObjectToPixel * 
basegfx::B2DPoint(0.0, 0.0));
-
 // find out if the control is already visualized as a 
VCL-ChildWindow. If yes,
 // it does not need to be painted at all.
 uno::Reference xControlWindow(rXControl, 
uno::UNO_QUERY_THROW);
-const bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is()
-  && 
xControlWindow->isVisible());
+bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is()
+&& 
xControlWindow->isVisible());
+
+// tdf#131281 The FormControls are not painted when using the 
Tiled Rendering for a simple
+// reason: when e.g. bControlIsVisibleAsChildWindow is true. This 
is the case because the
+// office is in non-layout mode (default for controls at startup). 
For the common office
+// this means that there exists a real VCL-System-Window for the 
control, so it is *not*
+// painted here due to being exactly obscured by that real Window 
(and creates danger of
+// flickering, too).
+// Tiled Rendering clients usually do *not* have real VCL-Windows 
for the controls, but
+// exactly that would be needed on each client displaying the 
tiles (what would be hard
+// to do but also would have advantages - the clients would have 
real controls in the
+//  shape of their traget system which could be interacted 
with...). It is also what the
+// office does.
+// For now, fallback to just render these controls when Tiled 
Rendering is active to just
+// have them displayed on all clients.
+if (bControlIsVisibleAsChildWindow && 
comphelper::LibreOfficeKit::isActive())
+{
+// Do force paint when we are in Tiled Renderer and 
FormControl is 'visible'
+bControlIsVisibleAsChildWindow = false;
+}
 
 if (!bControlIsVisibleAsChildWindow)
 {
-// draw it. Do not forget to use the evtl. offsetted origin of 
the target device,
+// Needs to be drawn. Link new graphics and view
+xControlView->setGraphics(xNewGraphics);
+
+// get position
+const basegfx::B2DHomMatrix 
aObjectToPixel(maCurrentTransformation
+   * 
rControlPrimitive.getTransform());
+const basegfx::B2DPoint aTopLeftPixel(a

[Libreoffice-commits] core.git: emfio/source filter/qa filter/source include/tools lotuswordpro/inc lotuswordpro/source sc/qa sc/source sd/qa sd/source sot/source sw/qa sw/source tools/qa tools/source

[Noel (via logerrit)]

 emfio/source/reader/wmfreader.cxx   |2 
 filter/source/graphicfilter/ios2met/ios2met.cxx |3 
 filter/source/graphicfilter/itiff/itiff.cxx |4 
 filter/source/msfilter/dffrecordheader.cxx  |   33 
 filter/source/msfilter/msdffimp.cxx |   10 
 include/tools/stream.hxx|   10 
 lotuswordpro/inc/lwpsvstream.hxx|1 
 lotuswordpro/source/filter/lwpobjhdr.cxx|3 
 lotuswordpro/source/filter/lwpsvstream.cxx  |2 
 sc/qa/unit/data/qpro/pass/.gitignore|2 
 sc/source/filter/excel/xltoolbar.cxx|9 
 sc/source/filter/lotus/lotread.cxx  |   17 
 sc/source/filter/qpro/qpro.cxx  |   10 
 sd/source/filter/ppt/pptin.cxx  |   15 
 sot/source/sdstor/stg.cxx   |   13 
 sw/source/filter/html/htmlreqifreader.cxx   |   89 -
 sw/source/filter/ww8/ww8scan.cxx|3 
 tools/qa/cppunit/test_stream.cxx|   12 
 tools/source/stream/stream.cxx  |   34 
 unotest/source/cpp/filters-test.cxx |2 
 vcl/source/filter/graphicfilter.cxx |9 
 vcl/source/filter/graphicfilter2.cxx| 1229 
 vcl/source/filter/png/pngread.cxx   |2 
 vcl/source/gdi/TypeSerializer.cxx   |   13 
 vcl/source/gdi/dibtools.cxx |5 
 vcl/source/gdi/impgraph.cxx |   18 
 26 files changed, 875 insertions(+), 675 deletions(-)

New commits:
commit 8c9a4ff511a3b1d84a7a6d08a1b153c07f164abb
Author: Noel 
AuthorDate: Mon Nov 16 15:58:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 18 06:54:06 2020 +0100

throw exception in SvStream when reading past end of file

to avoid chasing weird problems where we read past the end
of file, which leads to random data in the variable we read into.

I expect a couple of possible regressions from this change

(1) memory leaks caused by non-exception-safe memory handling.
Of which there should not be much because we're pretty good
about using smart pointer classes these days.

(2) Broken files which used to load, will no longer do so.
These will have to be debugged by putting a breakpoint
on the SvStreamEOFException constructor, and examining
the backtrace to see where we should be catching and ignoring
the exception to make the code continue to handle such broken
files.

Change-Id: I351be031bb083a3484a9a1b650a58892700e6fb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105936
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index 0022fe9b1cb6..123f1c06a731 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1398,7 +1398,7 @@ namespace emfio
 if( mnEndPos - mnStartPos )
 {
 bool bEMFAvailable = false;
-while( true )
+while( !mpInputStream->eof() )
 {
 mpInputStream->ReadUInt32(mnRecSize).ReadUInt16( nFunction 
);
 
diff --git a/filter/qa/cppunit/data/met/pass/hang-2.met 
b/filter/qa/cppunit/data/met/fail/hang-3.met
similarity index 100%
rename from filter/qa/cppunit/data/met/pass/hang-2.met
rename to filter/qa/cppunit/data/met/fail/hang-3.met
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index cdf18abc66e4..3a7c6b7048ba 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2806,6 +2806,9 @@ imeGraphicImport( SvStream & rStream, Graphic & rGraphic, 
FilterConfigItem* )
 catch (const css::uno::Exception&)
 {
 }
+catch(SvStreamEOFException&)
+{
+}
 
 return bRet;
 }
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index e7c57e38..f07e496bc347 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1721,6 +1721,10 @@ itiGraphicImport( SvStream & rStream, Graphic & 
rGraphic, FilterConfigItem* )
 {
 return aTIFFReader.ReadTIFF(rStream, rGraphic);
 }
+catch (const SvStreamEOFException &)
+{
+return false;
+}
 catch (const std::bad_alloc &)
 {
 return false;
diff --git a/filter/source/msfilter/dffrecordheader.cxx 
b/filter/source/msfilter/dffrecordheader.cxx
index b1d4316b630b..2a8c91a89b1b 100644
--- a/filter/source/msfilter/dffrecordheader.cxx
+++ b/filter/source/msfilter/dffrecordheader.cxx
@@ -22,19 +22,28 @@
 bool ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec)
 {
 rRec.nFilePos = rIn.Tell();
-sal_uInt16 nTmp(0);
-rIn.ReadUInt16(nTmp);
-rRec.nImpVerInst = nTmp;
-rRec.nRecVer = sal::static

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - filter/source

[Georgy Litvinov (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit faf245d0af5c9a6ae1e79349311945dacffdae7f
Author: Georgy Litvinov 
AuthorDate: Wed Dec 16 23:16:32 2020 +0100
Commit: Noel Grandin 
CommitDate: Fri Dec 18 06:52:28 2020 +0100

tdf#138818 Import full TIFF file

Change-Id: I519c810b8e52f698884eb8feac6994140ce9ca25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107859
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 475422a4368b22df0418a2120ab2dec5d3440892)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107896

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 061d1a0ac73b..e7c57e38 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1695,7 +1695,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 
 // seek to end of TIFF if succeeded
 pTIFF->SetEndian( nOrigNumberFormat );
-pTIFF->Seek(bStatus ? nMaxPos : nOrigPos);
+pTIFF->Seek(bStatus ? STREAM_SEEK_TO_END: nOrigPos);
 
 if ( aAnimation.Count() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6610266bde5a836d8ee1bfec6c8ab9d30c1d2529
Author: Seth Chaiklin 
AuthorDate: Fri Dec 18 03:55:38 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 18 03:55:38 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to f5ff6097a41055bb91d73a9c9fa847f03212431c
  - tdf#107229 repair links to standard_template

Change-Id: Ic71e11d69ae13ee5b391460c3125240f83883438
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107905
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 421d76024ce5..f5ff6097a410 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 421d76024ce554072d3e062345eeaa32e735f3c6
+Subproject commit f5ff6097a41055bb91d73a9c9fa847f03212431c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/auxiliary source/text

[Seth Chaiklin (via logerrit)]

 source/auxiliary/swriter.tree|2 +-
 source/text/swriter/guide/main.xhp   |2 +-
 source/text/swriter/guide/pagestyles.xhp |2 +-
 source/text/swriter/guide/text_direct_cursor.xhp |2 +-
 source/text/swriter/guide/using_hyphen.xhp   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f5ff6097a41055bb91d73a9c9fa847f03212431c
Author: Seth Chaiklin 
AuthorDate: Fri Dec 18 03:45:16 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Fri Dec 18 03:55:38 2020 +0100

tdf#107229 repair links to standard_template

Change-Id: Ic71e11d69ae13ee5b391460c3125240f83883438
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107905
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree
index 26d2cd238..dde7dccfe 100644
--- a/source/auxiliary/swriter.tree
+++ b/source/auxiliary/swriter.tree
@@ -135,7 +135,7 @@
 Using Styles From 
Another Document or Template
 Creating New 
Styles From Selections
 Updating Styles From 
Selections
-Creating and 
Changing Default and Custom Templates
+Creating and 
Changing Default and Custom Templates

 Changing Page 
Orientation (Landscape or Portrait)
 Changing the Case of 
Text
diff --git a/source/text/swriter/guide/main.xhp 
b/source/text/swriter/guide/main.xhp
index fc73b4380..feb19e264 100644
--- a/source/text/swriter/guide/main.xhp
+++ b/source/text/swriter/guide/main.xhp
@@ -64,7 +64,7 @@
 
 
 
-
+
 
 
 Automatically Entering and Formatting 
Text
diff --git a/source/text/swriter/guide/pagestyles.xhp 
b/source/text/swriter/guide/pagestyles.xhp
index e8992bbcd..52befb21a 100644
--- a/source/text/swriter/guide/pagestyles.xhp
+++ b/source/text/swriter/guide/pagestyles.xhp
@@ -110,7 +110,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/guide/text_direct_cursor.xhp 
b/source/text/swriter/guide/text_direct_cursor.xhp
index a24925d41..c28531c4e 100644
--- a/source/text/swriter/guide/text_direct_cursor.xhp
+++ b/source/text/swriter/guide/text_direct_cursor.xhp
@@ -59,7 +59,7 @@
   
   
   
-  
+  
   
   
 
\ No newline at end of file
diff --git a/source/text/swriter/guide/using_hyphen.xhp 
b/source/text/swriter/guide/using_hyphen.xhp
index 0f035e63c..0806e1eb8 100644
--- a/source/text/swriter/guide/using_hyphen.xhp
+++ b/source/text/swriter/guide/using_hyphen.xhp
@@ -93,7 +93,7 @@
   
   
   
-  
+  
   
   Text 
Flow

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |  128 ---
 1 file changed, 67 insertions(+), 61 deletions(-)

New commits:
commit ecfcd99abd3f7dfe68a306dd8045d2da79e42d74
Author: Eike Rathke 
AuthorDate: Thu Dec 17 23:25:07 2020 +0100
Commit: Eike Rathke 
CommitDate: Fri Dec 18 03:17:21 2020 +0100

Check intermediate for not to be rounded value, tdf#138360 follow-up

Change-Id: I98cc25267e7a10c34179bab50d19f49436e1c48c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107929
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 527b508e848c..a85c8ac6e959 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1191,75 +1191,81 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 fValue *= fFac;
 }
 
-switch ( eMode )
+// Round only if not already in distance precision gaps of integers, where
+// for [2^52,2^53) adding 0.5 would even yield the next representable
+// integer.
+if (fValue < (static_cast(1) << 52))
 {
-case rtl_math_RoundingMode_Corrected :
-fValue = rtl::math::approxFloor(fValue + 0.5);
-break;
-case rtl_math_RoundingMode_Down:
-fValue = rtl::math::approxFloor(fValue);
-break;
-case rtl_math_RoundingMode_Up:
-fValue = rtl::math::approxCeil(fValue);
-break;
-case rtl_math_RoundingMode_Floor:
-fValue = bSign ? rtl::math::approxCeil(fValue)
-: rtl::math::approxFloor( fValue );
-break;
-case rtl_math_RoundingMode_Ceiling:
-fValue = bSign ? rtl::math::approxFloor(fValue)
-: rtl::math::approxCeil(fValue);
-break;
-case rtl_math_RoundingMode_HalfDown :
-{
-double f = floor(fValue);
-fValue = ((fValue - f) <= 0.5) ? f : ceil(fValue);
-}
-break;
-case rtl_math_RoundingMode_HalfUp:
+switch ( eMode )
 {
-double f = floor(fValue);
-fValue = ((fValue - f) < 0.5) ? f : ceil(fValue);
-}
-break;
-case rtl_math_RoundingMode_HalfEven:
+case rtl_math_RoundingMode_Corrected :
+fValue = rtl::math::approxFloor(fValue + 0.5);
+break;
+case rtl_math_RoundingMode_Down:
+fValue = rtl::math::approxFloor(fValue);
+break;
+case rtl_math_RoundingMode_Up:
+fValue = rtl::math::approxCeil(fValue);
+break;
+case rtl_math_RoundingMode_Floor:
+fValue = bSign ? rtl::math::approxCeil(fValue)
+: rtl::math::approxFloor( fValue );
+break;
+case rtl_math_RoundingMode_Ceiling:
+fValue = bSign ? rtl::math::approxFloor(fValue)
+: rtl::math::approxCeil(fValue);
+break;
+case rtl_math_RoundingMode_HalfDown :
+{
+double f = floor(fValue);
+fValue = ((fValue - f) <= 0.5) ? f : ceil(fValue);
+}
+break;
+case rtl_math_RoundingMode_HalfUp:
+{
+double f = floor(fValue);
+fValue = ((fValue - f) < 0.5) ? f : ceil(fValue);
+}
+break;
+case rtl_math_RoundingMode_HalfEven:
 #if defined FLT_ROUNDS
-/*
-Use fast version. FLT_ROUNDS may be defined to a function by some 
compilers!
-
-DBL_EPSILON is the smallest fractional number which can be represented,
-its reciprocal is therefore the smallest number that cannot have a
-fractional part. Once you add this reciprocal to `x', its fractional part
-is stripped off. Simply subtracting the reciprocal back out returns `x'
-without its fractional component.
-Simple, clever, and elegant - thanks to Ross Cottrell, the original author,
-who placed it into public domain.
-
-volatile: prevent compiler from being too smart
-*/
-if (FLT_ROUNDS == 1)
-{
-volatile double x = fValue + 1.0 / DBL_EPSILON;
-fValue = x - 1.0 / DBL_EPSILON;
-}
-else
-#endif // FLT_ROUNDS
-{
-double f = floor(fValue);
-if ((fValue - f) != 0.5)
+/*
+   Use fast version. FLT_ROUNDS may be defined to a function 
by some compilers!
+
+   DBL_EPSILON is the smallest fractional number which can be 
represented,
+   its reciprocal is therefore the smallest number that cannot 
have a
+   fractional part. Once you add this reciprocal to `x', its 
fractional part
+   is stripped off. Simply subtracting the reciprocal back out 
returns `x'
+   without its fractional component.
+   Sim

[Libreoffice-commits] core.git: sal/rtl

[Eike Rathke (via logerrit)]

 sal/rtl/math.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a10c33fdbe980effc3a14e773d1b94a14be7d428
Author: Eike Rathke 
AuthorDate: Thu Dec 17 22:02:48 2020 +0100
Commit: Eike Rathke 
CommitDate: Fri Dec 18 03:17:03 2020 +0100

Replace log2() call with parts.exponent-1023, tdf#138360 follow-up

... to save some cycles as we anyway need only the integer value
of the exponent and even exactly this value for the number of
possible decimals.

Change-Id: I8d462f53cadde6a95d57d1342d8487fbfa001ae9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107928
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 46a3e925b95b..527b508e848c 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1167,9 +1167,10 @@ double SAL_CALL rtl_math_round(double fValue, int 
nDecPlaces,
 // Determine how many decimals are representable in the precision.
 // Anything greater 2^52 and 0.0 was already ruled out above.
 // Theoretically 0.5, 0.25, 0.125, 0.0625, 0.03125, ...
-const double fDec = 52 - log2(fValue) + 1;
-if (fDec < nDecPlaces)
-nDecPlaces = static_cast(fDec);
+const sal_math_Double* pd = reinterpret_cast(&fValue);
+const sal_Int32 nDec = 52 - (pd->parts.exponent - 1023);
+if (nDec < nDecPlaces)
+nDecPlaces = nDec;
 }
 
 /* TODO: this was without the inverse factor and determining max
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal

[Eike Rathke (via logerrit)]

 include/sal/mathconf.h |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit cb22636a56b35d4e118446cc3c9fe606db6f46b0
Author: Eike Rathke 
AuthorDate: Thu Dec 17 20:44:43 2020 +0100
Commit: Eike Rathke 
CommitDate: Fri Dec 18 01:05:16 2020 +0100

Add sal_uInt64 fields to sal_math_Double

We may need them later, and at least don't have a confusing
inf_parts or nan_parts struct name but just parts as well.

Change-Id: Ife0cf279c47d2815aa2a1483223397b147e9d776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107924
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h
index 8e5831cde3b5..ab6a4807b59f 100644
--- a/include/sal/mathconf.h
+++ b/include/sal/mathconf.h
@@ -104,6 +104,13 @@ union sal_math_Double
 unsigned msw  :32;
 unsigned lsw  :32;
 } w32_parts;
+struct
+{
+sal_uInt64 sign   : 1;
+sal_uInt64 exponent   :11;
+sal_uInt64 fraction   :52;
+} parts;
+sal_uInt64 intrep;
 double value;
 };
 
@@ -130,6 +137,13 @@ union sal_math_Double
 unsigned lsw  :32;
 unsigned msw  :32;
 } w32_parts;
+struct
+{
+sal_uInt64 fraction   :52;
+sal_uInt64 exponent   :11;
+sal_uInt64 sign   : 1;
+} parts;
+sal_uInt64 intrep;
 double value;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d6c22e1dca3fccec51b411dd749894ff32399dd
Author: Seth Chaiklin 
AuthorDate: Fri Dec 18 00:14:00 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 18 00:14:00 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 421d76024ce554072d3e062345eeaa32e735f3c6
  - tdf#130170  - add related topic to Create Style

   ( shared/01/05140100.xhp )
 + add  section
 + add  to guide page "Updating Styles from Selection"
 ( swriter/guide/stylist_update.xhp )
 * update to ,,

( swriter/guide/stylist_update.xhp )
  + add sys-switch for F11/Cmd+T
  * update to 

Change-Id: I9981d46d44f3cb3af490deb0f2b8f976fa111892
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107902
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 9d505510f152..421d76024ce5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9d505510f15289b1393c2b2c654b23f03790c250
+Subproject commit 421d76024ce554072d3e062345eeaa32e735f3c6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/05140100.xhp   |   14 --
 source/text/swriter/guide/stylist_update.xhp |   10 --
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 421d76024ce554072d3e062345eeaa32e735f3c6
Author: Seth Chaiklin 
AuthorDate: Thu Dec 17 23:32:35 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Fri Dec 18 00:14:00 2020 +0100

tdf#130170  - add related topic to Create Style

   ( shared/01/05140100.xhp )
 + add  section
 + add  to guide page "Updating Styles from Selection"
 ( swriter/guide/stylist_update.xhp )
 * update to ,,

( swriter/guide/stylist_update.xhp )
  + add sys-switch for F11/Cmd+T
  * update to 

Change-Id: I9981d46d44f3cb3af490deb0f2b8f976fa111892
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107902
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/01/05140100.xhp 
b/source/text/shared/01/05140100.xhp
index 1c3348bc8..ecbc7e9db 100644
--- a/source/text/shared/01/05140100.xhp
+++ b/source/text/shared/01/05140100.xhp
@@ -1,6 +1,5 @@
 
-
-
+
 
 
-
 
 
 Create Style
@@ -32,11 +30,15 @@
 
 
 
-Create 
Style
+Create Style
   This command is a Styl_ist icon
-  Style name
+  
+  Style name
   Enter a name for the new 
Style.
-  List 
of Custom Styles
+  List of Custom Styles
   Lists the 
user-defined styles that are attached to the current document.
+
+  
+ 
  
 
diff --git a/source/text/swriter/guide/stylist_update.xhp 
b/source/text/swriter/guide/stylist_update.xhp
index d74362dd1..600c80e90 100644
--- a/source/text/swriter/guide/stylist_update.xhp
+++ b/source/text/swriter/guide/stylist_update.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+
 
   
  Updating Styles From 
Selections
@@ -33,11 +31,11 @@
   Styles window; updating from selections
   updating; styles, from selections
 
-Updating Styles From Selections
-
+Updating Styles From Selections
+
   
  
-Choose View - Styles or press 
F11.
+Choose View - Styles or press 
Command+TF11.
  
  
 Click the icon of the style category that you want to 
update.UFI: use "category" for consistent wording, see 
#i21144#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf137729.py |   54 
 1 file changed, 54 insertions(+)

New commits:
commit 601329a5e873506ddbea9b7e0669fb63bb46ad53
Author: Xisco Fauli 
AuthorDate: Thu Dec 17 17:37:40 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 23:05:04 2020 +0100

tdf#137729: sd: Add UItest

Change-Id: I936ac8a526c8b3013f9ca37dda572cb6a2c7e3f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107890
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sd/qa/uitest/impress_tests/tdf137729.py 
b/sd/qa/uitest/impress_tests/tdf137729.py
new file mode 100644
index ..1e4dfb050b5a
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf137729.py
@@ -0,0 +1,54 @@
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from com.sun.star.drawing.HatchStyle import SINGLE
+from uitest.uihelper.common import get_state_as_dict
+
+class tdf137729(UITestCase):
+
+def test_tdf137729(self):
+
+self.ui_test.create_doc_in_start_center("impress")
+
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:PageSetup")
+
+xPageSetupDlg = self.xUITest.getTopFocusWindow()
+tabcontrol = xPageSetupDlg.getChild("tabcontrol")
+select_pos(tabcontrol, "1")
+
+xBtn = xPageSetupDlg.getChild('btnhatch')
+xBtn.executeAction("CLICK", tuple())
+
+xDistance = xPageSetupDlg.getChild('distancemtr')
+xDistance.executeAction("UP", tuple())
+
+xOkBtn = xPageSetupDlg.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+document = self.ui_test.get_component()
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillHatch.Style, SINGLE )
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillHatch.Color, 0)
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillHatch.Distance, 152)
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillHatch.Angle, 0)
+
+# Without the patch in place, this test would have failed with
+# AssertionError: '' != 'hatch'
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillHatchName, 'hatch')
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
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/libreoffice-7.1.0.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.0.1' created by Christian Lohmaier 
 at 2020-12-17 21:59 +

Tag libreoffice-7.1.0.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/b1NMACgkQ9DSh76/u
rqOBoRAAySxpKLEzeVJseAbW/nO+ThMH4Mz1YgbNd19YmvKyEYH0VSFyp9xkVLP6
42uSNePk1nIyehHV/qzl4A3jWxLdwZUk+gm6btfO4UpdUuaWa4Dm5XO3NYK4HAAv
sFYrpyJ9od046wObzAdHiK+XvfdKU/N7nyp0oasIDd11/Y01Z6fPH4aos71KMr9Z
L1AjAwDSo56CvQ9pMvT0xh/LAind1l5JkpWUK9Rq6J8ZU51CtKgBApRhKckMPfXP
5A6iNVGOK5I8YaFCrIOzzkWXujKFnNN5SJYaE/J59tXuaTjtqNzPWQFUrg/sGFJ2
7FqxhIFReQahqypXVKqVZ0vmxXybU3kVEjEgbdqOMm2aqkxnapFaxtHS8Yf/ksMB
nbFluIa5n5GRd3KGzEHur+4+0RYGg2v93m2HiBOVHSKNOXxyh/LfNYr91dzFaKn8
qLakVWbPdv2FnZ43+z3Pwd0oizrZ0NhPfa6U30omhJCGeRGo1IayZ1muIqa2CfcB
PENFibE0s5s3EwPm5xKrzkLdn7amuv0mLnGoech9IW7kQ2Ct3vm+2HkxHuO9d1f6
xKt2qJmG8H1bojziRkHQiHhbhMxaMShBBp8xFMFO2bxVYQ7tiTa+Nk4NSmoGNMRn
nE2D6wdbd+HZdgwX+6EkJkQPgz7FdxYzBfjhjT5sIBmvT92XCwI=
=ITH+
-END PGP SIGNATURE-

Changes since libreoffice-7-1-branch-point-5:
---
 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/libreoffice-7.1.0.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.0.1' created by Christian Lohmaier 
 at 2020-12-17 21:59 +

Tag libreoffice-7.1.0.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/b1NMACgkQ9DSh76/u
rqNbYw/+JGpjrW0+YK0eS8u1vunZaXNGqP3Z8eg408hSw/DadRfgnzfOZy/HxLdK
QiVWF2WseavLjBnUBBafAPk3PFc4XByFavYe1NRbP8eG1yDMITSH3vmfqAPTVO5+
JRXVdIvlpI3bKOJf7rrEvZgV73unK/jlMQXGa5ZLp/QAwdzK3XuQ6qYWR6p+IVCM
SyP7guK/dN4pLVzYr//VC4t7uyyTxzrM50hJZlVnFuJ8SeWpPMOROGzwFZ3Un0bW
WGvaUlnPDV/1885/q0WUcr8csz/xk7CR3YfkAamA9z61AZ5HDNbW10SKoj2p7xP9
j/mbb7Rc7UdYNSrAgE22X9tT5xn171722MuLZ8z9kOZUUoFy/MdHfLfvanQasnH2
7bSkdzTRJLkrcQ2HzcTrESdjVWTL151v7cjnhP/VwAE8dzRS5fq4c4hEukmeLClK
j+DCDXc/Rfckc5nfi6vUgmRi9EskFsTy/NYg7oUGhwEBTZNxTlHsl5z0wAtAejwe
/SR4iViAAsMw4O4U1zyJc2hCTX7Rgk970sZJ/GiDt9TyNYxtxpDySFZLRs5eTPhn
hH1lZN4Jx9Rj8SpGO2HG3HorCu8IV3jqyYpwvLyvDjilYSX0rfYsagV28/rPv7qd
2tq93gOBtAXi9c+uc+kx5RRb2zW9lT63y5uv4UGROn/p+2HAARo=
=bA0X
-END PGP SIGNATURE-

Changes since libreoffice-7-1-branch-point-19:
---
 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/libreoffice-7.1.0.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.0.1' created by Christian Lohmaier 
 at 2020-12-17 21:59 +

Tag libreoffice-7.1.0.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/b1M8ACgkQ9DSh76/u
rqOMzg/+I/Z1Vwfau70CP3NbohY2+cx0UCPgGWghz9FJ4T6Op8hT6H05LzDw9ov9
uPU5btw2aLwmOcQvqlMkBktWoVQq+FOOTnoFcUT6ilCxDmkJrjVUiBfzagrXRM5Y
HJZzp9pzC3S/zq04GazHn80slkuHj9lzShfyHn0DkA2KzMNkpyDbGSAxMtfItPjO
MfGt50VOeXmHqFNkH0EUWs53KmFgXP2N5orYOpNkFlsgXdYLs8J1Uzl0urqK/G3h
+ozAS2p81LdvOXZLcNcFf2goLEMoBy1KaR5qoMv2+o1Ap07VxQijNXF/+kJ21X0h
EZ+8npRJ2Mx/wL9/5uvjicKmp+O2yZdtBAf6AXnRI6GwhsrEyjEJd9fR88+7iu7p
EatdophiCX9KHJMJc1y6KnOXpMWpMupWHQVOnyXxE9eLEwUDrZGaGLRKh/DAPFi1
XaeU2d3MRXkRZVDnRpIj06nyrlxDfQs6nctNrDwOAa49b/z5AR8OVzZs0XFHP8iz
u5oQDglADmpTHD0lACCYY+PXEeJeVaE8Ogke8CE9ZQ/cEoV4nTfP4t64oNAxXRY1
5PuA+KOv6568ymj9/LLXPa2FhwF3j29MmL+rwJpQFsSgg0piBZ1u7epL5FaloKno
fuHaQcp1u9MddB0FYH5aqLke9tkKKYkwZWM683hY+BwN93EmCyM=
=LBn/
-END PGP SIGNATURE-

Changes since libreoffice-7-1-branch-point-2:
---
 0 files changed
---
___
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/libreoffice-7.1.0.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.0.1' created by Christian Lohmaier 
 at 2020-12-17 21:59 +

Tag libreoffice-7.1.0.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/b1NMACgkQ9DSh76/u
rqMW9w/7Bi6YxsTYdAsOYcTkcJjlorAlZWuUyMa9eUpTITJi0K37F4B18pEi6SGX
wALKt3IoLrwv0NIrpLhIL1kdkUZFO57hwai+2jT+B6v8nNFkNYm1LPM3M3eytYoN
k7XsM/j9kSRFcFDo5FIofGVioxgdTfGzqzt2bvIxXrZWq7tMpd/Ql+hNWHQvuh3c
p8mZ7k4/l7p0fnPmsQKBomPmzReV4qYDX1UVbDD7bf+UyyacuynEXFpxaJ5Rs3E+
9vZazKg/z6v+SF6STvW/DpOWcXzhpChXda0u7RNXi2SBaySJ55pRiqZSbXwwPN0r
tYEenEdpBuCvBp6OIp3USBCxx0HSwUJMX4IqACj849Sed9GMjSe5cME1HdayyyJw
vZTiQYav8OLQnIoG4aOmCosLOrCKK/mdAIF29fkkeJGO9BfEkLAh1Dcz1q/9k729
E8y4YpMc8Z7TN0hHYG9cMKimKbmHtfWm3q98Af0VLlm1E2lZZkYCZrcnrNJ3pYlK
umjXYTYv63IgFejPnRXi3+loA77Q4GiBhDHI+vWwQJ2uVlbcW8Lm4QSa1b7t3kgr
hKmA6Y9eRpt3k5xGutb5KBI12M+ll2MVVwXGWiLcWvU+vFsPqCE2mziqGNmZoBIa
RscZOOGi694LVhBJ0boZNB78sH7qHZb6EZgLtZSRjedHbF35rT8=
=1wxm
-END PGP SIGNATURE-

Changes since libreoffice-7-1-branch-point-234:
---
 0 files changed
---
___
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' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7170abcb7d5c62a17fa89005f1c53cb11b4d21e
Author: Christian Lohmaier 
AuthorDate: Thu Dec 17 23:00:49 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 23:00:49 2020 +0100

bump product version to 7.1.0.1.0+

Change-Id: I26de658e876b71eaafecd32d64e2630d4c1fc957

diff --git a/configure.ac b/configure.ac
index c936a0d60b9f..3428679fd82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.1.0.0.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.0.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
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' - sw/qa sw/source

[László Németh (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |   41 
 sw/source/core/undo/unredln.cxx |4 +--
 2 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 709f14321f3e6da69677c138d769fd8084b1c7e6
Author: László Németh 
AuthorDate: Wed Dec 16 12:23:22 2020 +0100
Commit: László Németh 
CommitDate: Thu Dec 17 22:50:18 2020 +0100

sw ChangesInMargin: fix crash at Undo of deletion of paragraph break

Deletion of the paragraph break by pressing Delete results
an empty hidden redline, too, which caused a problem during Undo
(if there were other tracked redlines, too).

Change-Id: I64968688688be72d4e501631244b4c57ab634585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107830
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 172373c4a2c4a66b8abbe26dbe07fd621c971ed0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107899

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c3d4d71d6b5c..496b9b8602bc 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2084,6 +2084,47 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137771)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testJoinParaChangesInMargin)
+{
+load(DATA_DIRECTORY, "tdf54819.fodt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+SwWrtShell* const pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+
+// turn on red-lining and show changes
+SwDoc* pDoc = pWrtShell->GetDoc();
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowInsert
+  | 
RedlineFlags::ShowDelete);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// delete a character and the paragraph break at the end of the paragraph
+dispatchCommand(mxComponent, ".uno:GotoEndOfPara", {});
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+dispatchCommand(mxComponent, ".uno:Delete", {});
+dispatchCommand(mxComponent, ".uno:Delete", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsudolor sit amet."), 
getParagraph(1)->getString());
+
+// Undo
+dispatchCommand(mxComponent, ".uno:Undo", {});
+// this would crash due to bad redline range
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum"), 
getParagraph(1)->getString());
+
+// switch off "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138479)
 {
 SwDoc* const pDoc = createDoc();
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 93d0b0d393a2..0e0d89765beb 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -107,7 +107,7 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 for( SwRedlineTable::size_type n = 1; n < rTable.size(); ++n )
 {
 SwRangeRedline *pRed(rTable[n]);
-if ( pRedline->GetId() < pRed->GetId() && pRed->GetId() < 
nMaxId )
+if ( !pRed->HasMark() && pRedline->GetId() < pRed->GetId() && 
pRed->GetId() < nMaxId )
 {
 nCurRedlinePos = n;
 pRedline = pRed;
@@ -116,7 +116,7 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 
 nMaxId = pRedline->GetId();
 
-if ( !pRedline->IsVisible() )
+if ( !pRedline->IsVisible() && !pRedline->HasMark() )
 {
 // set it visible
 pRedline->Show(0, rTable.GetPos(pRedline), /*bForced=*/true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/reservedid.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e27f6852d20e2c49ca6609ccc6f6a5107cc919e3
Author: Stephan Bergmann 
AuthorDate: Thu Dec 17 20:24:57 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 17 22:36:08 2020 +0100

Various minor loplugin fixes (macOS ARM64), redux

Change-Id: I720dde70c6f6ca6c25d7b430f117ea578a25f34e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107922
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/reservedid.cxx 
b/compilerplugins/clang/reservedid.cxx
index 2b7a69d54da7..3f019a10d830 100644
--- a/compilerplugins/clang/reservedid.cxx
+++ b/compilerplugins/clang/reservedid.cxx
@@ -145,7 +145,7 @@ bool ReservedId::VisitNamedDecl(NamedDecl const * decl) {
 }
 auto filename = getFilenameOfLocation(spelLoc);
 if (loplugin::hasPathnamePrefix(filename, SRCDIR 
"/bridges/source/cpp_uno/")
-&& filename.endswith("share.hxx"))
+&& (filename.endswith("abi.hxx") || filename.endswith("share.hxx")))
 {
 return true;
 }
___
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' - officecfg/registry

[Christian Lohmaier (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 08e8fb0cba7edbba4436096c248bab30c0564b28
Author: Christian Lohmaier 
AuthorDate: Thu Dec 17 19:27:09 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 22:34:41 2020 +0100

tdf#135580 remove Euro Conversion wizard from menu

it is considered deprecated/scheduled for removal in next version
This change only removes it from the default menu, but leaves it
available in the set of available commands/doesn't remove the actual
conversion wizard

Change-Id: Ib7a37b55a0d6f09d90da66f89c0a2b1b80d0071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107919
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit d6774abbd3eddbf3a6655c57a880f4e28d0cb74a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107901
Tested-by: Christian Lohmaier 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 0ce90a156317..08b39475df5c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -327,17 +327,6 @@
   _self
 
   
-  
-
-  macro:///Euro.AutoPilotRun.StartAutoPilot
-
-
-  ~Euro Converter...
-
-
-  _self
-
-  
   
 
   private:separator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Christian Lohmaier (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit d6774abbd3eddbf3a6655c57a880f4e28d0cb74a
Author: Christian Lohmaier 
AuthorDate: Thu Dec 17 19:27:09 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 22:31:15 2020 +0100

tdf#135580 remove Euro Conversion wizard from menu

it is considered deprecated/scheduled for removal in next version
This change only removes it from the default menu, but leaves it
available in the set of available commands/doesn't remove the actual
conversion wizard

Change-Id: Ib7a37b55a0d6f09d90da66f89c0a2b1b80d0071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107919
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 2b661855fa48..83335726c843 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -322,17 +322,6 @@
   _self
 
   
-  
-
-  macro:///Euro.AutoPilotRun.StartAutoPilot
-
-
-  ~Euro Converter...
-
-
-  _self
-
-  
   
 
   private:separator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/inc editeng/source solenv/clang-format

[Caolán McNamara (via logerrit)]

 editeng/inc/helpids.h   |   24 -
 editeng/source/editeng/editview.cxx |  155 ++--
 solenv/clang-format/excludelist |1 
 3 files changed, 78 insertions(+), 102 deletions(-)

New commits:
commit 57544b075b77331b7b1cc7cb18898a52e7bb21a6
Author: Caolán McNamara 
AuthorDate: Sat Dec 12 21:21:09 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 22:02:35 2020 +0100

weld editview menu

Change-Id: I26bd2d011b5665f198f18d35b8433becca904991
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107572
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/editeng/inc/helpids.h b/editeng/inc/helpids.h
deleted file mode 100644
index 8c4639e8951d..
--- a/editeng/inc/helpids.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-#define HID_EDITENG_SPELLER_WORDLANGUAGE   
"EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE"
-#define HID_EDITENG_SPELLER_PARALANGUAGE   
"EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 491c88670f44..877c59f1c520 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -20,7 +20,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -47,9 +46,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -874,7 +871,7 @@ bool EditView::IsWrongSpelledWordAtPos( const Point& 
rPosPixel, bool bMarkIfWron
 return pImpEditView->IsWrongSpelledWord( aPaM , bMarkIfWrong );
 }
 
-static void LOKSendSpellPopupMenu(Menu* pMenu, LanguageType nGuessLangWord,
+static void LOKSendSpellPopupMenu(const weld::Menu& rMenu, LanguageType 
nGuessLangWord,
   LanguageType nGuessLangPara, sal_uInt16 
nSuggestions)
 {
 if (!comphelper::LibreOfficeKit::isActive())
@@ -892,13 +889,13 @@ static void LOKSendSpellPopupMenu(Menu* pMenu, 
LanguageType nGuessLangWord,
 {
 for(int i = 0; i < nSuggestions; ++i)
 {
-sal_uInt16 nItemId = MN_ALTSTART + i;
-OUString sText = pMenu->GetItemText(nItemId);
+OString sItemId = OString::number(MN_ALTSTART + i);
+OUString sText = rMenu.get_label(sItemId);
 aItemTree.put("text", sText.toUtf8().getStr());
 aItemTree.put("type", "command");
 OUString sCommandString = 
".uno:SpellCheckApplySuggestion?ApplyRule:string=Spelling_" + sText;
 aItemTree.put("command", sCommandString.toUtf8().getStr());
-aItemTree.put("enabled", pMenu->IsItemEnabled(nItemId));
+aItemTree.put("enabled", rMenu.get_sensitive(sItemId));
 aMenu.push_back(std::make_pair("", aItemTree));
 aItemTree.clear();
 }
@@ -912,10 +909,10 @@ static void LOKSendSpellPopupMenu(Menu* pMenu, 
LanguageType nGuessLangWord,
 OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
 OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
 
-aItemTree.put("text", 
pMenu->GetItemText(pMenu->GetItemId("ignore")).toUtf8().getStr());
+aItemTree.put("text", rMenu.get_label("ignore").toUtf8().getStr());
 aItemTree.put("type", "command");
 aItemTree.put("command", ".uno:SpellCheckIgnoreAll?Type:string=Spelling");
-aItemTree.put("enabled", pMenu->IsItemEnabled(pMenu->GetItemId("ignore")));
+aItemTree.put("enabled", rMenu.get_sensitive("ignore"));
 aMenu.push_back(std::make_pair("", aItemTree));
 aItemTree.clear();
 
@@ -923,19 +920,19 @@ static void LOKSendSpellPopupMenu(Menu* pMenu, 
LanguageType nGuessLangWord,
 aMenu.push_back(std::make_pair("", aItemTree));
 aItemTree.clear();
 
-aItemTree.put("text", 
pMenu->GetItemText(MN_WORDLANGUAGE).toUtf8().getStr());
+aItemTree.put("text", rMenu.get_label("wordlanguage").toUtf8().getStr());
 aItemTree.put("type", "command");
 OUString 

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx  |1 +
 vcl/inc/salvtables.hxx|1 +
 vcl/source/app/salvtables.cxx |4 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   10 ++
 4 files changed, 16 insertions(+)

New commits:
commit 853df3ce24d4daa113a15d4211be682ada1fa6f2
Author: Caolán McNamara 
AuthorDate: Thu Dec 17 16:16:09 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 22:02:15 2020 +0100

add Menu::get_sensitive

Change-Id: I242ace497d7f049d9908cc6461b7eefc6d4a2b87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107889
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index d3bdf2ff147f..1265bf774ec7 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2186,6 +2186,7 @@ public:
 void connect_activate(const Link& rLink) { 
m_aActivateHdl = rLink; }
 
 virtual void set_sensitive(const OString& rIdent, bool bSensitive) = 0;
+virtual bool get_sensitive(const OString& rIdent) const = 0;
 virtual void set_label(const OString& rIdent, const OUString& rLabel) = 0;
 virtual OUString get_label(const OString& rIdent) const = 0;
 virtual void set_active(const OString& rIdent, bool bActive) = 0;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 0a6cbad7038e..b68a2fdeba96 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -143,6 +143,7 @@ public:
 SalInstanceMenu(PopupMenu* pMenu, bool bTakeOwnership);
 virtual OString popup_at_rect(weld::Widget* pParent, const 
tools::Rectangle& rRect) override;
 virtual void set_sensitive(const OString& rIdent, bool bSensitive) 
override;
+virtual bool get_sensitive(const OString& rIdent) const override;
 virtual void set_active(const OString& rIdent, bool bActive) override;
 virtual bool get_active(const OString& rIdent) const override;
 virtual void set_label(const OString& rIdent, const OUString& rLabel) 
override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 167ff5766084..0524244ed6d2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -737,6 +737,10 @@ void SalInstanceMenu::set_sensitive(const OString& rIdent, 
bool bSensitive)
 {
 m_xMenu->EnableItem(rIdent, bSensitive);
 }
+bool SalInstanceMenu::get_sensitive(const OString& rIdent) const
+{
+return m_xMenu->IsItemEnabled(m_xMenu->GetItemId(rIdent));
+}
 void SalInstanceMenu::set_active(const OString& rIdent, bool bActive)
 {
 m_xMenu->CheckItem(rIdent, bActive);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 602246395aaa..829a3a4ca58f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3593,6 +3593,11 @@ public:
 gtk_widget_set_sensitive(GTK_WIDGET(m_aMap[rIdent]), bSensitive);
 }
 
+bool get_item_sensitive(const OString& rIdent) const
+{
+return 
gtk_widget_get_sensitive(GTK_WIDGET(m_aMap.find(rIdent)->second));
+}
+
 void set_item_active(const OString& rIdent, bool bActive)
 {
 disable_item_notify_events();
@@ -8199,6 +8204,11 @@ public:
 set_item_sensitive(rIdent, bSensitive);
 }
 
+virtual bool get_sensitive(const OString& rIdent) const override
+{
+return get_item_sensitive(rIdent);
+}
+
 virtual void set_active(const OString& rIdent, bool bActive) override
 {
 set_item_active(rIdent, bActive);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editview.cxx |   80 ++--
 1 file changed, 59 insertions(+), 21 deletions(-)

New commits:
commit 493429cc91d41b719d446e43415f43fb9fa5aee4
Author: Caolán McNamara 
AuthorDate: Thu Dec 17 15:49:23 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 22:01:15 2020 +0100

drop dumping intermediate popup menu and go straight to boost::property_tree

Change-Id: I1209cf14cd23adee9ecf01b73bfcc95b80dea07a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107887
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 00be3ff442ef..491c88670f44 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -880,33 +880,71 @@ static void LOKSendSpellPopupMenu(Menu* pMenu, 
LanguageType nGuessLangWord,
 if (!comphelper::LibreOfficeKit::isActive())
 return;
 
-// First we need to set item commands for the context menu.
-OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
-OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
+// Generate the menu structure and send it to the client code.
+SfxViewShell* pViewShell = SfxViewShell::Current();
+if (!pViewShell)
+return;
 
-pMenu->SetItemCommand(pMenu->GetItemId("ignore"), 
".uno:SpellCheckIgnoreAll?Type:string=Spelling");
-pMenu->SetItemCommand(MN_WORDLANGUAGE, 
".uno:LanguageStatus?Language:string=Current_" + aTmpWord);
-pMenu->SetItemCommand(MN_PARALANGUAGE, 
".uno:LanguageStatus?Language:string=Paragraph_" + aTmpPara);
+boost::property_tree::ptree aMenu;
 
-for(int i = 0; i < nSuggestions; ++i)
+boost::property_tree::ptree aItemTree;
+if (nSuggestions)
 {
-sal_uInt16 nItemId = MN_ALTSTART + i;
-OUString sCommandString = 
".uno:SpellCheckApplySuggestion?ApplyRule:string=Spelling_" + 
pMenu->GetItemText(nItemId);
-pMenu->SetItemCommand(nItemId, sCommandString);
+for(int i = 0; i < nSuggestions; ++i)
+{
+sal_uInt16 nItemId = MN_ALTSTART + i;
+OUString sText = pMenu->GetItemText(nItemId);
+aItemTree.put("text", sText.toUtf8().getStr());
+aItemTree.put("type", "command");
+OUString sCommandString = 
".uno:SpellCheckApplySuggestion?ApplyRule:string=Spelling_" + sText;
+aItemTree.put("command", sCommandString.toUtf8().getStr());
+aItemTree.put("enabled", pMenu->IsItemEnabled(nItemId));
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+}
+
+aItemTree.put("type", "separator");
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
 }
 
-// Then we generate the menu structure and send it to the client code.
-if (SfxViewShell* pViewShell = SfxViewShell::Current())
-{
-boost::property_tree::ptree aMenu = 
SfxDispatcher::fillPopupMenu(pMenu);
-boost::property_tree::ptree aRoot;
-aRoot.add_child("menu", aMenu);
+// First we need to set item commands for the context menu.
+OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
+OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
 
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aRoot, true);
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CONTEXT_MENU, 
aStream.str().c_str());
-return;
- }
+aItemTree.put("text", 
pMenu->GetItemText(pMenu->GetItemId("ignore")).toUtf8().getStr());
+aItemTree.put("type", "command");
+aItemTree.put("command", ".uno:SpellCheckIgnoreAll?Type:string=Spelling");
+aItemTree.put("enabled", pMenu->IsItemEnabled(pMenu->GetItemId("ignore")));
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+
+aItemTree.put("type", "separator");
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+
+aItemTree.put("text", 
pMenu->GetItemText(MN_WORDLANGUAGE).toUtf8().getStr());
+aItemTree.put("type", "command");
+OUString sCommandString = ".uno:LanguageStatus?Language:string=Current_" + 
aTmpWord;
+aItemTree.put("command", sCommandString.toUtf8().getStr());
+aItemTree.put("enabled", pMenu->IsItemEnabled(MN_WORDLANGUAGE));
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+
+aItemTree.put("text", 
pMenu->GetItemText(MN_PARALANGUAGE).toUtf8().getStr());
+aItemTree.put("type", "command");
+sCommandString = ".uno:LanguageStatus?Language:string=Paragraph_" + 
aTmpPara;
+aItemTree.put("command", sCommandString.toUtf8().getStr());
+aItemTree.put("enabled", pMenu->IsItemEnabled(MN_PARALANGUAGE));
+aMenu.push_back(std::make_pair("", aItemTree));
+aItemTree.clear();
+
+boost::property_tree::ptr

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 73d608c993e92fb1ce8d61c509f743df20f9913d
Author: Heiko Tietze 
AuthorDate: Thu Dec 17 19:11:23 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 21:50:29 2020 +0100

Fixes to branding images

High-res splash screen image uses Vegur
Vegur font in logo.svg converted to path

Change-Id: Id0873329caf230c8b5bc1bde34e558955bb6959c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107918
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 4c5b6b0f91ba931639896fbc01778a6efc74ce4a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107900
Tested-by: Christian Lohmaier 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index a5e714304dac..58feb7f1c262 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index 887c71c4bb31..6f2de28019b0 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">Community Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index e7dfeba30884..3c5d1fd8a045 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c5b6b0f91ba931639896fbc01778a6efc74ce4a
Author: Heiko Tietze 
AuthorDate: Thu Dec 17 19:11:23 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 21:48:28 2020 +0100

Fixes to branding images

High-res splash screen image uses Vegur
Vegur font in logo.svg converted to path

Change-Id: Id0873329caf230c8b5bc1bde34e558955bb6959c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107918
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index a5e714304dac..58feb7f1c262 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index 887c71c4bb31..6f2de28019b0 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">Community Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index e7dfeba30884..3c5d1fd8a045 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf125449.py |   61 
 1 file changed, 61 insertions(+)

New commits:
commit 98ba0bdf69ee350a8ec73c80120adc07d76543bf
Author: Xisco Fauli 
AuthorDate: Thu Dec 17 17:48:43 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 21:41:44 2020 +0100

tdf#125449: sd: Add UItest

Change-Id: I33a70d6a789d51b33c663ddbacd9ce4c35b89460
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107917
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sd/qa/uitest/impress_tests/tdf125449.py 
b/sd/qa/uitest/impress_tests/tdf125449.py
new file mode 100644
index ..43db59b3be14
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf125449.py
@@ -0,0 +1,61 @@
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from com.sun.star.awt.GradientStyle import LINEAR
+
+class tdf125449(UITestCase):
+
+def test_tdf125449(self):
+
+self.ui_test.create_doc_in_start_center("impress")
+
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:PageSetup")
+
+xPageSetupDlg = self.xUITest.getTopFocusWindow()
+tabcontrol = xPageSetupDlg.getChild("tabcontrol")
+select_pos(tabcontrol, "1")
+
+xBtn = xPageSetupDlg.getChild('btngradient')
+xBtn.executeAction("CLICK", tuple())
+
+xAngle = xPageSetupDlg.getChild('anglemtr')
+xAngle.executeAction("UP", tuple())
+
+xOkBtn = xPageSetupDlg.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+document = self.ui_test.get_component()
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradient.Style, 
LINEAR)
+self.assertEqual(
+  
hex(document.DrawPages.getByIndex(0).Background.FillGradient.StartColor), 
'0xdde8cb')
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradient.Angle, 450)
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradient.Border, 0)
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradient.XOffset, 0)
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradient.YOffset, 0)
+self.assertEqual(
+  
document.DrawPages.getByIndex(0).Background.FillGradient.StartIntensity, 100)
+self.assertEqual(
+  
document.DrawPages.getByIndex(0).Background.FillGradient.EndIntensity, 100)
+
+# Without the patch in place, this test would have failed with
+# AssertionError: '' != 'gradient'
+self.assertEqual(
+  document.DrawPages.getByIndex(0).Background.FillGradientName, 
'gradient')
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sd/source sw/qa sw/source

[László Németh (via logerrit)]

 sd/source/ui/slidesorter/view/SlideSorterView.cxx |8 
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   41 ++
 sw/source/core/undo/unredln.cxx   |4 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

New commits:
commit 172373c4a2c4a66b8abbe26dbe07fd621c971ed0
Author: László Németh 
AuthorDate: Wed Dec 16 12:23:22 2020 +0100
Commit: László Németh 
CommitDate: Thu Dec 17 20:36:56 2020 +0100

sw ChangesInMargin: fix crash at Undo of deletion of paragraph break

Deletion of the paragraph break by pressing Delete results
an empty hidden redline, too, which caused a problem during Undo
(if there were other tracked redlines, too).

Change-Id: I64968688688be72d4e501631244b4c57ab634585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107830
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c3d4d71d6b5c..496b9b8602bc 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2084,6 +2084,47 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137771)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testJoinParaChangesInMargin)
+{
+load(DATA_DIRECTORY, "tdf54819.fodt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+SwWrtShell* const pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+
+// turn on red-lining and show changes
+SwDoc* pDoc = pWrtShell->GetDoc();
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowInsert
+  | 
RedlineFlags::ShowDelete);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// delete a character and the paragraph break at the end of the paragraph
+dispatchCommand(mxComponent, ".uno:GotoEndOfPara", {});
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+dispatchCommand(mxComponent, ".uno:Delete", {});
+dispatchCommand(mxComponent, ".uno:Delete", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsudolor sit amet."), 
getParagraph(1)->getString());
+
+// Undo
+dispatchCommand(mxComponent, ".uno:Undo", {});
+// this would crash due to bad redline range
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum"), 
getParagraph(1)->getString());
+
+// switch off "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138479)
 {
 SwDoc* const pDoc = createDoc();
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index a737863c3835..38caba313d8d 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -108,7 +108,7 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 for( SwRedlineTable::size_type n = 1; n < rTable.size(); ++n )
 {
 SwRangeRedline *pRed(rTable[n]);
-if ( pRedline->GetId() < pRed->GetId() && pRed->GetId() < 
nMaxId )
+if ( !pRed->HasMark() && pRedline->GetId() < pRed->GetId() && 
pRed->GetId() < nMaxId )
 {
 nCurRedlinePos = n;
 pRedline = pRed;
@@ -117,7 +117,7 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 
 nMaxId = pRedline->GetId();
 
-if ( !pRedline->IsVisible() )
+if ( !pRedline->IsVisible() && !pRedline->HasMark() )
 {
 // set it visible
 pRedline->Show(0, rTable.GetPos(pRedline), /*bForced=*/true);
commit a66a6f4cc8efbca282d39e8dd48709ec82bbc26b
Author: Luboš Luňák 
AuthorDate: Wed Dec 16 11:07:02 2020 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 17 20:36:43 2020 +0100

prefetch graphics also for page before and after in slidesorter

The idea is that this will make them preloaded for when the user
scrolls e.g. using PageDown.

Change-Id: Icac9b6e88b25e9b0434c5ab7a152f47866dfadc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107823
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx 
b/sd/source/ui/s

[Libreoffice-commits] core.git: sd/source

[Justin Luth (via logerrit)]

 sd/source/ui/func/fupage.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 0c37e164dbbff89ecac843e1b182fdbce70cda34
Author: Justin Luth 
AuthorDate: Sat Dec 5 19:48:36 2020 +0300
Commit: Justin Luth 
CommitDate: Thu Dec 17 18:41:51 2020 +0100

tdf#137729 sd UI: unique hatch names in slide/page area dlg

A custom hatch on a page background was not getting a name,
so it was exported referring to an empty string, which was
implemented as using the first available hatch.

Ensuring that a name exists causes the hatch to be exported
in the styles, and thus can be referred to in content.xml

All praise goes to Katarina since this just copies her
similar fix for grandients in tdf#125449.
Too bad it took me a whole day to find that.

Unfortunately, Katarina didn't provide any unit tests
for me to copycat as well.

Change-Id: If2be0830b521946fb1b88b247319a7e6c2c61c3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107258
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-by: Justin Luth 

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 3779feec3f82..6d44b70d5a9d 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -394,6 +395,15 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* 
pParent, const SfxRequest&
 SdrModel::MigrateItemSet( &aMigrateSet, pTempSet.get(), mpDoc);
 }
 
+const XFillHatchItem* pTempHatchItem = 
pTempSet->GetItem(XATTR_FILLHATCH);
+if (pTempHatchItem && pTempHatchItem->GetName().isEmpty())
+{
+// MigrateItemSet guarantees unique hatch names
+SfxItemSet aMigrateSet( mpDoc->GetPool(), 
svl::Items{} );
+aMigrateSet.Put( XFillHatchItem("hatch", 
pTempHatchItem->GetHatchValue()) );
+SdrModel::MigrateItemSet( &aMigrateSet, pTempSet.get(), mpDoc);
+}
+
 if( !mbMasterPage && bChanges && mbPageBckgrdDeleted )
 {
  mpBackgroundObjUndoAction.reset( new 
SdBackgroundObjUndoAction(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/sfdocuments/SF_Base.xba |6 +--
 wizards/source/sfdocuments/SF_Calc.xba |6 +--
 wizards/source/sfdocuments/SF_Form.xba |   58 +
 3 files changed, 50 insertions(+), 20 deletions(-)

New commits:
commit 554949d5cacaff2d0080b3e4f6124f8c5b045d6e
Author: Jean-Pierre Ledure 
AuthorDate: Thu Dec 17 17:20:45 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Thu Dec 17 18:39:46 2020 +0100

ScriptForge - (SFDocuments) new Activate() method in SF_Form class

Activate
- the parent document if Writer
- the parent sheet if Calc
- the parent form document if Base

Change-Id: Idf2af0184111467d0a94fb27709fd6bb289c6414
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107888
Tested-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/sfdocuments/SF_Base.xba 
b/wizards/source/sfdocuments/SF_Base.xba
index 8ab19d5cf103..d0900849255f 100644
--- a/wizards/source/sfdocuments/SF_Base.xba
+++ b/wizards/source/sfdocuments/SF_Base.xba
@@ -67,7 +67,7 @@ Private _FormDocumentsAs Object
 
 REM  MODULE 
CONSTANTS
 
-Const ISBASEFORM = 2   '  Form is stored in a 
Base document
+Const ISBASEFORM = 3   '  Form is stored in a 
Base document
 Const cstToken = "//"'  Form 
names accept special characters but not slashes
 
 REM == 
CONSTRUCTOR/DESTRUCTOR
@@ -238,7 +238,7 @@ Try:
Set .[Me] = oForm
Set .[_Parent] = [Me]
._DrawPage = cstDrawPage
-   ._UsualName = FormDocument & " : " & 
._Name
+   ._FormDocumentName = FormDocument
Set ._MainForm = oMainForm
._FormType = ISBASEFORM
Set ._Form = oXForm
@@ -710,4 +710,4 @@ Private Function _Repr() As String
 End Function   '  SFDocuments.SF_Base._Repr
 
 REM  END OF SFDOCUMENTS.SF_BASE
-
+
\ No newline at end of file
diff --git a/wizards/source/sfdocuments/SF_Calc.xba 
b/wizards/source/sfdocuments/SF_Calc.xba
index 86825961630c..aeb19ffed9c7 100644
--- a/wizards/source/sfdocuments/SF_Calc.xba
+++ b/wizards/source/sfdocuments/SF_Calc.xba
@@ -869,8 +869,8 @@ Public Function Forms(Optional ByVal SheetName As Variant _
 ''' An instance of the SF_Form class if Form exists
 ''' Example:
 ''' Dim myForm As Object, myList As Variant
-''' myList = oDoc.Forms()
-''' Set myForm = 
oDoc.Forms("myForm")
+''' myList = 
oDoc.Forms("ThisSheet")
+''' Set myForm = 
oDoc.Forms("ThisSheet", 0)
 
 Dim oForm As Object'  The new Form 
class instance
 Dim oMainForm As Object'  
com.sun.star.comp.sdb.Content
@@ -914,7 +914,7 @@ Try:
Set .[Me] = oForm
Set .[_Parent] = [Me]
._DrawPage = cstDrawPage
-   ._UsualName = SheetName & " : " & 
._Name
+   ._SheetName = SheetName
Set ._MainForm = Nothing
._FormType = ISCALCFORM
Set ._Form = oXForm
diff --git a/wizards/source/sfdocuments/SF_Form.xba 
b/wizards/source/sfdocuments/SF_Form.xba
index ef83da999582..0b9303fae9b6 100644
--- a/wizards/source/sfdocuments/SF_Form.xba
+++ b/wizards/source/sfdocuments/SF_Form.xba
@@ -76,14 +76,15 @@ Private ServiceName As String
 ' Form location
 Private _Name  As String   ' Internal 
name of the form
 Private _DrawPage  As Long ' Index in 
DrawPages collection
-Private _UsualName As String   ' Name as 
known by user
+Private _SheetName As String   ' Name as 
the sheet containing the form (Calc only)
+Private _FormDocumentName  As String   ' The hierarchical 
name of the containing form document (Base only)
 Private _FormType  As Integer  ' One of 
the ISxxxFORM constants
 
 ' Form UNO references
 ' The forms container found in a Base document
 ' Vital for Base forms and subforms
 Private _MainForm  As Object   ' 
com.sun.star.comp.sdb.Content
-' The entry to the interactions with the form. Set by the 
_IsStillAlive() method
+' The entry to the interactions with the form. Validity checked 
by the _IsStillAlive() method
 ' Each method or property requiring that the form is opened 
should fi

[Libreoffice-commits] core.git: 3 commits - drawinglayer/source sw/qa translations

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2 +-
 translations|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 668525eeeb4a84bafb90b1d920e68a1cc3e8dfaf
Author: Andrea Gelmini 
AuthorDate: Wed Dec 16 20:52:10 2020 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 17 18:37:08 2020 +0100

Removed executable bits on fodt file

Change-Id: I6abb926efe745e27190cd36e249d2b8845c348f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107855
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sw/qa/extras/layout/data/tdf137819.fodt 
b/sw/qa/extras/layout/data/tdf137819.fodt
old mode 100755
new mode 100644
commit 5cf7d315891147ca20c57b2ced9193938160189b
Author: Andrea Gelmini 
AuthorDate: Wed Dec 16 20:51:59 2020 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 17 18:36:48 2020 +0100

Fix typo

Change-Id: I1790f37a3d0a6d4921f819b27c29cc6ee59ce00c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107854
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index ebbc41744734..1402459297bb 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -711,7 +711,7 @@ void VclPixelProcessor2D::processControlPrimitive2D(
 // Tiled Rendering clients usually do *not* have real VCL-Windows 
for the controls, but
 // exactly that would be needed on each client displaying the 
tiles (what would be hard
 // to do but also would have advantages - the clients would have 
real controls in the
-//  shape of their traget system which could be interacted 
with...). It is also what the
+//  shape of their target system which could be interacted 
with...). It is also what the
 // office does.
 // For now, fallback to just render these controls when Tiled 
Rendering is active to just
 // have them displayed on all clients.
commit 22214e27c7b0a8ef5612326d85dd9b847819413d
Author: Christian Lohmaier 
AuthorDate: Thu Dec 17 18:36:04 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 17 18:36:04 2020 +0100

Update git submodules

* Update translations from branch 'master'
  to 14f402c21427505066d2b5e093bdf48488ac5964
  - update translations for 7.1.0 rc1

and force-fix errors usinc pocheck

Change-Id: I302feb12a0180d134f32c450c15f2eae5cc6b19b

diff --git a/translations b/translations
index 0c5bce2255d6..14f402c21427 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0c5bce2255d6cab360e066c391a14d85d7e7d115
+Subproject commit 14f402c21427505066d2b5e093bdf48488ac5964
___
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' - translations

[Christian Lohmaier (via logerrit)]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d9aed062e4c16d09aef17ccd1ac087e3fd40408
Author: Christian Lohmaier 
AuthorDate: Thu Dec 17 18:37:22 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 17 18:37:22 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-7-1'
  to 80806ba69f2b1a1ff4fa37558ebfa380c589c34c
  - update translations for 7.1.0 rc1

and force-fix errors usinc pocheck

Change-Id: I302feb12a0180d134f32c450c15f2eae5cc6b19b
(cherry picked from commit 14f402c21427505066d2b5e093bdf48488ac5964)

diff --git a/translations b/translations
index ece40d072f96..80806ba69f2b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ece40d072f96c1b8d2bb2028428cbecc6ebbb0d9
+Subproject commit 80806ba69f2b1a1ff4fa37558ebfa380c589c34c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Georgy Litvinov (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 475422a4368b22df0418a2120ab2dec5d3440892
Author: Georgy Litvinov 
AuthorDate: Wed Dec 16 23:16:32 2020 +0100
Commit: Noel Grandin 
CommitDate: Thu Dec 17 18:13:03 2020 +0100

tdf#138818 Import full TIFF file

Change-Id: I519c810b8e52f698884eb8feac6994140ce9ca25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107859
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 061d1a0ac73b..e7c57e38 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1695,7 +1695,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 
 // seek to end of TIFF if succeeded
 pTIFF->SetEndian( nOrigNumberFormat );
-pTIFF->Seek(bStatus ? nMaxPos : nOrigPos);
+pTIFF->Seek(bStatus ? STREAM_SEEK_TO_END: nOrigPos);
 
 if ( aAnimation.Count() )
 {
___
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/win

[Jan-Marek Glogowski (via logerrit)]

 vcl/win/dtrans/WinClipboard.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 28c6f0016e16338db53e41a4d13f0e60554d692d
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 14 10:47:04 2020 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 17 17:03:41 2020 +0100

WIN don't notify clipboard change with SolarMutex

Regression from commit 52a7eb58f5c137b6de76cc49be07dd43c42a6d6c
("WIN replace clipboard update thread with Idle"). Previously the
notification was done without the SolarMutex. Now it's run via
an Idle and SolarMutex is required by the Scheduler, so release
it. Foreign contents is again protected by the clipboard lock.

And also unlock the SolarMutex in getContents, to prevent a
deadlock in the clipboard STA thread, if it's already processing
other request, like CXNotifyingDataObject::GetData, blocking on
the SolarMutex.

Change-Id: I6855b045b3065289ec7833498f6785ee31eda61c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107675
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit f5ab8bcbfd20ecce4a358f62ee3f81b8b968a5de)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107894
Reviewed-by: Mike Kaganski 

diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index 6446a33e4574..6d1b03b0887e 100644
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include "XNotifyingDataObject.hxx"
@@ -89,6 +91,9 @@ CWinClipboard::~CWinClipboard()
 
 uno::Reference SAL_CALL 
CWinClipboard::getContents()
 {
+DBG_TESTSOLARMUTEX();
+SolarMutexReleaser aReleaser;
+
 osl::MutexGuard aGuard(m_aMutex);
 
 if (rBHelper.bDisposed)
@@ -242,7 +247,8 @@ void SAL_CALL CWinClipboard::removeClipboardListener(
 
 IMPL_LINK_NOARG(CWinClipboard, ClipboardContentChangedHdl, Timer*, void)
 {
-m_foreignContent.clear();
+DBG_TESTSOLARMUTEX();
+SolarMutexReleaser aReleaser;
 
 if (rBHelper.bDisposed)
 return;
@@ -260,7 +266,11 @@ IMPL_LINK_NOARG(CWinClipboard, ClipboardContentChangedHdl, 
Timer*, void)
 try
 {
 cppu::OInterfaceIteratorHelper iter(*pICHelper);
-uno::Reference rXTransf(getContents());
+uno::Reference rXTransf;
+{
+SolarMutexGuard aGuard;
+rXTransf.set(getContents());
+}
 datatransfer::clipboard::ClipboardEvent 
aClipbEvent(static_cast(this),
 rXTransf);
 
@@ -341,6 +351,8 @@ void WINAPI CWinClipboard::onWM_CLIPBOARDUPDATE()
 if (!s_pCWinClipbImpl)
 return;
 
+s_pCWinClipbImpl->m_foreignContent.clear();
+
 if (!s_pCWinClipbImpl->m_aNotifyClipboardChangeIdle.IsActive())
 s_pCWinClipbImpl->m_aNotifyClipboardChangeIdle.Start();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - filter/source sw/qa

[Xisco Fauli (via logerrit)]

 filter/source/msfilter/eschesdo.cxx   |   37 +++---
 sw/qa/extras/ww8export/data/tdf128501.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   17 +
 3 files changed, 46 insertions(+), 8 deletions(-)

New commits:
commit 33d85de4b964638192eabdb5753a5ca87d6892b7
Author: Xisco Fauli 
AuthorDate: Tue Dec 1 19:17:24 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 16:52:15 2020 +0100

tdf#128501: DOC export: fix lost bitmap fill for OOXML custom shapes

this fix is based on 7032be2e9edd82dad2d67f1582aaa57676bda4a1
which fixes the same problem for PPT filter

Change-Id: Id62c29892dd3fce42d27e2e46a7933154cb973f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107003
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2f9325b270fab10f6900aec30ca27135363c4c69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107094
Reviewed-by: Miklos Vajna 

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index efe3c908b6b4..1443b46702c6 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -263,15 +264,35 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject& rObj,
 }
 else
 {
-addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
- nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
-aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
-aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
-if ( rObj.ImplGetText() )
+const Reference< XPropertySet > xPropSet = rObj.mXPropSet;
+drawing::FillStyle eFS = drawing::FillStyle_NONE;
+if(xPropSet.is())
+{
+uno::Reference< XPropertySetInfo > xPropInfo = 
xPropSet->getPropertySetInfo();
+if ( xPropInfo.is() && 
xPropInfo->hasPropertyByName("FillStyle"))
+xPropSet->getPropertyValue("FillStyle") >>= eFS;
+}
+
+if (eFS == drawing::FillStyle_BITMAP && eShapeType == 
mso_sptMax)
+{
+// We can't map this custom shape to a DOC preset and it 
has a bitmap fill.
+// Make sure that at least the bitmap fill is not lost.
+addShape( ESCHER_ShpInst_PictureFrame, 
ShapeFlag::HaveShapeProperty | ShapeFlag::HaveAnchor );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, 
"Bitmap", false, true, true, bOOxmlExport ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 
0x800080 );
+}
+else
 {
-if ( !aPropOpt.IsFontWork() )
-aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
-rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+addShape(sal::static_int_cast< sal_uInt16 >(eShapeType),
+ nMirrorFlags | ShapeFlag::HaveShapeProperty | 
ShapeFlag::HaveAnchor);
+aPropOpt.CreateCustomShapeProperties( eShapeType, 
rObj.GetShapeRef() );
+aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
+if ( rObj.ImplGetText() )
+{
+if ( !aPropOpt.IsFontWork() )
+aPropOpt.CreateTextProperties( rObj.mXPropSet, 
mpEscherEx->QueryTextID(
+rObj.GetShapeRef(), rObj.GetShapeId() ), true, 
false );
+}
 }
 }
 }
diff --git a/sw/qa/extras/ww8export/data/tdf128501.doc 
b/sw/qa/extras/ww8export/data/tdf128501.doc
new file mode 100644
index ..3313e397a961
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf128501.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index a663a034074b..7d8756fbe6cb 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -71,6 +71,23 @@ DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, 
"arabic-zero-numbering.doc")
  aMap["NumberingType"].get());
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf128501, "tdf128501.doc")
+{
+if (!mbExported)
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.CustomShape"), 
xShapeDescriptor->getShapeType());
+}
+else
+{
+uno::Reference xShapeDescriptor = 
getShape(1);
+// Without the fix in place, this test would have failed with
+// - Expected: FrameShape
+// - Actual  

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/qa oox/source

[Miklos Vajna (via logerrit)]

 oox/qa/unit/drawingml.cxx   |   38 +++---
 oox/source/export/drawingml.cxx |3 ++-
 oox/source/export/shapes.cxx|4 +++-
 3 files changed, 32 insertions(+), 13 deletions(-)

New commits:
commit fe8f2b23beff1e886e1b0be9b95260f58be1e742
Author: Miklos Vajna 
AuthorDate: Wed Dec 16 14:19:16 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 16:51:44 2020 +0100

tdf#129961 oox: add PPTX export for table shadow as direct format

Custom shapes export shadow as part of WriteShapeEffects(), so use the
same for table shapes as well.

This needs fixing the effect export up a bit, because table shapes have
no interop grab-bag, glow or soft edge properties, but the rest of the
code can be shared.

(cherry picked from commit 252cdd5f43d65095543e317d37e1a0ea4fd839e0)

Conflicts:
oox/source/export/drawingml.cxx

Change-Id: Icf0b90c5b44e3d9c4115c9f3b0d56ba0852ab640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107881
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index b86e5ad2e665..a5be52f66c9e 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -301,21 +301,37 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, 
testCameraRotationRevolution)
 
 CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTableShadow)
 {
+auto verify = [](const uno::Reference& xComponent) {
+uno::Reference 
xDrawPagesSupplier(xComponent, uno::UNO_QUERY);
+uno::Reference xDrawPage(
+xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+bool bShadow = false;
+CPPUNIT_ASSERT(xShape->getPropertyValue("Shadow") >>= bShadow);
+
+CPPUNIT_ASSERT(bShadow);
+sal_Int32 nColor = 0;
+CPPUNIT_ASSERT(xShape->getPropertyValue("ShadowColor") >>= nColor);
+CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nColor);
+};
 OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"table-shadow.pptx";
 load(aURL);
-uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
-uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
- uno::UNO_QUERY);
-uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
-bool bShadow = false;
-CPPUNIT_ASSERT(xShape->getPropertyValue("Shadow") >>= bShadow);
-
 // Without the accompanying fix in place, this test would have failed, 
because shadow on a table
 // was lost on import.
-CPPUNIT_ASSERT(bShadow);
-sal_Int32 nColor = 0;
-CPPUNIT_ASSERT(xShape->getPropertyValue("ShadowColor") >>= nColor);
-CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nColor);
+verify(getComponent());
+
+uno::Reference xStorable(getComponent(), uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("Impress Office Open XML");
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+getComponent()->dispose();
+validate(aTempFile.GetFileName(), test::OOXML);
+getComponent() = loadFromDesktop(aTempFile.GetURL());
+// Without the accompanying fix in place, this test would have failed, 
because shadow on a table
+// was lost on export.
+verify(getComponent());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 94e7da1f2aa7..db2cb733bebc 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3818,7 +3818,8 @@ static sal_Int32 lcl_CalculateDir(const double dX, const 
double dY)
 void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet )
 {
 Sequence< PropertyValue > aGrabBag, aEffects, aOuterShdwProps;
-if( GetProperty( rXPropSet, "InteropGrabBag" ) )
+bool bHasInteropGrabBag = 
rXPropSet->getPropertySetInfo()->hasPropertyByName("InteropGrabBag");
+if (bHasInteropGrabBag && GetProperty(rXPropSet, "InteropGrabBag"))
 {
 mAny >>= aGrabBag;
 auto pProp = std::find_if(std::cbegin(aGrabBag), std::cend(aGrabBag),
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8e3305800c78..60b88181b5dc 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1639,7 +1639,9 @@ void ShapeExport::WriteTable( const Reference< XShape >& 
rXShape  )
 if ( xPropSet.is() && ( xPropSet->getPropertyValue( "Model" ) >>= xTable ) 
)
 {
 mpFS->startElementNS(XML_a, XML_tbl);
-mpFS->singleElementNS(XML_a, XML_tblPr);
+mpFS->startElementNS(XML_a, XML_tblPr);
+WriteShapeEffects(xPropSet);
+mpFS->endElementNS(XML_a, XML_tblPr);

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/svx svx/Module_svx.mk svx/qa svx/source svx/UITest_svx_table.mk

[Miklos Vajna (via logerrit)]

 include/svx/sdr/table/tablecontroller.hxx |1 
 svx/Module_svx.mk |4 ++
 svx/UITest_svx_table.mk   |   16 ++
 svx/qa/uitest/table/tablecontroller.py|   45 ++
 svx/source/table/tablecontroller.cxx  |   33 +-
 5 files changed, 98 insertions(+), 1 deletion(-)

New commits:
commit 6f45e70aadcfb1930a0955c140e1811689b28be6
Author: Miklos Vajna 
AuthorDate: Tue Dec 15 17:17:56 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 16:51:27 2020 +0100

tdf#129961 svx: finish UI for table shadow as direct format

Normally properties on an SdrObject is set using SetAttributes(), but
that would take the selection controller into account, so we would call
SvxTableController::SetAttributes(), which sets the item set on the
selected cells instead. So use SetAttrToMarked() instead, which works on
the shape's item set, even in the table case. Don't replace all existing
items because we only have shadow properties here and also a disabled
shadow is still a (set) SdrOnOffItem (with value=false), so no old
SdrOnOffItem will be forgotten in the shape's item set.

Also add an outer undo grouping, so once the user presses OK in the
table properties dialog, we only create a single user-visible undo
action, not two.

(cherry picked from commit fdeb04f7c59cf8032fe17072ed779e70505cc6ab)

Conflicts:
svx/source/table/tablecontroller.cxx

Change-Id: I77b55ba1f07b8d0eeac5070e0ec07d39573d1f9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107880
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index 8359a15c4dbe..7e438015e907 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -85,6 +85,7 @@ public:
 
 SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet& rAttr, bool 
bReplaceAll);
+void SetAttrToSelectedShape(const SfxItemSet& rAttr);
 /** Fill the values that are common for all selected cells.
   *
   * This lets the Borders dialog to display the line arrangement
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 48ab6bcb071d..2577539356c4 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -53,6 +53,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
 ))
 endif
 
+$(eval $(call gb_Module_add_uicheck_targets,svx,\
+UITest_svx_table \
+))
+
 #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and 
MacOSX
 #todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
 #todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
diff --git a/svx/UITest_svx_table.mk b/svx/UITest_svx_table.mk
new file mode 100644
index ..df24798f59c4
--- /dev/null
+++ b/svx/UITest_svx_table.mk
@@ -0,0 +1,16 @@
+# -*- 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_UITest_UITest,svx_table))
+
+$(eval $(call gb_UITest_add_modules,svx_table,$(SRCDIR)/svx/qa/uitest,\
+   table/ \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/qa/uitest/table/tablecontroller.py 
b/svx/qa/uitest/table/tablecontroller.py
new file mode 100644
index ..27ed4a1d7ccb
--- /dev/null
+++ b/svx/qa/uitest/table/tablecontroller.py
@@ -0,0 +1,45 @@
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+
+
+# Test for SvxTableController.
+class SvxTableControllerTest(UITestCase):
+
+def testOnFormatTable(self):
+# Create an Impress document with a single table in it.
+self.ui_test.create_doc_in_start_center("impress")
+template = self.xUITest.getTopFocusWindow()
+self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+self.xUITest.executeCommand(".uno:SelectAll")
+self.xUITest.executeCommand(".uno:Delete")
+
self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2")
+
+# Enable shadow.
+self.ui_test.execute_dialog_through_command(".uno:TableDialog")
+tableDialog = self.xUITest.getTopFocusWindow()
+tabs = tableDialog.getChild("tabcontrol")
+# Select "shadow".
+select_pos(tabs, "4")
+shadowCheckbox = tableDialog.getChild("TSB_SHOW_

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - cui/source cui/uiconfig svx/source

[Miklos Vajna (via logerrit)]

 cui/source/dialogs/sdrcelldlg.cxx|7 +
 cui/source/inc/sdrcelldlg.hxx|2 +
 cui/uiconfig/ui/formatcellsdialog.ui |   48 +++
 svx/source/table/tablecontroller.cxx |   12 
 4 files changed, 69 insertions(+)

New commits:
commit 14363dd0dad9a4d3f7c64b9e6bcec559251a125b
Author: Miklos Vajna 
AuthorDate: Mon Dec 14 12:15:09 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 16:51:09 2020 +0100

tdf#129961 cui: start UI for table shadow as direct format

It reads from the doc model and shows it, but doesn't write it back yet.

(cherry picked from commit 74ba28fe238b7f15d1fb7d119e4cef3a7b544e0b)

Change-Id: I6611229e71d0a49f09576ca452b901958c33db58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107879
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index 3c745692f7ea..fda8b4ce1385 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -27,6 +27,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* 
pParent, const SfxItemS
 : SfxTabDialogController(pParent, "cui/ui/formatcellsdialog.ui", 
"FormatCellsDialog", pAttr)
 , mrOutAttrs(*pAttr)
 , mpColorTab(rModel.GetColorList())
+, mnColorTabState ( ChangeType::NONE )
 , mpGradientList(rModel.GetGradientList())
 , mpHatchingList(rModel.GetHatchList())
 , mpBitmapList(rModel.GetBitmapList())
@@ -36,6 +37,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* 
pParent, const SfxItemS
 AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS);
 AddTabPage("border", RID_SVXPAGE_BORDER );
 AddTabPage("area", RID_SVXPAGE_AREA);
+AddTabPage("shadow", SvxShadowTabPage::Create, nullptr);
 }
 
 void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
@@ -55,6 +57,11 @@ void SvxFormatCellsDialog::PageCreated(const OString& rId, 
SfxTabPage &rPage)
 SvxBorderTabPage& rBorderPage = static_cast(rPage);
 rBorderPage.SetTableMode();
 }
+else if (rId == "shadow")
+{
+static_cast(rPage).SetColorList( mpColorTab );
+static_cast(rPage).SetColorChgd( &mnColorTabState );
+}
 else
 SfxTabDialogController::PageCreated(rId, rPage);
 }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 50ab4b39ac70..9f068d552393 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 class SdrModel;
 class SvxFormatCellsDialog : public SfxTabDialogController
@@ -31,6 +32,7 @@ private:
 const SfxItemSet&   mrOutAttrs;
 
 XColorListRef   mpColorTab;
+ChangeType  mnColorTabState;
 XGradientListRefmpGradientList;
 XHatchListRef   mpHatchingList;
 XBitmapListRef  mpBitmapList;
diff --git a/cui/uiconfig/ui/formatcellsdialog.ui 
b/cui/uiconfig/ui/formatcellsdialog.ui
index 82243f0bad10..49dfc705483c 100644
--- a/cui/uiconfig/ui/formatcellsdialog.ui
+++ b/cui/uiconfig/ui/formatcellsdialog.ui
@@ -281,6 +281,54 @@
 False
   
 
+
+  
+  
+True
+False
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+4
+  
+
+
+  
+True
+False
+Shadow
+  
+  
+5
+False
+  
+
   
   
 False
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 232ed782414a..07fb110756b0 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -920,6 +920,18 @@ void SvxTableController::onFormatTable(const SfxRequest& 
rReq)
 aNewAttr.Put( aBoxItem );
 aNewAttr.Put( aBoxInfoItem );
 
+// Fill in shadow properties.
+const SfxItemSet& rTableItemSet = rTableObj.GetMergedItemSet();
+for (sal_uInt16 nWhich = SDRATTR_SHADOW_FIRST; nWhich <= 
SDRATTR_SHADOW_LAST; ++nWhich)
+{
+if (rTableItemSet.GetItemState(nWhich, false) != SfxItemState::SET)
+{
+continue;
+}
+
+aNewAttr.Put(rTableItemSet.Get(nWhich));
+}
+
 SvxAbstractDialogFa

ESC meeting minutes: 2020-12-17

[Miklos Vajna]

* Present:
+ Caolan, Michael W, Heiko, Olivier, Cloph, Miklos, Sophie, Stephan, Eike, 
Michael M, Xisco

* Completed Action Items:
+ adapt branding/tag for 7.1 as necessary (Heiko)
+ grant commit access to Andreas (Cloph)

* Pending Action Items:
+ get GSoC 2021 application kicked off until end of year (Thorsten)

* FOSDEM 2021 (Italo)
  + please submit your talks ASAP
  + deadline is 2020-12-27
+ next week! (Thorsten)
  + will submit a lightning talks one
+ expect no late submissions!
+ it has to be pre-recorded (Stephan)
  + you can still take questions at the end, live (Cloph)
  + see 
 
for details
  + want to hear about something? Poke the person who might be a good fit for a 
speaker (Cloph)

* Year-end schedule (Xisco)
  + propose: next meeting at 7th Jan (Miklos)
  + sounds good (Thorsten, Olivier)

* Release Engineering update (Cloph)
+ 7.1 status
  + feature/UI freeze and rc1 this week
  + patch pending: changes highlight color of the elementary icon theme 
from orangish to purplish, see 
+ will gather more input on this in the next few hours (Heiko)
  + after the tag, +1 review is needed for libreoffice-7-1
+ 7.0 status
  + 7.0.4 was released as final today
  + next release in a month
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+ Helpcontents2
   + New pages for ScripForge library (LibreOfficiant)
   + New pages for current features (Bala Muthu, S. Chaiklin)
   + Updates and fixes, (S. Chaiklin, S. Horacek, Johnny_M)
+ Guides
   + Work in progress


* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
242(242) (topicUI) bugs open, 231(231) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added  10(-7)24(-3) 44(-8)149(-14)
 commented 160(58)   394(84)   1063(53)   3953(85)
   removed   2(1)  3(2)  10(1)  50(1)
  resolved  28(16)68(15)169(17)485(22)
+ top 10 contributors:
  Heiko Tietze made 283 changes in 1 month, and 2428 changes in 1 year
  Telesto made 79 changes in 1 month, and 669 changes in 1 year
  Foote, V Stuart made 65 changes in 1 month, and 689 changes in 1 year
  Ilmari Lauhakangas made 54 changes in 1 month, and 276 changes in 1 
year
  Dieter Praas made 52 changes in 1 month, and 492 changes in 1 year
  Kaganski, Mike made 28 changes in 1 month, and 154 changes in 1 year
  Seth Chaiklin made 25 changes in 1 month, and 209 changes in 1 year
  Xisco Fauli made 19 changes in 1 month, and 418 changes in 1 year
  Roman Kuznetsov made 15 changes in 1 month, and 259 changes in 1 year
  Christian Lehmann made 15 changes in 1 month, and 31 changes in 1 year

  + 28 new tickets with needsUXEval Dec/10-17
* Template Manager, Image dialog, Crop function,
  (quick) Save/Export of shapes
* impossible to delete table after opening the report
  + https://bugs.documentfoundation.org/show_bug.cgi?id=138201
  + unclear why it's impossible to delete a table from a report
* Remove Euro Converter Wizard from Wizard menu
  + https://bugs.documentfoundation.org/show_bug.cgi?id=135580
  + maybe deprecate first (Eike)
+ could disable in 7.1 (menu) + remove on master? (Caolan)
+ no translation overhead (Cloph)
  + introduced 10 years ago
  + replaces currency in all documents in a directory

* Crash Testing (Caolan)
+ 20(+0) import failure, 8(+0) export failures
  + one new assert, tdf#138986
  + 1 commit is probably reposnsible for a number of problems
+ 2 coverity issues
+ 15 ossfuzz issues
  + one new xmlCreateEntity leak

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/6.4.7.2
 + (+117) 1349 1232 1411 1286 944 803 568 343 0
   + https://crashreport.libreoffice.org/stats/version/7.0.2.2
 + (+136) 1787 1651 2218 2409 2750 3829 5339 5103 3457 0
   + https://crashreport.libreoffice.org/stats/version/7.0.3.1
 + (+1197) 7544 6347 6410 6208 4932 3472 1732 0

- 
https://crashreport.libreoffice.org/stats/signature/SwCursor::UpDown(bool,unsigned%20short,Point%20const%20*,long,SwRootFrame%20&)
- Might be fixed by 0aa0fda64057647219954480ac1bab86b0f0e433

- 
https://crashreport.libreoffice.org/stats/signature/oox::drawingml::Transform2DContext::onCreateContext(long,oox::AttributeList%20const%20&)
- smartart related

* Mentoring/easyhack update
  committer...   1 week 1 month 3 months 12 months
  open  98(36) 144(32) 149(20)   151(20)
   reviews 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/alignhorizontalcenter.png  |binary
 icon-themes/elementary/cmd/32/bezierfill.png |binary
 icon-themes/elementary/cmd/32/changepolygon.png  |binary
 icon-themes/elementary/cmd/32/connector.png  |binary
 icon-themes/elementary/cmd/32/connectorarrowend.png  |binary
 icon-themes/elementary/cmd/32/connectorarrows.png|binary
 icon-themes/elementary/cmd/32/connectorarrowstart.png|binary
 icon-themes/elementary/cmd/32/connectorcircleend.png |binary
 icon-themes/elementary/cmd/32/connectorcircles.png   |binary
 icon-themes/elementary/cmd/32/connectorcirclestart.png   |binary
 icon-themes/elementary/cmd/32/connectorcurve.png |binary
 icon-themes/elementary/cmd/32/connectorcurvearrowend.png |binary
 icon-themes/elementary/cmd/32/connectorcurvearrows.png   |binary
 icon-themes/elementary/cmd/32/connectorcurvearrowstart.png   |binary
 icon-themes/elementary/cmd/32/connectorcurvecircleend.png|binary
 icon-themes/elementary/cmd/32/connectorcurvecircles.png  |binary
 icon-themes/elementary/cmd/32/connectorcurvecirclestart.png  |binary
 icon-themes/elementary/cmd/32/connectorline.png  |binary
 icon-themes/elementary/cmd/32/connectorlinearrowend.png  |binary
 icon-themes/elementary/cmd/32/connectorlinearrows.png|binary
 icon-themes/elementary/cmd/32/connectorlinearrowstart.png|binary
 icon-themes/elementary/cmd/32/connectorlinecircleend.png |binary
 icon-themes/elementary/cmd/32/connectorlinecirclestart.png   |binary
 icon-themes/elementary/cmd/32/connectorlines.png |binary
 icon-themes/elementary/cmd/32/connectorlinesarrowend.png |binary
 icon-themes/elementary/cmd/32/connectorlinesarrows.png   |binary
 icon-themes/elementary/cmd/32/connectorlinesarrowstart.png   |binary
 icon-themes/elementary/cmd/32/connectorlinescircleend.png|binary
 icon-themes/elementary/cmd/32/connectorlinescirclestart.png  |binary
 icon-themes/elementary/cmd/32/freeline.png   |binary
 icon-themes/elementary/cmd/32/insertdraw.png |binary
 icon-themes/elementary/cmd/32/line.png   |binary
 icon-themes/elementary/cmd/32/line_diagonal.png  |binary
 icon-themes/elementary/cmd/32/linearrowcircle.png|binary
 icon-themes/elementary/cmd/32/linearrowend.png   |binary
 icon-themes/elementary/cmd/32/linearrows.png |binary
 icon-themes/elementary/cmd/32/linearrowsquare.png|binary
 icon-themes/elementary/cmd/32/linearrowstart.png |binary
 icon-themes/elementary/cmd/32/linecirclearrow.png|binary
 icon-themes/elementary/cmd/32/linesquarearrow.png|binary
 icon-themes/elementary/cmd/32/measureline.png|binary
 icon-themes/elementary/cmd/32/polygon.png|binary
 icon-themes/elementary/cmd/32/polygon_diagonal.png   |binary
 icon-themes/elementary/cmd/32/polygon_diagonal_unfilled.png  |binary
 icon-themes/elementary/cmd/32/polygon_unfilled.png   |binary
 icon-themes/elementary/cmd/lc_bezierfill.png |binary
 icon-themes/elementary/cmd/lc_changepolygon.png  |binary
 icon-themes/elementary/cmd/lc_connector.png  |binary
 icon-themes/elementary/cmd/lc_connectorarrowend.png  |binary
 icon-themes/elementary/cmd/lc_connectorarrows.png|binary
 icon-themes/elementary/cmd/lc_connectorarrowstart.png|binary
 icon-themes/elementary/cmd/lc_connectorcircleend.png |binary
 icon-themes/elementary/cmd/lc_connectorcircles.png   |binary
 icon-themes/elementary/cmd/lc_connectorcirclestart.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurve.png |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrowend.png |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrows.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrowstart.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurvecircleend.png|binary
 icon-themes/elementary/cmd/lc_connectorcurvecircles.png  |binary
 icon-themes/elementary/cmd/lc_connectorcurvecirclestart.png  |binary
 icon-themes/elementary/cmd/lc_connectorline.png  |binary
 icon-themes/elementary/cmd/lc_connectorlinearrowend.png  |binary
 icon-themes/elementary/cmd/lc_connectorlinearrows.png|binary
 icon-themes/elementary/cmd/lc_connectorlinearrowstart.png|binary
 icon-themes/elementary/cmd/lc_connectorlinecircleend.png |binary
 icon-themes/elementary/cmd/lc_connectorlinecirclestart.png   |binary
 icon-themes/elementary/cmd/lc_connectorl

LibreOffice DevRoom Call for Papers

[Miklos Vajna]

Italo says this was meant to be sent to this list as well, so let me
forward it.

- Forwarded message from Italo Vignoli  -

> Date: Fri, 4 Dec 2020 14:10:31 +0100
> From: Italo Vignoli 
> Message-ID: 
> 
> FOSDEM 2021 will be a virtual event, taking place online on Saturday,
> February 6, and Sunday, February 7. The LibreOffice DevRoom is scheduled
> for Sunday, February 7, from 9AM to 7PM (times to be confirmed).
> 
> NEW RULES FOR 2021
> 
> - The reference time will be Brussels local time (CET).
> - Talks will be pre-recorded in advance, and streamed during the event
> - Q/A session will be live
> - A facility will be provided for people watching to chat between themselves
> - A facility will be provided for people watching to submit questions
> 
> IMPORTANT DATES TO REMEMBER
> 
> December 27: Submission deadline
> December 31: Announcement of selected talks
> January 4: Publication of DevRoom schedule
> January 15: Presentations upload deadline
> 
> CALL FOR PAPERS
> 
> We are inviting proposals for talks about LibreOffice or the ODF
> standard document format, on topics such as code, localization, QA, UX,
> tools, extensions, migrations and general advocacy. Please keep in mind
> that product pitches are not allowed at FOSDEM.
> 
> The length of talks is limited to a maximum of 25 minutes, as we would
> like to have some minutes for questions after each presentation, and to
> fit as many presenters as possible in the schedule. Exceptions must be
> explicitly requested and justified. You may be assigned LESS time than
> you request.
> 
> IMPORTANT INFORMATIONS
> 
> - Presentations have to be pre-recorded and tested for streaming before
> the event.
> - Once your talk is accepted, someone will help you to produce the
> pre-recorded content.
> - Contents will be reviewed to ensure they have the required quality,
> and uploaded before January 15, to be prepared and ready for broadcast.
> - During the stream of talks, speakers must be available online for the
> Q/A session.
> 
> TALK SUBMISSIONS
> 
> All talk submissions have to be made in the Pentabarf event planning
> tool: https://penta.fosdem.org/submission/FOSDEM21.
> 
> While filing the proposal, please provide the title of your talk, a
> short abstract (one or two paragraphs), some information about yourself
> (name, bio and photo, but please do remember that your profile might be
> already stored in Pentabarf).
> 
> To submit your talk, click on “Create Event” and select the
> “LibreOffice” DevRoom as the “Track”. Otherwise, your talk will not be
> even considered for any devroom at all.
> 
> If you already have a Pentabarf account from a previous year, even if
> your talk was not accepted, please reuse it. Create an account if, and
> only if, you don’t have one from a previous year. If you have any issues
> with Pentabarf, please contact it...@libreoffice.org for help.
> 
> CONTACTS
> 
> Italo Vignoli: it...@libreoffice.org
> Mike Saunders: mike.saund...@documentfoundation.org
> 
> Blog Post:
> https://blog.documentfoundation.org/blog/2020/12/04/fosdem-2021-lo-devroom-cfp/
> 
> -- 
> Italo Vignoli - Marketing & PR
> The Document Foundation & LibreOffice
> email italo.vign...@documentfoundation.org
> hangout/jabber italo.vign...@gmail.com
> mobile/signal +39.348.5653829
> 

- End forwarded message -
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

[Szymon Kłos (via logerrit)]

 vcl/source/control/fmtfield.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9c28ea195653e030cbee9184d9675094702346d3
Author: Szymon Kłos 
AuthorDate: Thu Dec 17 15:07:49 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 17 16:09:23 2020 +0100

jsdialog: step for spinfields

Change-Id: I35336dfcd9913a984b0a8894622d0785d4007bc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107884
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 9ce770b74ea7..2785d1f0bf86 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -1095,6 +1095,8 @@ boost::property_tree::ptree 
FormattedField::DumpAsPropertyTree()
 rtl_math_StringFormat_F, GetDecimalDigits(), '.').getStr());
 aTree.put("value", rtl::math::doubleToString(GetValue(),
 rtl_math_StringFormat_F, GetDecimalDigits(), '.').getStr());
+aTree.put("step", rtl::math::doubleToString(GetSpinSize(),
+rtl_math_StringFormat_F, GetDecimalDigits(), '.').getStr());
 
 return aTree;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx|   30 ++--
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx|   91 ---
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx|   48 +++
 bridges/source/cpp_uno/gcc3_linux_aarch64/vtablecall.hxx |   33 +
 4 files changed, 123 insertions(+), 79 deletions(-)

New commits:
commit 5e636ec653ce798935ed85aeef96a6fcff893729
Author: Stephan Bergmann 
AuthorDate: Thu Dec 17 14:17:05 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 17 15:47:51 2020 +0100

Various minor loplugin fixes (macOS ARM64)

Change-Id: I32276e3ceafa1e65671ba395de3f6fa587179d79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107878
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 0fce88db6749..8db8c37140e5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -45,7 +45,7 @@
 namespace {
 
 OUString toUnoName(char const * name) {
-assert(name != 0);
+assert(name != nullptr);
 OUStringBuffer b;
 bool scoped = *name == 'N';
 if (scoped) {
@@ -74,7 +74,7 @@ OUString toUnoName(char const * name) {
 
 class Rtti {
 public:
-Rtti(): app_(dlopen(0, RTLD_LAZY)) {}
+Rtti(): app_(dlopen(nullptr, RTLD_LAZY)) {}
 
 ~Rtti() { dlclose(app_); }
 
@@ -107,7 +107,7 @@ std::type_info * Rtti::getRtti(typelib_TypeDescription 
const & type) {
 OString sym(b.makeStringAndClear());
 std::type_info * rtti = static_cast(
 dlsym(app_, sym.getStr()));
-if (rtti == 0) {
+if (rtti == nullptr) {
 char const * rttiName = strdup(sym.getStr() + std::strlen("_ZTI"));
 if (rttiName == nullptr) {
 throw std::bad_alloc();
@@ -123,7 +123,7 @@ std::type_info * Rtti::getRtti(typelib_TypeDescription 
const & type) {
 typelib_CompoundTypeDescription const & ctd
 = reinterpret_cast(
 type);
-if (ctd.pBaseTypeDescription == 0) {
+if (ctd.pBaseTypeDescription == nullptr) {
 rtti = new __cxxabiv1::__class_type_info(rttiName);
 } else {
 std::type_info * base = getRtti(
@@ -201,9 +201,9 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void 
* exception) {
 #endif
 assert(header->exceptionDestructor == &deleteException);
 OUString unoName(toUnoName(header->exceptionType->name()));
-typelib_TypeDescription * td = 0;
+typelib_TypeDescription * td = nullptr;
 typelib_typedescription_getByName(&td, unoName.pData);
-assert(td != 0);
+assert(td != nullptr);
 uno_destructData(exception, td, &css::uno::cpp_release);
 typelib_typedescription_release(td);
 }
@@ -214,7 +214,7 @@ enum StructKind {
 };
 
 StructKind getStructKind(typelib_CompoundTypeDescription const * type) {
-StructKind k = type->pBaseTypeDescription == 0
+StructKind k = type->pBaseTypeDescription == nullptr
 ? STRUCT_KIND_EMPTY : getStructKind(type->pBaseTypeDescription);
 for (sal_Int32 i = 0; i != type->nMembers; ++i) {
 StructKind k2 = StructKind();
@@ -246,7 +246,7 @@ StructKind getStructKind(typelib_CompoundTypeDescription 
const * type) {
 break;
 case typelib_TypeClass_STRUCT:
 {
-typelib_TypeDescription * td = 0;
+typelib_TypeDescription * td = nullptr;
 TYPELIB_DANGER_GET(&td, type->ppTypeRefs[i]);
 k2 = getStructKind(
 reinterpret_cast(
@@ -289,12 +289,12 @@ namespace abi_aarch64 {
 void mapException(
 __cxxabiv1::__cxa_exception * exception, std::type_info const * type, 
uno_Any * any, uno_Mapping * mapping)
 {
-assert(exception != 0);
+assert(exception != nullptr);
 assert(type != nullptr);
 OUString unoName(toUnoName(type->name()));
-typelib_TypeDescription * td = 0;
+typelib_TypeDescription * td = nullptr;
 typelib_typedescription_getByName(&td, unoName.pData);
-if (td == 0) {
+if (td == nullptr) {
 css::uno::RuntimeException e("exception type not found: " + unoName);
 uno_type_any_constructAndConvert(
 any, &e,
@@ -307,15 +307,15 @@ void mapException(
 }
 
 void raiseException(uno_Any * any, uno_Mapping * mapping) {
-typelib_TypeDescription * td = 0;
+typelib_TypeDescription * td = nullptr;
 TYPELIB_DANGER_GET(&td, any->pType);
-if (td == 0) {
+if (td == nullptr) {
 throw css::uno::RuntimeException(
-"no typedescription for " + OUString(any->pType->pTypeName));
+"no typedescription for " + 
OUString::unacquired(&any->pType->pTypeName));
 }
 void * exc = __cxxabiv1::__cxa_allocate_exception(td->nSize);
 uno_copyAndConvertData(exc, any->pData, td, mapping);

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f2e801707445271c9b78d9326cc4f659ac3
Author: Seth Chaiklin 
AuthorDate: Thu Dec 17 15:40:26 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 17 15:40:26 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9d505510f15289b1393c2b2c654b23f03790c250
  - tdf#99613  clarify empty parameters in IF function in Calc

  + add two examples; explain that empty parameters are
 considered to be 0.

Change-Id: I5c218472774fdd00581cc0e12f2b228191742275
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107381
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/helpcontent2 b/helpcontent2
index 165f2eb082e5..9d505510f152 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 165f2eb082e5132ae2734c3c014bf7f35ee0ef8f
+Subproject commit 9d505510f15289b1393c2b2c654b23f03790c250
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/scalc/01/04060105.xhp |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9d505510f15289b1393c2b2c654b23f03790c250
Author: Seth Chaiklin 
AuthorDate: Tue Dec 8 14:36:24 2020 +0100
Commit: Eike Rathke 
CommitDate: Thu Dec 17 15:40:26 2020 +0100

tdf#99613  clarify empty parameters in IF function in Calc

  + add two examples; explain that empty parameters are
 considered to be 0.

Change-Id: I5c218472774fdd00581cc0e12f2b228191742275
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107381
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/source/text/scalc/01/04060105.xhp 
b/source/text/scalc/01/04060105.xhp
index 3dbcab1a4..d42ad8e03 100644
--- a/source/text/scalc/01/04060105.xhp
+++ b/source/text/scalc/01/04060105.xhp
@@ -108,7 +108,7 @@
 IF
  Specifies a logical test to be 
performed.
  
- IF(Test [; 
ThenValue [; OtherwiseValue]])
+ IF(Test [; 
[ThenValue] [; [OtherwiseValue]]])
  
 Test is any value or expression that can be TRUE or 
FALSE.
  
@@ -120,7 +120,10 @@
  
  
  
-=IF(A1>5;100;"too small") If the 
value in A1 is higher than 5, the value 100 is entered in the current cell; 
otherwise, the text “too small” (without quotes) is entered.
+=IF(A1>5;100;"too small") If the value in 
A1 is greater than 5, the value 
100 is returned; otherwise, the text too 
small is returned.
+ 
+=IF(A1>5;;"too small") If the value in 
A1 is greater than 5, the value 
0 is returned because empty parameters are considered to be 
0; otherwise, the text too small is 
returned.
+ =IF(A1>5;100;) If the value in 
A1 is less than 5, the value 
0 is returned because the empty OtherwiseValue 
is interpreted as 0; otherwise 100 is 
returned.
   
   
 NOT function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2020-Dec-17

[Heiko Tietze]

Present: Swetha, Sascha, Patrick, Heiko, (KomaIP)
Comments: Jan, Gerhard, Csongor, Thomas

Tickets/Topic

 * FIND AND REPLACE DIALOG: Allow users to see the replace result before
   moving to the next search
   + https://bugs.documentfoundation.org/show_bug.cgi?id=138285
   + not convinced it requires any change (Jan)
 + replacement lacks on proper feedback at most applications (Heiko)
   + how about repeated click interaction, optionally per checkbox,
 Replace->Next->Replace->Next... on the same button (Csongor)
 + needs to be optional, default should be the current (Patrick, Sascha)
 + checkbox may be labeled "Automatically progress on replace" (Sascha)
 + moving the mouse from replace to next and back is tedious,
   + change button label/function from replace to next - has drawbacks when
 the search parameters are changed
   + exchange next/replace buttons' position - totally confusing and
 bad usability
   + perhaps better not implement as it's a corner/expert case (Patrick)
 + feedback could be done differently, eg. via highlighting the replaced 
terms
   => comment; seek for a proper interaction

 * Remove Euro Converter Wizard from Wizard menu
   + https://bugs.documentfoundation.org/show_bug.cgi?id=135580
   + might have been useful in the past but fully agree to remove (Sascha)
   + would have been better done as extension
   + can be realized per F&R
   => no objection to remove

 * UI: Confusing categorization of the 'Hidden' feature
   + https://bugs.documentfoundation.org/show_bug.cgi?id=138658
   => closed as WF meanwhile

 * Add label to "Settings" button in Template Manager and change label to
   "Categories"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=138846
   + agreed, and perhaps move the button next to the category dropdown (Jan)
   + add Move to this menu (Seth)
 + doesn't work since Move applies to a single template (Sascha)
   + label might be useful, wouldn't use Category as it sounds like choosing
 maybe better call it Manage; but not if the button is placed next to the
 categories dropdown (Sascha)
   + move to top but let it show a dialog where a list allows to pick the
 categories are listed with all possible interactions next to it (Patrick)
   => move the button but discuss first on BZ whether as menu or dialog



OpenPGP_signature
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: ESC meeting agenda: 2020-12-17 16:00 Berlin time

[julien2412]

Miklos Vajna-6 wrote
> ...
> + Thunderbird Addressbook no longer connectable
> + https://bugs.documentfoundation.org/show_bug.cgi?id=138715
> + Rene removed the mork driver, needs closing?
> ...

Removing Mork => removing Thunderbird Address book but there's been too
mozab removing (I'm ok with this), should we remove all related idl eg:
offapi/com/sun/star/mozilla/MozillaBootstrap.idl or
offapi/com/sun/star/mozilla/XProfileDiscover.idl ?

Also there's the wrong named "Firebird" Address Data Source in Writer
wizards, should we remove this (or rename it if it works with Mozilla
Suite/Seamonkey but does it worth it?), knowing that the only remaining
entry would be "Other" (not very UI friendly...)?
Of course, all this should be documented in 7.2 release notes.



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - chart2/source sw/qa

[Tünde Tóth (via logerrit)]

 chart2/source/view/main/VLegend.cxx|   17 ++---
 sw/qa/extras/layout/data/tdf136816.odt |binary
 sw/qa/extras/layout/layout.cxx |   13 +
 3 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit 4114e5304425ff54e6957ef417e96e01a4cef532
Author: Tünde Tóth 
AuthorDate: Tue Dec 15 14:17:15 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 15:20:43 2020 +0100

tdf#136816: fix hidden legend entries in "Column and Line" charts

Regression from commit: 300e65cc47f3d6ae1563350757dbfadc080d7452
(tdf#123268 fix lost chart if all legend entries are hidden)

Change-Id: Id59cd8d681dada123feadbe7910be7fbc7ec37f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107757
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 1eb25c11500a235aa141a327a5489f6861e60a89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107802
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107874

diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index d16495e426f3..1975e5d8404c 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -1000,8 +1000,6 @@ void VLegend::createShapes(
 std::vector aNewEntries = 
pLegendEntryProvider->createLegendEntries(
 
aMaxSymbolExtent, eLegendPosition, xLegendProp,
 
xLegendContainer, m_xShapeFactory, m_xContext, mrModel);
-if (aNewEntries.size() == 0)
-return;
 aViewEntries.insert( aViewEntries.end(), 
aNewEntries.begin(), aNewEntries.end() );
 }
 }
@@ -1042,17 +1040,14 @@ void VLegend::createShapes(
 // create the buttons
 pButton->createShapes(xModelPage);
 }
-}
 
-Reference< drawing::XShape > xBorder =
-pShapeFactory->createRectangle( xLegendContainer,
-aLegendSize,
-awt::Point(0,0),
-aLineFillProperties.first,
-aLineFillProperties.second, 
ShapeFactory::StackPosition::Bottom );
+Reference xBorder = 
pShapeFactory->createRectangle(
+xLegendContainer, aLegendSize, awt::Point(0, 0), 
aLineFillProperties.first,
+aLineFillProperties.second, 
ShapeFactory::StackPosition::Bottom);
 
-//because of this name this border will be used for marking the 
legend
-ShapeFactory::setShapeName( xBorder, "MarkHandles" );
+//because of this name this border will be used for marking 
the legend
+ShapeFactory::setShapeName(xBorder, "MarkHandles");
+}
 }
 }
 catch( const uno::Exception & )
diff --git a/sw/qa/extras/layout/data/tdf136816.odt 
b/sw/qa/extras/layout/data/tdf136816.odt
new file mode 100644
index ..0b6599bea319
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf136816.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index acf877c323bf..27eca2137324 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -4215,6 +4215,19 @@ static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* 
pWrtShell)
 return aFlyRect;
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf136816)
+{
+SwDoc* pDoc = createDoc("tdf136816.odt");
+SwDocShell* pShell = pDoc->GetDocShell();
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+// Check number of legend entries
+assertXPath(pXmlDoc, "//text[contains(text(),\"Column\")]", 2);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testStableAtPageAnchoredFlyPosition)
 {
 // this doc has two page-anchored frames: one tiny on page 3 and one large 
on page 4.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

[Andrea Gelmini (via logerrit)]

 wizards/source/sfdocuments/SF_Base.xba |6 +++---
 wizards/source/sfdocuments/SF_Form.xba |8 
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 7d41ca2f59c2f22e90de358b852f56759f6c1ee9
Author: Andrea Gelmini 
AuthorDate: Thu Dec 17 13:24:55 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Thu Dec 17 14:57:03 2020 +0100

Fix typos

Change-Id: Ibbf592ba80afbe174662e1cc2dd992e7a16f67e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107876
Reviewed-by: Julien Nabet 
Reviewed-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Tested-by: Jean-Pierre Ledure 

diff --git a/wizards/source/sfdocuments/SF_Base.xba 
b/wizards/source/sfdocuments/SF_Base.xba
index 6ae761eef85c..8ab19d5cf103 100644
--- a/wizards/source/sfdocuments/SF_Base.xba
+++ b/wizards/source/sfdocuments/SF_Base.xba
@@ -603,11 +603,11 @@ REM 

 Private Function _CollectFormDocuments(ByRef poContainer As Object) As String
 ''' Returns a token-separated string of all hierarchical 
formdocument names
 ''' depending on the formdocuments container in argument
-''' The function traverses recursively the whle tree below 
the container
+''' The function traverses recursively the whole tree below 
the container
 ''' The initial call starts from the container 
_Component.getFormDocuments
 ''' The list contains closed and open forms
 
-Dim sCollectNames As String'  Returno value
+Dim sCollectNames As String'  Return value
 Dim oSubItem As Object '  
com.sun.star.container.XNameAccess (folder) or com.sun.star.ucb.XContent (form)
 Dim sFormName As String'  Single form name
 Dim i As Long
@@ -710,4 +710,4 @@ Private Function _Repr() As String
 End Function   '  SFDocuments.SF_Base._Repr
 
 REM  END OF SFDOCUMENTS.SF_BASE
-
\ No newline at end of file
+
diff --git a/wizards/source/sfdocuments/SF_Form.xba 
b/wizards/source/sfdocuments/SF_Form.xba
index cdc4fbe92c35..ef83da999582 100644
--- a/wizards/source/sfdocuments/SF_Form.xba
+++ b/wizards/source/sfdocuments/SF_Form.xba
@@ -75,7 +75,7 @@ Private ServiceName   As String
 
 ' Form location
 Private _Name  As String   ' Internal 
name of the form
-Private _DrawPage  As Long ' Index in 
DrawOages collection
+Private _DrawPage  As Long ' Index in 
DrawPages collection
 Private _UsualName As String   ' Name as 
known by user
 Private _FormType  As Integer  ' One of 
the ISxxxFORM constants
 
@@ -333,7 +333,7 @@ Try:
ElseIf Len(_Form.DataSOurceName) = 0 Then   '  There 
is no database linked with the form
'  Return Nothing
Else
-   '  Check if DataSourceName is a file or a 
registrered name and create database instance accordingly
+   '  Check if DataSourceName is a file or a 
registered name and create database instance accordingly
Set FSO = ScriptForge.SF_FileSystem
If 
FSO.FileExists(FSO._ConvertFromUrl(_Form.DataSourceName)) Then
Set _Database = 
ScriptForge.SF_Services.CreateScriptService("SFDatabases.Database" _
@@ -533,7 +533,7 @@ Check:
 
 Try:
'  For usual documents, check that the parent document is still 
open
-   '  For Base forms and subforms, check the openess of the main form
+   '  For Base forms and subforms, check the openness of the main form
Select Case _FormType
Case ISDOCFORM, ISCALCFORM
bAlive = [_Parent]._IsStillAlive(pbError)
@@ -649,4 +649,4 @@ Private Function _Repr() As String
 End Function   '  SFDocuments.SF_Form._Repr
 
 REM  END OF SFDOCUMENTS.SF_FORM
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski (via logerrit)]

 solenv/gbuild/platform/filter-showIncludes.awk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a1555d2011032100dc0f37bb2298f3c555d3b45
Author: Mike Kaganski 
AuthorDate: Thu Dec 17 15:17:01 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 17 14:48:15 2020 +0100

include everything from BUILDDIR, e.g. config_host/*

... otherwise any change in config that modifies those does not trigger
related units to be rebuilt

Change-Id: I680fc1e004208f7ccc752186d5e765560dffebf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107875
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 7803e376c9ed..9f5cabd1085b 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -35,7 +35,7 @@ BEGIN {
 # to match especially drive letters in allowlist case insensitive
 IGNORECASE = 1
 allowlist = \
-"^(" ENVIRON["SRCDIR"] "|" ENVIRON["WORKDIR"] ")"
+"^(" ENVIRON["SRCDIR"] "|" ENVIRON["BUILDDIR"] ")"
 firstline = 1
 }
 
___
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' - dbaccess/source

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/browser/sbagrid.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8ede5d2f592084f76ccd42c3f1f5875e894
Author: Julien Nabet 
AuthorDate: Mon Nov 30 07:49:02 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 14:38:17 2020 +0100

Related tdf#54021: Fields in tablecontrols of a form could not be copied

See https://bugs.documentfoundation.org/show_bug.cgi?id=54021#c42
for more details.
Of course there's still the main pb to fix, moving columns

Change-Id: I2308efa47cbb9b80f278cf2644bb9cf24ab831e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106849
Reviewed-by: Julien Nabet 
(cherry picked from commit 44f1ed1928d4d32b1a1962f413df69e2ae851789)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107014
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 41a30c9df178..f5c909600f54 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1046,6 +1046,7 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos)
 {
 Reference< XPropertySet >  xDataSource = getDataSource();
 OSL_ENSURE(xDataSource.is(), "SbaGridControl::DoColumnDrag : invalid data 
source !");
+::dbtools::ensureRowSetConnection(Reference< XRowSet 
>(getDataSource(),UNO_QUERY), getContext(), nullptr);
 
 Reference< XPropertySet > xAffectedCol;
 Reference< XPropertySet > xAffectedField;
___
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' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dafb51e234badf254a78a54ce804647b30c5d421
Author: Tor Lillqvist 
AuthorDate: Tue Dec 15 16:57:53 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 14:35:50 2020 +0100

Accept iOS SDK 14.3

Change-Id: I7b13905840616fe84a1b9d23161c4c349d2e7f0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107778
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107828
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 4d1729ea7dba..c936a0d60b9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3393,8 +3393,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.2
-older_sdk_vers="14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.3
+older_sdk_vers="14.2 14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 
12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sax/source

[Noel (via logerrit)]

 sax/source/tools/converter.cxx |   84 -
 1 file changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 11db2864308a4df47206f5c8a828f800fcbddd15
Author: Noel 
AuthorDate: Thu Dec 17 14:05:38 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 14:29:47 2020 +0100

use more string_view in sax::Converter

Change-Id: If8a9bba41e6b08583f64388d7b5581e616ec9066
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107873
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 5caeb3161b8a..8c59586cea38 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1335,12 +1335,12 @@ enum Result { R_NOTHING, R_OVERFLOW, R_SUCCESS };
 }
 
 static Result
-readUnsignedNumber(const OUString & rString,
-sal_Int32 & io_rnPos, sal_Int32 & o_rNumber)
+readUnsignedNumber(std::u16string_view rString,
+size_t & io_rnPos, sal_Int32 & o_rNumber)
 {
-sal_Int32 nPos(io_rnPos);
+size_t nPos(io_rnPos);
 
-while (nPos < rString.getLength())
+while (nPos < rString.size())
 {
 const sal_Unicode c = rString[nPos];
 if (('0' > c) || (c > '9'))
@@ -1354,7 +1354,7 @@ readUnsignedNumber(const OUString & rString,
 return R_NOTHING;
 }
 
-const sal_Int64 nTemp = rtl_ustr_toInt64_WithLength(rString.getStr() + 
io_rnPos, 10, nPos - io_rnPos);
+const sal_Int64 nTemp = rtl_ustr_toInt64_WithLength(rString.data() + 
io_rnPos, 10, nPos - io_rnPos);
 
 const bool bOverflow = (nTemp >= SAL_MAX_INT32);
 
@@ -1365,15 +1365,15 @@ readUnsignedNumber(const OUString & rString,
 
 static Result
 readUnsignedNumberMaxDigits(int maxDigits,
-const OUString & rString, sal_Int32 & io_rnPos,
+std::u16string_view rString, size_t & io_rnPos,
 sal_Int32 & o_rNumber)
 {
 bool bOverflow(false);
 sal_Int64 nTemp(0);
-sal_Int32 nPos(io_rnPos);
+size_t nPos(io_rnPos);
 OSL_ENSURE(maxDigits >= 0, "negative amount of digits makes no sense");
 
-while (nPos < rString.getLength())
+while (nPos < rString.size())
 {
 const sal_Unicode c = rString[nPos];
 if (('0' <= c) && (c <= '9'))
@@ -1408,10 +1408,10 @@ readUnsignedNumberMaxDigits(int maxDigits,
 }
 
 static bool
-readDurationT(const OUString & rString, sal_Int32 & io_rnPos)
+readDurationT(std::u16string_view rString, size_t & io_rnPos)
 {
-if ((io_rnPos < rString.getLength()) &&
-(rString[io_rnPos] == 'T'))
+if ((io_rnPos < rString.size()) &&
+(rString[io_rnPos] == 'T' || rString[io_rnPos] == 't'))
 {
 ++io_rnPos;
 return true;
@@ -1420,11 +1420,11 @@ readDurationT(const OUString & rString, sal_Int32 & 
io_rnPos)
 }
 
 static bool
-readDurationComponent(const OUString & rString,
-sal_Int32 & io_rnPos, sal_Int32 & io_rnTemp, bool & io_rbTimePart,
+readDurationComponent(std::u16string_view rString,
+size_t & io_rnPos, sal_Int32 & io_rnTemp, bool & io_rbTimePart,
 sal_Int32 & o_rnTarget, const sal_Unicode cLower, const sal_Unicode cUpper)
 {
-if (io_rnPos < rString.getLength())
+if (io_rnPos < rString.size())
 {
 if (cLower == rString[io_rnPos] || cUpper == rString[io_rnPos])
 {
@@ -1454,7 +1454,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 std::u16string_view rString)
 {
 std::u16string_view string = trim(rString);
-sal_Int32 nPos(0);
+size_t nPos(0);
 
 bool bIsNegativeDuration(false);
 if (!string.empty() && ('-' == string[0]))
@@ -1463,7 +1463,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 ++nPos;
 }
 
-if (nPos < static_cast(string.size())
+if (nPos < string.size()
 && string[nPos] != 'P' && string[nPos] != 'p') // duration must start 
with "P"
 {
 return false;
@@ -1524,7 +1524,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 }
 
 // eeek! seconds are icky.
-if ((nPos < static_cast(string.size())) && bSuccess)
+if ((nPos < string.size()) && bSuccess)
 {
 if (string[nPos] == '.' ||
 string[nPos] == ',')
@@ -1536,7 +1536,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 nTemp = -1;
 const sal_Int32 nStart(nPos);
 bSuccess = readUnsignedNumberMaxDigits(9, string, nPos, 
nTemp) == R_SUCCESS;
-if ((nPos < static_cast(string.size())) && 
bSuccess)
+if ((nPos < string.size()) && bSuccess)
 {
 if (-1 != nTemp)
 {
@@ -1584,7 +1584,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 }
 }
 
-if (nPos != static_cast(string.size())) // string not processed 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - scp2/source setup_native/source

[DaeHyun Sung (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |2 +-
 5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 95516d9c17bc59b3dfd46674ae9206ed355cecaf
Author: DaeHyun Sung 
AuthorDate: Sun Nov 29 22:58:53 2020 +0900
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 14:28:45 2020 +0100

package Korean(ko-KR) dictionaries into installset

Change-Id: I30cc4bdf4283cefb5985dc5380e2db5660d7d6e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106840
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 5d6cd2ee5876c86dc4dc976478a8b138c6c44f10)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107812

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0610c31bb188..7d2a1eed2f0e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -527,6 +527,15 @@ File gid_File_Extension_Dictionary_Kmr_Latn
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ko
+Dir = FILELIST_DIR;
+Name = "Dictionary/dict-ko.filelist";
+Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lo
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 0c1db4fd4aaf..ee8024fe8f21 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -445,6 +445,17 @@ Module gid_Module_Root_Extension_Dictionary_Kmr_Latn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ko
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KO );
+Files = (gid_File_Extension_Dictionary_Ko);
+InstallOrder = "2000";
+Sortkey = "623";
+Spellcheckerlanguage = "ko";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lt
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
 Files = (gid_File_Extension_Dictionary_Lt);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 5f7609eba8d9..5aaa1dc05ccd 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -214,6 +214,12 @@ en-US = "Kurdish, Northern, Latin script"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
 en-US = "Kurdish, Northern, Latin script spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_LO]
 en-US = "Lao"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index f3efd5afa4bf..a9e04d5a3870 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -792,6 +792,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Ko"
+solarispackagename = 
"%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2020 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "ko-KR dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lo"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 89dd8978e5c2..a5a7649e3317 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -58,7 +58,7 @@ is = "is"
 it = "it,de,fr"
 ja = "EMPTY"
 kmr-Latn = "kmr-Latn-TR"
-ko = "EMPTY"
+ko = "ko"
 lo = "lo"
 lt = "lt,de,pl,ru"
 lv = "lv"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.

[Libreoffice-commits] core.git: scp2/source setup_native/source

[DaeHyun Sung (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |2 +-
 5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 5d6cd2ee5876c86dc4dc976478a8b138c6c44f10
Author: DaeHyun Sung 
AuthorDate: Sun Nov 29 22:58:53 2020 +0900
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 14:27:33 2020 +0100

package Korean(ko-KR) dictionaries into installset

Change-Id: I30cc4bdf4283cefb5985dc5380e2db5660d7d6e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106840
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0610c31bb188..7d2a1eed2f0e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -527,6 +527,15 @@ File gid_File_Extension_Dictionary_Kmr_Latn
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ko
+Dir = FILELIST_DIR;
+Name = "Dictionary/dict-ko.filelist";
+Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lo
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 0c1db4fd4aaf..ee8024fe8f21 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -445,6 +445,17 @@ Module gid_Module_Root_Extension_Dictionary_Kmr_Latn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ko
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KO );
+Files = (gid_File_Extension_Dictionary_Ko);
+InstallOrder = "2000";
+Sortkey = "623";
+Spellcheckerlanguage = "ko";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lt
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
 Files = (gid_File_Extension_Dictionary_Lt);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 5f7609eba8d9..5aaa1dc05ccd 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -214,6 +214,12 @@ en-US = "Kurdish, Northern, Latin script"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
 en-US = "Kurdish, Northern, Latin script spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_LO]
 en-US = "Lao"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index f3efd5afa4bf..a9e04d5a3870 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -792,6 +792,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Ko"
+solarispackagename = 
"%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2020 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "ko-KR dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Lo"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lo"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 89dd8978e5c2..a5a7649e3317 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -58,7 +58,7 @@ is = "is"
 it = "it,de,fr"
 ja = "EMPTY"
 kmr-Latn = "kmr-Latn-TR"
-ko = "EMPTY"
+ko = "ko"
 lo = "lo"
 lt = "lt,de,pl,ru"
 lv = "lv"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/jpeg/JpegReader.cxx |4 ++--
 vcl/source/filter/jpeg/jpeg.h |2 +-
 vcl/source/filter/jpeg/jpegc.cxx  |3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8b1efde9272adb2b7e4c438eba63193249216c9c
Author: Caolán McNamara 
AuthorDate: Tue Dec 15 17:35:32 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 14:10:32 2020 +0100

tdf#138950 allow up to one short read to not trigger cancelling import

Change-Id: Iedbfc344c311c40244ba2f58c56c62ac47584028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107794
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/filter/jpeg/JpegReader.cxx 
b/vcl/source/filter/jpeg/JpegReader.cxx
index df7374770463..cbdac58aa3c6 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -47,7 +47,7 @@ static void init_source (j_decompress_ptr cinfo)
  * This is correct behavior for reading a series of images from one source.
  */
 source->start_of_file = TRUE;
-source->no_data_available = FALSE;
+source->no_data_available_failures = 0;
 }
 
 }
@@ -86,7 +86,7 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo)
 
 if (!nbytes)
 {
-source->no_data_available = TRUE;
+source->no_data_available_failures++;
 if (source->start_of_file) /* Treat empty input file as fatal 
error */
 {
 ERREXIT(cinfo, JERR_INPUT_EMPTY);
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 2f951e065934..79ec824ada22 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -59,7 +59,7 @@ struct SourceManagerStruct {
 SvStream*   stream; /* source stream */
 JOCTET* buffer; /* start of buffer */
 boolean start_of_file;  /* have we gotten any data yet? */
-boolean no_data_available;
+int no_data_available_failures;
 };
 
 #endif
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c1fbb535a8e4..3f6a362f826c 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -267,7 +267,8 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* 
pJPEGReader, void* pInputS
 rContext.pCYMKBuffer.resize(nWidth * 4);
 }
 
-for (*pLines = 0; *pLines < nHeight && !source->no_data_available; 
(*pLines)++)
+// tdf#138950 allow up to one short read 
(no_data_available_failures <= 1) to not trigger cancelling import
+for (*pLines = 0; *pLines < nHeight && 
source->no_data_available_failures <= 1; (*pLines)++)
 {
 size_t yIndex = *pLines;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

DevRoom Call for Papers

[Miklos Vajna]

Italo says this was meant to be sent to this list as well, so let me
forward it.

- Forwarded message from Italo Vignoli  -

> Date: Fri, 4 Dec 2020 14:10:31 +0100
> From: Italo Vignoli 
> Message-ID: 
> 
> FOSDEM 2021 will be a virtual event, taking place online on Saturday,
> February 6, and Sunday, February 7. The LibreOffice DevRoom is scheduled
> for Sunday, February 7, from 9AM to 7PM (times to be confirmed).
> 
> NEW RULES FOR 2021
> 
> - The reference time will be Brussels local time (CET).
> - Talks will be pre-recorded in advance, and streamed during the event
> - Q/A session will be live
> - A facility will be provided for people watching to chat between themselves
> - A facility will be provided for people watching to submit questions
> 
> IMPORTANT DATES TO REMEMBER
> 
> December 27: Submission deadline
> December 31: Announcement of selected talks
> January 4: Publication of DevRoom schedule
> January 15: Presentations upload deadline
> 
> CALL FOR PAPERS
> 
> We are inviting proposals for talks about LibreOffice or the ODF
> standard document format, on topics such as code, localization, QA, UX,
> tools, extensions, migrations and general advocacy. Please keep in mind
> that product pitches are not allowed at FOSDEM.
> 
> The length of talks is limited to a maximum of 25 minutes, as we would
> like to have some minutes for questions after each presentation, and to
> fit as many presenters as possible in the schedule. Exceptions must be
> explicitly requested and justified. You may be assigned LESS time than
> you request.
> 
> IMPORTANT INFORMATIONS
> 
> - Presentations have to be pre-recorded and tested for streaming before
> the event.
> - Once your talk is accepted, someone will help you to produce the
> pre-recorded content.
> - Contents will be reviewed to ensure they have the required quality,
> and uploaded before January 15, to be prepared and ready for broadcast.
> - During the stream of talks, speakers must be available online for the
> Q/A session.
> 
> TALK SUBMISSIONS
> 
> All talk submissions have to be made in the Pentabarf event planning
> tool: https://penta.fosdem.org/submission/FOSDEM21.
> 
> While filing the proposal, please provide the title of your talk, a
> short abstract (one or two paragraphs), some information about yourself
> (name, bio and photo, but please do remember that your profile might be
> already stored in Pentabarf).
> 
> To submit your talk, click on “Create Event” and select the
> “LibreOffice” DevRoom as the “Track”. Otherwise, your talk will not be
> even considered for any devroom at all.
> 
> If you already have a Pentabarf account from a previous year, even if
> your talk was not accepted, please reuse it. Create an account if, and
> only if, you don’t have one from a previous year. If you have any issues
> with Pentabarf, please contact it...@libreoffice.org for help.
> 
> CONTACTS
> 
> Italo Vignoli: it...@libreoffice.org
> Mike Saunders: mike.saund...@documentfoundation.org
> 
> Blog Post:
> https://blog.documentfoundation.org/blog/2020/12/04/fosdem-2021-lo-devroom-cfp/
> 
> -- 
> Italo Vignoli - Marketing & PR
> The Document Foundation & LibreOffice
> email italo.vign...@documentfoundation.org
> hangout/jabber italo.vign...@gmail.com
> mobile/signal +39.348.5653829
> 

- End forwarded message -
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extensions/source

[Caolán McNamara (via logerrit)]

 extensions/source/propctrlr/standardcontrol.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4cc753b6b9a7011da3ea50a1c90ed10870b9a2e0
Author: Caolán McNamara 
AuthorDate: Tue Dec 15 15:17:27 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 14:07:43 2020 +0100

tdf#138701 leave current combobox cursor valid if the contents won't change

Change-Id: I6d7f5de7b79d447590fcfa325f4be7430eaffd5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107708
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/extensions/source/propctrlr/standardcontrol.cxx 
b/extensions/source/propctrlr/standardcontrol.cxx
index a9b422440932..0b64c9518ef2 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -583,7 +583,10 @@ namespace pcr
 {
 OUString sText;
 _rValue >>= sText;
-getTypedControlWindow()->set_entry_text( sText );
+weld::ComboBox* pControlWindow = getTypedControlWindow();
+// tdf#138701 leave current cursor valid if the contents won't change
+if (pControlWindow->get_active_text() != sText)
+pControlWindow->set_entry_text(sText);
 }
 
 Any SAL_CALL OComboboxControl::getValue()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff reportdesign/source xmloff/inc xmloff/source

[Noel (via logerrit)]

 include/xmloff/xmluconv.hxx   |   12 ++--
 reportdesign/source/filter/xml/xmlGroup.cxx   |2 +-
 reportdesign/source/filter/xml/xmlSection.cxx |2 +-
 reportdesign/source/filter/xml/xmlTable.cxx   |2 +-
 xmloff/inc/txtflde.hxx|2 +-
 xmloff/source/chart/SchXMLTools.cxx   |2 +-
 xmloff/source/chart/SchXMLTools.hxx   |2 +-
 xmloff/source/core/xmluconv.cxx   |   16 +---
 xmloff/source/text/XMLAnchorTypePropHdl.hxx   |2 +-
 xmloff/source/text/XMLSectionExport.cxx   |2 +-
 xmloff/source/text/XMLSectionExport.hxx   |2 +-
 xmloff/source/text/txtflde.cxx|6 +++---
 xmloff/source/text/txtprhdl.cxx   |2 +-
 13 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 95283f63fd1095121c30f7fc23259f03a5382955
Author: Noel 
AuthorDate: Thu Dec 17 13:33:39 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 14:05:21 2020 +0100

use more string_view in SvXMLUnitConverter

Change-Id: Id40a071e1abf0bf2e13217e8745fdf266010c1c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107872
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 40edab42cdfd..3a9950edbd64 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -136,7 +136,7 @@ public:
 not found in the map, this method will return false */
 template
 static bool convertEnum( EnumT& rEnum,
- const OUString& rValue,
+ std::u16string_view rValue,
  const SvXMLEnumMapEntry *pMap )
 {
 sal_uInt16 nTmp;
@@ -151,7 +151,7 @@ public:
 not found in the map, this method will return false */
 template
 static bool convertEnum( EnumT& rEnum,
- const OUString& rValue,
+ std::u16string_view rValue,
  const SvXMLEnumStringMapEntry *pMap )
 {
 sal_uInt16 nTmp;
@@ -213,7 +213,7 @@ public:
 
 /** convert string to ::basegfx::B3DVector */
 static bool convertB3DVector( ::basegfx::B3DVector& rVector,
-  const OUString& rValue );
+  std::u16string_view rValue );
 
 /** convert string to ::basegfx::B3DVector */
 static bool convertB3DVector( ::basegfx::B3DVector& rVector,
@@ -253,7 +253,7 @@ public:
  bool *pEncoded=nullptr ) const;
 /** convert string (hex) to number (sal_uInt32) */
 static bool convertHex( sal_uInt32& nVal,
-  const OUString& rValue );
+  std::u16string_view rValue );
 
 /** convert number (sal_uInt32) to string (hex) */
 static void convertHex( OUStringBuffer& rBuffer,
@@ -261,11 +261,11 @@ public:
 
 private:
 static bool convertEnumImpl( sal_uInt16& rEnum,
- const OUString& rValue,
+ std::u16string_view rValue,
  const SvXMLEnumMapEntry *pMap );
 
 static bool convertEnumImpl( sal_uInt16& rEnum,
- const OUString& rValue,
+ std::u16string_view rValue,
  const SvXMLEnumStringMapEntry *pMap );
 
 static bool convertEnumImpl( OUStringBuffer& rBuffer,
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx 
b/reportdesign/source/filter/xml/xmlGroup.cxx
index b8a8e10abc10..938ec7f3238e 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -39,7 +39,7 @@ namespace rptxml
 using namespace ::com::sun::star::report;
 using namespace ::com::sun::star::xml::sax;
 
-static sal_Int16 lcl_getKeepTogetherOption(const OUString& _sValue)
+static sal_Int16 lcl_getKeepTogetherOption(std::u16string_view _sValue)
 {
 sal_Int16 nRet = report::KeepTogether::NO;
 const SvXMLEnumMapEntry* aXML_EnumMap = 
OXMLHelper::GetKeepTogetherOptions();
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx 
b/reportdesign/source/filter/xml/xmlSection.cxx
index 71a458947fdd..2d5a20ea1927 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -36,7 +36,7 @@ namespace rptxml
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-static sal_Int16 lcl_getReportPrintOption(const OUString& _sValue)
+static sal_Int16 lcl_getReportPrintOption(std::u16string_view _sValue)
 {
 sal_Int16 nRet = report::ReportPrintOption::ALL_PAGES;
 const SvXMLEnumMapEntry* aXML_EnumMap = 
OXMLHelper::GetReportPrintOptions();
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx 
b/reportdesign/source/filter/xml/xmlTable.cxx
index f69

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svx svx/source

[Caolán McNamara (via logerrit)]

 include/svx/linectrl.hxx  |5 +
 include/svx/sidebar/LinePropertyPanelBase.hxx |4 ++--
 svx/source/sidebar/line/LinePropertyPanelBase.cxx |   18 ++
 svx/source/tbxctrls/linectrl.cxx  |   10 ++
 4 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 4b87577ea3f80e1e3df5ce1b492dea267577f072
Author: Caolán McNamara 
AuthorDate: Thu Dec 10 11:27:15 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 14:03:52 2020 +0100

Resolves: tdf#138789 disable widgets on 'none' when status changes

instead of when chage is dispatched, the chart case has its own
dispatcher that disables the base class one. This fixes the reported
problem, and the related problem of updating when moving focus from
one line that has style 'none' to one that doesn't, and vice-versa,
where no change is dispached on received on context change

Change-Id: I6afb396e75ba93c13fcae71c52618cfce7f9cecb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107527
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 62f428aa5136..7ade8dc06643 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -32,6 +32,7 @@ class XLineStyleItem;
 class XLineDashItem;
 
 typedef std::function 
LineStyleSelectFunction;
+typedef std::function LineStyleIsNoneFunction;
 
 // SvxLineStyleController:
 class SVXCORE_DLLPUBLIC SvxLineStyleToolBoxControl final : public 
svt::PopupWindowController
@@ -40,6 +41,7 @@ private:
 std::unique_ptr m_xBtnUpdater;
 
 LineStyleSelectFunction m_aLineStyleSelectFunction;
+LineStyleIsNoneFunction m_aLineStyleIsNoneFunction;
 
 public:
 SvxLineStyleToolBoxControl( const 
css::uno::Reference& rContext );
@@ -56,7 +58,10 @@ public:
 
 virtual ~SvxLineStyleToolBoxControl() override;
 
+// called when the user selects a line style
 void setLineStyleSelectFunction(const LineStyleSelectFunction& 
aLineStyleSelectFunction);
+// called when the line style changes, can be used to trigger disabling 
the arrows if the none line style is selected
+void setLineStyleIsNoneFunction(const LineStyleIsNoneFunction& 
aLineStyleIsNoneFunction);
 void dispatchLineStyleCommand(const OUString& rCommand, const 
css::uno::Sequence& rArgs);
 
 private:
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx 
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 40b4cc6f4688..2da80e9a6b54 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -45,7 +45,7 @@ namespace svx
 namespace sidebar
 {
 
-class DisableArrowsWrapper;
+class LineStyleNoneChange;
 
 class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout
 {
@@ -116,7 +116,7 @@ private:
 //popup windows
 std::unique_ptr mxLineWidthPopup;
 
-std::unique_ptr mxDisableArrowsWrapper;
+std::unique_ptr mxLineStyleNoneChange;
 
 sal_uInt16  mnTrans;
 MapUnit meMapUnit;
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx 
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index f2c1b4553ea4..ef4778f4ad7c 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -36,26 +36,20 @@ const char SELECTWIDTH[] = "SelectWidth";
 namespace svx::sidebar {
 
 // trigger disabling the arrows if the none line style is selected
-class DisableArrowsWrapper
+class LineStyleNoneChange
 {
 private:
 LinePropertyPanelBase& m_rPanel;
 
 public:
-DisableArrowsWrapper(LinePropertyPanelBase& rPanel)
+LineStyleNoneChange(LinePropertyPanelBase& rPanel)
 : m_rPanel(rPanel)
 {
 }
 
-bool operator()(const OUString& rCommand, const css::uno::Any& rValue)
+void operator()(bool bLineStyleNone)
 {
-if (rCommand == ".uno:XLineStyle")
-{
-css::drawing::LineStyle eLineStyle(css::drawing::LineStyle_NONE);
-rValue >>= eLineStyle;
-m_rPanel.SetNoneLineStyle(eLineStyle == 
css::drawing::LineStyle_NONE);
-}
-return false;
+m_rPanel.SetNoneLineStyle(bLineStyleNone);
 }
 };
 
@@ -89,7 +83,7 @@ LinePropertyPanelBase::LinePropertyPanelBase(
 mxGridLineProps(m_xBuilder->weld_widget("lineproperties")),
 mxBoxArrowProps(m_xBuilder->weld_widget("arrowproperties")),
 mxLineWidthPopup(new LineWidthPopup(mxTBWidth.get(), *this)),
-mxDisableArrowsWrapper(new DisableArrowsWrapper(*this)),
+mxLineStyleNoneChange(new LineStyleNoneChange(*this)),
 mnTrans(0),
 meMapUnit(MapUnit::MapMM),
 mnWidthCoreValue(0),
@@ -150,7 +144,7 @@ void LinePropertyPanelBase::Initialize()
 mxLBCapStyle->connect_changed( LINK( this, LinePropertyPanelBase, 
ChangeCapStyleHdl ) );
 
 SvxLineStyleToolBoxControl* pLineStyleControl = 
getLineStyleToolBoxControl(*mxLineStyleDispatch);
-pLineStyle

[Libreoffice-commits] core.git: translations

[Andras Timar (via logerrit)]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a8e882b5aa7436395e9e3da0316f45690260166b
Author: Andras Timar 
AuthorDate: Thu Dec 17 14:03:24 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 17 14:03:24 2020 +0100

Update git submodules

* Update translations from branch 'master'
  to 0c5bce2255d6cab360e066c391a14d85d7e7d115
  - Updated Slovenian translation

Change-Id: Ia1898aa1b2659422d96c1997dac7436f123d12f6

diff --git a/translations b/translations
index 129365b9a82c..0c5bce2255d6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 129365b9a82c839c794b7747e6148dd0073779cb
+Subproject commit 0c5bce2255d6cab360e066c391a14d85d7e7d115
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sl

[Andras Timar (via logerrit)]

 source/sl/basctl/messages.po  |  194 
 source/sl/chart2/messages.po  | 1170 +-
 source/sl/cui/messages.po | 4628 
 source/sl/dbaccess/messages.po|  600 -
 source/sl/desktop/messages.po |   82 
 source/sl/extensions/messages.po  |  316 
 source/sl/filter/messages.po  |  496 
 source/sl/formula/messages.po |   32 
 source/sl/fpicker/messages.po |   20 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |  132 
 source/sl/helpcontent2/source/text/scalc/00.po|8 
 source/sl/helpcontent2/source/text/scalc/01.po|   12 
 source/sl/helpcontent2/source/text/scalc/guide.po |   18 
 source/sl/helpcontent2/source/text/sdraw.po   |   54 
 source/sl/helpcontent2/source/text/sdraw/01.po|   10 
 source/sl/helpcontent2/source/text/shared/00.po   |   70 
 source/sl/helpcontent2/source/text/shared/01.po   |   54 
 source/sl/helpcontent2/source/text/shared/02.po   |   38 
 source/sl/helpcontent2/source/text/shared/guide.po|  536 
 source/sl/helpcontent2/source/text/shared/optionen.po |  190 
 source/sl/helpcontent2/source/text/simpress/02.po |   24 
 source/sl/helpcontent2/source/text/swriter.po |   14 
 source/sl/helpcontent2/source/text/swriter/00.po  |4 
 source/sl/helpcontent2/source/text/swriter/01.po  |  426 
 source/sl/helpcontent2/source/text/swriter/guide.po   |  378 
 source/sl/helpcontent2/source/text/swriter/menu.po|4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   29 
 source/sl/reportdesign/messages.po|  150 
 source/sl/sc/messages.po  | 3902 +++
 source/sl/sd/messages.po  | 1786 +--
 source/sl/sfx2/messages.po|  664 -
 source/sl/starmath/messages.po| 1001 +
 source/sl/svtools/messages.po |  756 -
 source/sl/svx/messages.po | 1792 +--
 source/sl/sw/messages.po  | 5398 +-
 source/sl/uui/messages.po |   40 
 source/sl/vcl/messages.po |  192 
 source/sl/writerperfect/messages.po   |   44 
 source/sl/xmlsecurity/messages.po |  154 
 39 files changed, 13041 insertions(+), 12377 deletions(-)

New commits:
commit 0c5bce2255d6cab360e066c391a14d85d7e7d115
Author: Andras Timar 
AuthorDate: Wed Dec 16 18:24:47 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 17 14:03:13 2020 +0100

Updated Slovenian translation

Change-Id: Ia1898aa1b2659422d96c1997dac7436f123d12f6

diff --git a/source/sl/basctl/messages.po b/source/sl/basctl/messages.po
index 91107b931bd..ed4ee6f09e9 100644
--- a/source/sl/basctl/messages.po
+++ b/source/sl/basctl/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2020-11-15 13:58+0100\n"
+"POT-Creation-Date: 2020-12-09 20:01+0100\n"
 "PO-Revision-Date: 2020-11-09 15:24+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
@@ -504,112 +504,112 @@ msgctxt "basicmacrodialog|extended_tip|ok"
 msgid "Runs or saves the current macro."
 msgstr "Zažene ali shrani trenutni makro."
 
-#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:160
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:161
 msgctxt "basicmacrodialog|extended_tip|macros"
 msgid "Lists the macros that are contained in the module selected in the Macro 
from list."
 msgstr "Naniza makre, ki so vsebovani v izbranem modulu s seznama Makro iz."
 
-#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:173
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:174
 msgctxt "basicmacrodialog|existingmacrosft"
 msgid "Existing Macros In:"
 msgstr "Obstoječi makri v:"
 
-#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:242
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:243
 msgctxt "basicmacrodialog|extended_tip|libraries"
 msgid "Lists the libraries and the modules where you can open or save your 
macros. To save a macro with a particular document, open the document, and then 
open this dialog."
 msgstr "Izpiše knjižnice in module, kjer lahko odprete ali shranite svoje 
makre. Za shranjevanje makra z določenim dokumentom odprite dokument in nato 
odprite to pogovorno okno."
 
-#: 

[Libreoffice-commits] core.git: tools/source

[Noel Grandin (via logerrit)]

 tools/source/stream/stream.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5b20f44a9911534dd1796d3bfa8cbca4619e075
Author: Noel Grandin 
AuthorDate: Wed Dec 16 12:29:17 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 14:02:11 2020 +0100

simplify checkSeek()

Change-Id: Ie6e016aa9fe630691ed71154489c63a182a3f8cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107827
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index a7021d2b22aa..f807a56cf52f 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1411,7 +1411,7 @@ sal_uInt64 SvStream::Seek(sal_uInt64 const nFilePos)
 
 bool checkSeek(SvStream &rSt, sal_uInt64 nOffset)
 {
-const sal_uInt64 nMaxSeek(rSt.Tell() + rSt.remainingSize());
+const sal_uInt64 nMaxSeek = rSt.TellEnd();
 return (nOffset <= nMaxSeek && rSt.Seek(nOffset) == nOffset);
 }
 
___
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' - oox/qa oox/source

[Miklos Vajna (via logerrit)]

 oox/qa/unit/drawingml.cxx   |   38 +++---
 oox/source/export/drawingml.cxx |   13 -
 oox/source/export/shapes.cxx|4 +++-
 3 files changed, 42 insertions(+), 13 deletions(-)

New commits:
commit dbd0fd75c86983d88f4f62c680deeaa845358c8a
Author: Miklos Vajna 
AuthorDate: Wed Dec 16 14:19:16 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:57:51 2020 +0100

tdf#129961 oox: add PPTX export for table shadow as direct format

Custom shapes export shadow as part of WriteShapeEffects(), so use the
same for table shapes as well.

This needs fixing the effect export up a bit, because table shapes have
no interop grab-bag, glow or soft edge properties, but the rest of the
code can be shared.

(cherry picked from commit 252cdd5f43d65095543e317d37e1a0ea4fd839e0)

Change-Id: Icf0b90c5b44e3d9c4115c9f3b0d56ba0852ab640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107865
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index d666b3d332a7..c7e72d458194 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -293,21 +293,37 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, 
testCameraRotationRevolution)
 
 CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTableShadow)
 {
+auto verify = [](const uno::Reference& xComponent) {
+uno::Reference 
xDrawPagesSupplier(xComponent, uno::UNO_QUERY);
+uno::Reference xDrawPage(
+xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+bool bShadow = false;
+CPPUNIT_ASSERT(xShape->getPropertyValue("Shadow") >>= bShadow);
+
+CPPUNIT_ASSERT(bShadow);
+sal_Int32 nColor = 0;
+CPPUNIT_ASSERT(xShape->getPropertyValue("ShadowColor") >>= nColor);
+CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nColor);
+};
 OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"table-shadow.pptx";
 load(aURL);
-uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
-uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
- uno::UNO_QUERY);
-uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
-bool bShadow = false;
-CPPUNIT_ASSERT(xShape->getPropertyValue("Shadow") >>= bShadow);
-
 // Without the accompanying fix in place, this test would have failed, 
because shadow on a table
 // was lost on import.
-CPPUNIT_ASSERT(bShadow);
-sal_Int32 nColor = 0;
-CPPUNIT_ASSERT(xShape->getPropertyValue("ShadowColor") >>= nColor);
-CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nColor);
+verify(getComponent());
+
+uno::Reference xStorable(getComponent(), uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("Impress Office Open XML");
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+getComponent()->dispose();
+validate(aTempFile.GetFileName(), test::OOXML);
+getComponent() = loadFromDesktop(aTempFile.GetURL());
+// Without the accompanying fix in place, this test would have failed, 
because shadow on a table
+// was lost on export.
+verify(getComponent());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 918d212cac12..9eeacf4d2b19 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -4048,7 +4048,8 @@ static sal_Int32 lcl_CalculateDir(const double dX, const 
double dY)
 void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet )
 {
 Sequence< PropertyValue > aGrabBag, aEffects, aOuterShdwProps;
-if( GetProperty( rXPropSet, "InteropGrabBag" ) )
+bool bHasInteropGrabBag = 
rXPropSet->getPropertySetInfo()->hasPropertyByName("InteropGrabBag");
+if (bHasInteropGrabBag && GetProperty(rXPropSet, "InteropGrabBag"))
 {
 mAny >>= aGrabBag;
 auto pProp = std::find_if(std::cbegin(aGrabBag), std::cend(aGrabBag),
@@ -4198,6 +4199,11 @@ void DrawingML::WriteShapeEffects( const Reference< 
XPropertySet >& rXPropSet )
 
 void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet)
 {
+if 
(!rXPropSet->getPropertySetInfo()->hasPropertyByName("GlowEffectRadius"))
+{
+return;
+}
+
 sal_Int32 nRad = 0;
 rXPropSet->getPropertyValue("GlowEffectRadius") >>= nRad;
 if (!nRad)
@@ -4220,6 +4226,11 @@ void DrawingML::WriteGlowEffect(const Reference< 
XPropertySet >& rXPropSet)
 
 void DrawingML::WriteSoftEdgeEffect(const 
css::uno::Reference& rXPropSet)
 {
+if (!rXPropSet->getPropertySetInfo()->hasPropertyByName("SoftEdgeRadius"))

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/svx svx/Module_svx.mk svx/qa svx/source svx/UITest_svx_table.mk

[Miklos Vajna (via logerrit)]

 include/svx/sdr/table/tablecontroller.hxx |1 
 svx/Module_svx.mk |4 ++
 svx/UITest_svx_table.mk   |   16 ++
 svx/qa/uitest/table/tablecontroller.py|   45 ++
 svx/source/table/tablecontroller.cxx  |   33 +-
 5 files changed, 98 insertions(+), 1 deletion(-)

New commits:
commit 12be9c3205b1dc7901ce015ed1eefdc232ed9099
Author: Miklos Vajna 
AuthorDate: Tue Dec 15 17:17:56 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:57:17 2020 +0100

tdf#129961 svx: finish UI for table shadow as direct format

Normally properties on an SdrObject is set using SetAttributes(), but
that would take the selection controller into account, so we would call
SvxTableController::SetAttributes(), which sets the item set on the
selected cells instead. So use SetAttrToMarked() instead, which works on
the shape's item set, even in the table case. Don't replace all existing
items because we only have shadow properties here and also a disabled
shadow is still a (set) SdrOnOffItem (with value=false), so no old
SdrOnOffItem will be forgotten in the shape's item set.

Also add an outer undo grouping, so once the user presses OK in the
table properties dialog, we only create a single user-visible undo
action, not two.

(cherry picked from commit fdeb04f7c59cf8032fe17072ed779e70505cc6ab)

Change-Id: I77b55ba1f07b8d0eeac5070e0ec07d39573d1f9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107864
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index f34499a05991..3d94dcfb08b7 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -85,6 +85,7 @@ public:
 
 SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool 
bOnlyHardAttr) const;
 SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet& rAttr, bool 
bReplaceAll);
+void SetAttrToSelectedShape(const SfxItemSet& rAttr);
 /** Fill the values that are common for all selected cells.
   *
   * This lets the Borders dialog to display the line arrangement
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 599f842d480e..20339da7c58e 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -57,6 +57,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
 JunitTest_svx_unoapi \
 ))
 
+$(eval $(call gb_Module_add_uicheck_targets,svx,\
+UITest_svx_table \
+))
+
 #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and 
MacOSX
 #todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
 #todo: component file
diff --git a/svx/UITest_svx_table.mk b/svx/UITest_svx_table.mk
new file mode 100644
index ..df24798f59c4
--- /dev/null
+++ b/svx/UITest_svx_table.mk
@@ -0,0 +1,16 @@
+# -*- 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_UITest_UITest,svx_table))
+
+$(eval $(call gb_UITest_add_modules,svx_table,$(SRCDIR)/svx/qa/uitest,\
+   table/ \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/qa/uitest/table/tablecontroller.py 
b/svx/qa/uitest/table/tablecontroller.py
new file mode 100644
index ..27ed4a1d7ccb
--- /dev/null
+++ b/svx/qa/uitest/table/tablecontroller.py
@@ -0,0 +1,45 @@
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+
+
+# Test for SvxTableController.
+class SvxTableControllerTest(UITestCase):
+
+def testOnFormatTable(self):
+# Create an Impress document with a single table in it.
+self.ui_test.create_doc_in_start_center("impress")
+template = self.xUITest.getTopFocusWindow()
+self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+self.xUITest.executeCommand(".uno:SelectAll")
+self.xUITest.executeCommand(".uno:Delete")
+
self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2")
+
+# Enable shadow.
+self.ui_test.execute_dialog_through_command(".uno:TableDialog")
+tableDialog = self.xUITest.getTopFocusWindow()
+tabs = tableDialog.getChild("tabcontrol")
+# Select "shadow".
+select_pos(tabs, "4")
+shadowCheckbox = tableDialog.getChild("TSB_SHOW_SHADOW")
+shadowCheckbox.executeAction("CLICK", tuple())
+self.ui_test.close_dialog_throug

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - external/pdfium

[Michael Stahl (via logerrit)]

 external/pdfium/UnpackedTarball_pdfium.mk   |3 
 external/pdfium/msvc2015.patch.1|  202 +
 external/pdfium/pdfium4137-numerics.patch.3 | 3364 
 3 files changed, 3569 insertions(+)

New commits:
commit b0558aee1b69217f06ff7205f2b09cfb54f2a428
Author: Michael Stahl 
AuthorDate: Thu Dec 3 17:42:18 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:56:58 2020 +0100

pdfium: MSVC 2015 build

(cherry picked from commit 7ac3af8c89af7d481c027df75026f390258e6e5a)

Change-Id: I5ea89841fafe3ea96fa256e91151eceb8235731e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107871
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index f4643376cee0..8b12e494f94b 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -14,6 +14,9 @@ pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
 pdfium_patches += windows7.patch.1
 pdfium_patches += c++20-comparison.patch
+ifeq (MSC,$(COM))
+pdfium_patches += pdfium4137-numerics.patch.3 msvc2015.patch.1
+endif
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
 
diff --git a/external/pdfium/msvc2015.patch.1 b/external/pdfium/msvc2015.patch.1
new file mode 100644
index ..36cb5332c7b0
--- /dev/null
+++ b/external/pdfium/msvc2015.patch.1
@@ -0,0 +1,202 @@
+Fix MSVC 2015 build
+
+--- pdfium/third_party/base/optional.h.orig2020-10-26 19:26:04.0 
+0100
 pdfium/third_party/base/optional.h 2020-12-03 16:00:54.879883100 +0100
+@@ -36,7 +36,7 @@
+ struct OptionalStorageBase {
+   // Provide non-defaulted default ctor to make sure it's not deleted by
+   // non-trivial T::T() in the union.
+-  constexpr OptionalStorageBase() : dummy_() {}
++  OptionalStorageBase() : dummy_() {}
+ 
+   template 
+   constexpr explicit OptionalStorageBase(in_place_t, Args&&... args)
+@@ -88,7 +88,7 @@
+ struct OptionalStorageBase {
+   // Provide non-defaulted default ctor to make sure it's not deleted by
+   // non-trivial T::T() in the union.
+-  constexpr OptionalStorageBase() : dummy_() {}
++  OptionalStorageBase() : dummy_() {}
+ 
+   template 
+   constexpr explicit OptionalStorageBase(in_place_t, Args&&... args)
+@@ -607,32 +607,32 @@
+ return *this;
+   }
+ 
+-  constexpr const T* operator->() const {
++  const T* operator->() const {
+ CHECK(storage_.is_populated_);
+ return &storage_.value_;
+   }
+ 
+-  constexpr T* operator->() {
++  T* operator->() {
+ CHECK(storage_.is_populated_);
+ return &storage_.value_;
+   }
+ 
+-  constexpr const T& operator*() const & {
++  const T& operator*() const & {
+ CHECK(storage_.is_populated_);
+ return storage_.value_;
+   }
+ 
+-  constexpr T& operator*() & {
++  T& operator*() & {
+ CHECK(storage_.is_populated_);
+ return storage_.value_;
+   }
+ 
+-  constexpr const T&& operator*() const && {
++  const T&& operator*() const && {
+ CHECK(storage_.is_populated_);
+ return std::move(storage_.value_);
+   }
+ 
+-  constexpr T&& operator*() && {
++  T&& operator*() && {
+ CHECK(storage_.is_populated_);
+ return std::move(storage_.value_);
+   }
+@@ -641,22 +641,22 @@
+ 
+   constexpr bool has_value() const { return storage_.is_populated_; }
+ 
+-  constexpr T& value() & {
++  T& value() & {
+ CHECK(storage_.is_populated_);
+ return storage_.value_;
+   }
+ 
+-  constexpr const T& value() const & {
++  const T& value() const & {
+ CHECK(storage_.is_populated_);
+ return storage_.value_;
+   }
+ 
+-  constexpr T&& value() && {
++  T&& value() && {
+ CHECK(storage_.is_populated_);
+ return std::move(storage_.value_);
+   }
+ 
+-  constexpr const T&& value() const && {
++  const T&& value() const && {
+ CHECK(storage_.is_populated_);
+ return std::move(storage_.value_);
+   }
+--- pdfium/third_party/base/span.h.orig2020-10-26 19:26:04.0 
+0100
 pdfium/third_party/base/span.h 2020-12-03 16:28:15.642138100 +0100
+@@ -193,7 +193,7 @@
+ 
+   // TODO(dcheng): Implement construction from a |begin| and |end| pointer.
+   template 
+-  constexpr span(T (&array)[N]) noexcept : span(array, N) {}
++  span(T (&array)[N]) noexcept : span(array, N) {}
+   // TODO(dcheng): Implement construction from std::array.
+   // Conversion from a container that provides |T* data()| and |integral_type
+   // size()|.
+--- pdfium/core/fpdfapi/page/cpdf_colorspace.cpp.orig  2020-12-03 
16:54:15.514659400 +0100
 pdfium/core/fpdfapi/page/cpdf_colorspace.cpp   2020-12-03 
16:38:52.167650200 +0100
+@@ -905,7 +905,7 @@
+ float R;
+ float G;
+ float B;
+-GetRGB(lab, &R, &G, &B);
++GetRGB(pdfium::span(lab), &R, &G, &B);
+ pDestBuf[0] = static_cast(B * 255);
+ pDestBuf[1] = static_cast(G * 255);
+ pDestBuf[2] = static_cast(R * 255);
+--- pdfium/core/fpdf

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - download.lst external/pdfium

[Miklos Vajna (via logerrit)]

 download.lst  |4 +--
 external/pdfium/Library_pdfium.mk |   40 +-
 external/pdfium/UnpackedTarball_pdfium.mk |4 ++-
 external/pdfium/build.patch.1 |   13 +
 external/pdfium/configs/build_config.h|6 ++--
 5 files changed, 50 insertions(+), 17 deletions(-)

New commits:
commit 5b26cd7a20544413d2a9fc257694fadcfcb55f82
Author: Miklos Vajna 
AuthorDate: Tue Jul 21 21:25:26 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:56:40 2020 +0100

external: update pdfium to handle redact annotations

external: update pdfium to 4203

(cherry picked from commit 4488be8a9279be0bd0aebd476589a49d2b95da6e)

Update one mention of pdfium-4137.tar.bz2

...left behind by 4488be8a9279be0bd0aebd476589a49d2b95da6e "external: update
pdfium to 4203"

(cherry picked from commit ba4b3d5f7a0fe8d0d985e98897e041d59093d8b0)

external: update pdfium to 4260

(cherry picked from commit f19381e46930bb496e7331754843920933fb4be2)

external: update pdfium to 4306

(cherry picked from commit fe531957e3dcd42927cf15ab31d04473433d81f9)

Conflicts:
external/pdfium/inc/pch/precompiled_pdfium.hxx
include/vcl/pdf/PDFAnnotationSubType.hxx
solenv/flatpak-manifest.in

Change-Id: Ic10cf99fa412f8f0b3475e82d0a1839a7f04bd08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107870
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 91ef3d83aa4d..e941ce20d843 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,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 := 
9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6
-export PDFIUM_TARBALL := pdfium-4137.tar.bz2
+export PDFIUM_SHA256SUM := 
eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8
+export PDFIUM_TARBALL := pdfium-4306.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index 1016d2fc832b..d9caafa8c955 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -81,6 +81,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_pauseadapter \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_renderpage \
+UnpackedTarball/pdfium/fpdfsdk/fpdf_signature \
 ))
 
 # fdrm
@@ -102,6 +103,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textfield \
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_button \
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textobject \
+UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_privatedata \
 ))
 
 # fpdfapi
@@ -249,6 +251,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3cache \
 UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3glyphmap \
 UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendershading \
+UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendertiling \
 UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_creator \
 UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_encryptor \
 UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_flateencoder \
@@ -351,20 +354,19 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SymbolDict \
 UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_TrdProc \
 UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \
-UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gifcontext \
 UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \
 UnpackedTarball/pdfium/core/fxcodec/cfx_codec_memory \
 UnpackedTarball/pdfium/core/fxcodec/fax/faxmodule \
 UnpackedTarball/pdfium/core/fxcodec/scanlinedecoder \
-UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2module \
 UnpackedTarball/pdfium/core/fxcodec/jpeg/jpegmodule \
 UnpackedTarball/pdfium/core/fxcodec/jpx/cjpx_decoder \
 UnpackedTarball/pdfium/core/fxcodec/jpx/jpx_decode_utils \
 UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext \
 UnpackedTarball/pdfium/core/fxcodec/basic/basicmodule \
-UnpackedTarbal

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - download.lst external/pdfium RepositoryExternal.mk svx/source vcl/qa

[Miklos Vajna (via logerrit)]

 RepositoryExternal.mk  |1 
 download.lst   |4 
 external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 |   58 --
 external/pdfium/Library_pdfium.mk  |  116 +++--
 external/pdfium/UnpackedTarball_pdfium.mk  |   15 +
 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 
 12 files changed, 161 insertions(+), 283 deletions(-)

New commits:
commit 0b93ea09ec9e3716ca54f15b63bd43d6ca381ee3
Author: Miklos Vajna 
AuthorDate: Mon Nov 19 09:03:40 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:56:16 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
svx/source/svdraw/svdpdf.cxx
vcl/qa/cppunit/pdfexport/pdfexport.cxx
vcl/source/pdf/PDFiumLibrary.cxx

Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107869
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9c5fa4999362..25e75482c404 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4090,6 +4090,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 ac943bfadb04..91ef3d83aa4d 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,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 := 
9a2f9bddca935a263f06c81003483473a525ccd0f

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - download.lst external/pdfium svx/source

[Miklos Vajna (via logerrit)]

 download.lst   |   
 4 
 external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2  |   
82 -
 external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 |   
 4 
 external/pdfium/0004-svx-support-PDF-text-color.patch.2|  
119 
 external/pdfium/0009-svx-support-color-text-for-imported-PDFs.patch.2  |  
100 --
 external/pdfium/0010-svx-support-importing-forms-from-PDFs.patch.2 |   
94 --
 external/pdfium/0011-svx-correctly-possition-form-objects-from-PDF.patch.2 |   
75 -
 external/pdfium/0012-svx-import-processed-PDF-text.patch.2 |  
148 --
 external/pdfium/0014-svx-update-PDFium-patch-and-code.patch.2  |   
83 -
 external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2|   
77 -
 external/pdfium/Library_pdfium.mk  |   
37 +-
 external/pdfium/UnpackedTarball_pdfium.mk  |   
11 
 external/pdfium/build.patch.1  |   
 6 
 svx/source/svdraw/svdpdf.cxx   |   
48 ++-
 14 files changed, 67 insertions(+), 821 deletions(-)

New commits:
commit 8024c3c7cf3c681ec23348db7dc8fee1759d9128
Author: Miklos Vajna 
AuthorDate: Tue Sep 18 21:07:10 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 13:55:51 2020 +0100

pdfium: update to 3550

Allows dropping all the backports, so only one custom API patch remains.

(cherry picked from commit 56ac8214ab35387f8861044b62c79fae6d7ccac5)

[ This brings pdfium to the same version as cp-6.2, ignoring recent
changes. ]

Conflicts:
external/pdfium/UnpackedTarball_pdfium.mk

Change-Id: I13dc4f62be86d0859862cbd95bb14e07bbcf53d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107866
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 37c69be838d2..ac943bfadb04 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,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 := 
4acbc905fee1743e96169ca155347a81fb2b0f381281109c1860aa4408ec6c4f
-export PDFIUM_TARBALL := pdfium-3471.tar.bz2
+export PDFIUM_SHA256SUM := 
572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679
+export PDFIUM_TARBALL := pdfium-3550.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
diff --git a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2 
b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
deleted file mode 100644
index ef6649b5f4cb..
--- a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
+++ /dev/null
@@ -1,82 +0,0 @@
-From 5f83d0a3fac4f8ccef457c03b74433ffd7b12e2a Mon Sep 17 00:00:00 2001
-From: Ashod Nakashian 
-Date: Tue, 5 Jun 2018 11:28:30 +0200
-Subject: [PATCH 02/14] svx: more accurate PDF text importing
-

- pdfium/fpdfsdk/fpdf_editpage.cpp | 84 
- pdfium/public/fpdf_edit.h| 36 +
- 2 files changed, 120 insertions(+)
-
-diff --git a/pdfium/fpdfsdk/fpdf_editpage.cpp 
b/pdfium/fpdfsdk/fpdf_editpage.cpp
-index 912df63..3244943 100644
 a/pdfium/fpdfsdk/fpdf_editpage.cpp
-+++ b/pdfium/fpdfsdk/fpdf_editpage.cpp
-@@ -13,6 +13,7 @@
- 
- #include "constants/page_object.h"
- #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
-+#include "core/fpdfapi/font/cpdf_font.h"
- #include "core/fpdfapi/page/cpdf_form.h"
- #include "core/fpdfapi/page/cpdf_formobject.h"
- #include "core/fpdfapi/page/cpdf_imageobject.h"
-@@ -440,6 +441,26 @@ FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object,
-   pPageObj->Transform(matrix);
- }
- 
-+FPDF_EXPORT int FPDF_CALLCONV
-+FPDFTextObj_CountChars(FPDF_PAGEOBJECT text_object)
-+{
-+  if (!text_object)
-+return 0;
-+
-+  CPDF_TextObject* pTxtObj = static_cast(text_object);
-+  return pTxtObj->CountChars();
-+}
-+
-+FPDF_EXPORT int FPDF_CALLCONV
-+FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text_object)
-+{
-+  if (!text_object)
-+return 0;
-+
-+  CPDF_TextObject* pTxtObj = static_cast(text_object);
-+  return pTxtObj->GetFontSize();
-+}
-+
- FPDF_EXPORT void FPDF_CALLCONV
- FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object,
-  FPDF_BYTESTRING blend_mode) {
-diff --git a/pdfium/public/fpdf_edit.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 5fbd913cf62aa215c66f1f2de47723dc82c83571
Author: Caolán McNamara 
AuthorDate: Tue Dec 15 16:35:24 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:54:56 2020 +0100

tdf#138661 don't emit value-changed when not changed by user

in the FormattedSpinButton which is the standard mode for these signals
and what the SpinButton does, and in this case the FormattedSpinButton
is considered "modified" when it shouldn't be

Change-Id: I26865e099c02fdd2745c41b347b7006d8560fb20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107711
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 0290359bebce..b8629d49cbd6 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12235,6 +12235,18 @@ public:
 enable_notify_events();
 }
 
+virtual void disable_notify_events() override
+{
+g_signal_handler_block(m_pButton, m_nValueChangedSignalId);
+GtkInstanceEntry::disable_notify_events();
+}
+
+virtual void enable_notify_events() override
+{
+GtkInstanceEntry::enable_notify_events();
+g_signal_handler_unblock(m_pButton, m_nValueChangedSignalId);
+}
+
 virtual ~GtkInstanceFormattedSpinButton() override
 {
 g_signal_handler_disconnect(m_pButton, m_nInputSignalId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e691086daca63f8ab3b71bff23d800cfb17c12a
Author: Alain Romedenne 
AuthorDate: Thu Dec 17 13:53:39 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 17 13:53:39 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 165f2eb082e5132ae2734c3c014bf7f35ee0ef8f
  - ScriptForge library modules - WiP

- sf_array page restored after being overwritten
- self-links in both pages on H1 tag

Change-Id: I9c3d47447124d5c7199a03c9a7d76e0e337244ef
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107695
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index d8e499a2dafa..165f2eb082e5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d8e499a2dafadafc7cf90869f1046e1df8c2d3f4
+Subproject commit 165f2eb082e5132ae2734c3c014bf7f35ee0ef8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/auxiliary source/text

[Alain Romedenne (via logerrit)]

 source/auxiliary/sbasic.tree   |1 
 source/text/sbasic/shared/03/sf_array.xhp  | 1239 +
 source/text/sbasic/shared/03/sf_dictionary.xhp |   60 -
 3 files changed, 876 insertions(+), 424 deletions(-)

New commits:
commit 165f2eb082e5132ae2734c3c014bf7f35ee0ef8f
Author: Alain Romedenne 
AuthorDate: Mon Dec 14 16:00:33 2020 +0100
Commit: Olivier Hallot 
CommitDate: Thu Dec 17 13:53:39 2020 +0100

ScriptForge library modules - WiP

- sf_array page restored after being overwritten
- self-links in both pages on H1 tag

Change-Id: I9c3d47447124d5c7199a03c9a7d76e0e337244ef
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107695
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 6e3c33ff4..c10b8e771 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -330,6 +330,7 @@
 ImportWizard Library
 Schedule Library
 ScriptBindingLibrary 
Library
+ScriptForge 
Library
 Template Library
 WikiEditor Library
 
diff --git a/source/text/sbasic/shared/03/sf_array.xhp 
b/source/text/sbasic/shared/03/sf_array.xhp
index d37af6f49..1824c0d20 100644
--- a/source/text/sbasic/shared/03/sf_array.xhp
+++ b/source/text/sbasic/shared/03/sf_array.xhp
@@ -8,403 +8,866 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-
 
-  
-ScriptForge.Dictionary service
-/text/sbasic/shared/03/sf_dictionary.xhp
+  
+ScriptForge.Array service 
(SF_Array)
+/text/sbasic/shared/03/sf_array.xhp
   
-
+  
 
-
-
-  Dictionary service
-  API;DateTime
-  API;PropertyValue
-   
-
-  ScriptForge.Dictionary 
service
 
-  A 
dictionary is a collection of key-item pairs
-  
-The key is a case-insensitive string
-Items may be of any type
-  
+
+ScriptForge.Array 
service
+   A 
collection of methods manipulating and transforming arrays of one dimension 
(vectors) and arrays of two dimensions (matrices). This includes setting, 
sorting, importing and exporting to csv files and Calc sheets.
+  Arrays with more than two dimensions are rejected, with the 
exception of CountDims method that accepts more than two 
dimensions.
 
 
-  Keys 
and items can be retrieved, counted, updated, and much more.
-  %PRODUCTNAME Basic Collection object does 
not support the retrieval of the keys.
-  Additionally its items contain only primitive Basic data types such as 
dates, text, numbers, and the like.
-
-  Service invocation
-
-  
-GlobalScope.BasicLibraries.loadLibrary("ScriptForge")
-Dim 
myDict As Variant
-
myDict = CreateScriptService("Dictionary")
-  
-
-  It is 
recommended to free resources after use:
-  
- Set 
myDict = myDict.Dispose()
-  
-
-  
-
-  Properties
-  
-
-
-
-Name
-
-
-Readonly
-
-
-Argument
-
-
-Type
-
-
-Description
-
-
-
-
-Count
-
-
-Yes
-
-
-
-
-
-Long
-
-
-The actual number of entries in the dictionary
-
-
-
-
-Item
-
-
-Yes
-
-
-Key As String
-
-
-Variant
-
-
-The value of the item related to KeyEmpty if not found
-
-
-
-
-Items
-
-
-Yes
-
-
-
-
-
-Array of Variants
-
-
-The list of items as a one dimension array
-
-
-
-
-Keys
-
-
-Yes
-
-
-
-
-
-Array of Strings
-
-
-The list of keys as a one dimension array
-
-
-
-  
-
-The Keys 
and Items properties return their respective contents, using an identical 
ordering.
-The order is unrelated to the creation sequence.
-
-
-
-Dim 
a As Variant, b As String
-
a = myDict.Keys
-
For Each b In a
- 
   ' ...
-
Next b
-
-
-
-
-   
-   Methods
-   
-
-
-   
-   Add
-   ConvertToArray
-   ConvertToJson
-   ConvertToPropertyValues
-   
-   
-   Exists
-   ImportFromJson
-   ImportFromPropertyValues
-   Item
-   
-   
-   Remove
-   RemoveAll
-   ReplaceItem
-   ReplaceKey
-   
-
-
+   Array items may contain any type of value, including 
(sub)arrays.
 
-  
-   Add 

[Libreoffice-commits] core.git: xmloff/source

[Noel (via logerrit)]

 xmloff/source/text/txtparai.cxx |   70 
 1 file changed, 35 insertions(+), 35 deletions(-)

New commits:
commit 246505c4da2a60b9fb137cbe442b7409c76267ab
Author: Noel 
AuthorDate: Tue Dec 15 15:39:13 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 13:51:41 2020 +0100

use views to parse

Change-Id: I5fe1b6523a3d0b0d42c3ab5b7d0db3e30082efcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107762
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index c3ef3d9b3e7f..fb480dd136e0 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -938,8 +938,8 @@ protected:
  * This method tolerates an empty PropertySet; subclasses however
  * are not expected to.
  */
-virtual void ProcessAttribute(sal_Int32 nElement, sal_Int32 
nAttributeToken,
-  const OUString& sValue,
+virtual void ProcessAttribute(sal_Int32 nElement,
+  const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter,
   Reference& rPropSet);
 
 static void GetServiceName(OUString& sServiceName,
@@ -1043,14 +1043,13 @@ void XMLIndexMarkImportContext_Impl::ProcessAttributes(
 // process attributes
 for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
 {
-ProcessAttribute(nElement, aIter.getToken(), aIter.toString(), 
rPropSet);
+ProcessAttribute(nElement, aIter, rPropSet);
 }
 }
 
 void XMLIndexMarkImportContext_Impl::ProcessAttribute(
 sal_Int32 nElement,
-sal_Int32 nAttributeToken,
-const OUString& sValue,
+const sax_fastparser::FastAttributeList::FastAttributeIter & aIter,
 Reference& rPropSet)
 {
 // we only know ID + string-value attribute;
@@ -1061,9 +1060,9 @@ void XMLIndexMarkImportContext_Impl::ProcessAttribute(
 case XML_ELEMENT(TEXT, XML_TOC_MARK):
 case XML_ELEMENT(TEXT, XML_USER_INDEX_MARK):
 case XML_ELEMENT(TEXT, XML_ALPHABETICAL_INDEX_MARK):
-if ( nAttributeToken == XML_ELEMENT(TEXT, XML_STRING_VALUE) )
+if ( aIter.getToken() == XML_ELEMENT(TEXT, XML_STRING_VALUE) )
 {
-rPropSet->setPropertyValue("AlternativeText", 
uno::makeAny(sValue));
+rPropSet->setPropertyValue("AlternativeText", 
uno::makeAny(aIter.toString()));
 }
 // else: ignore!
 break;
@@ -1074,15 +1073,15 @@ void XMLIndexMarkImportContext_Impl::ProcessAttribute(
 case XML_ELEMENT(TEXT, XML_TOC_MARK_END):
 case XML_ELEMENT(TEXT, XML_USER_INDEX_MARK_END):
 case XML_ELEMENT(TEXT, XML_ALPHABETICAL_INDEX_MARK_END):
-if ( nAttributeToken == XML_ELEMENT(TEXT, XML_ID) )
+if ( aIter.getToken() == XML_ELEMENT(TEXT, XML_ID) )
 {
-sID = sValue;
+sID = aIter.toString();
 }
 // else: ignore
 break;
 
 default:
-XMLOFF_WARN_UNKNOWN_ATTR("xmloff", nAttributeToken, sValue);
+XMLOFF_WARN_UNKNOWN("xmloff", aIter);
 break;
 }
 }
@@ -1158,8 +1157,8 @@ public:
 protected:
 
 /** process outline level */
-virtual void ProcessAttribute(sal_Int32 nElement, sal_Int32 
nAttributeToken,
-  const OUString& sValue,
+virtual void ProcessAttribute(sal_Int32 nElement,
+  const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter,
   Reference& rPropSet) 
override;
 };
 
@@ -1173,19 +1172,18 @@ 
XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
 
 void XMLTOCMarkImportContext_Impl::ProcessAttribute(
 sal_Int32 nElement,
-sal_Int32 nAttributeToken,
-const OUString& sValue,
+const sax_fastparser::FastAttributeList::FastAttributeIter & aIter,
 Reference& rPropSet)
 {
 SAL_WARN_IF(!rPropSet.is(), "xmloff.text", "need PropertySet");
 
-switch (nAttributeToken)
+switch (aIter.getToken())
 {
 case XML_ELEMENT(TEXT, XML_OUTLINE_LEVEL):
 {
 // ouline level: set Level property
 sal_Int32 nTmp;
-if (::sax::Converter::convertNumber( nTmp, sValue )
+if (::sax::Converter::convertNumber( nTmp, aIter.toView() )
 && nTmp >= 1
 && nTmp < GetImport().GetTextImport()->
 GetChapterNumbering()->getCount() )
@@ -1198,7 +1196,7 @@ void XMLTOCMarkImportContext_Impl::ProcessAttribute(
 default:
 // else: delegate to superclass
 XMLIndexMarkImportContext_Impl::ProcessAttribute(
-nElement, nAttributeToken, sValue, rPropSet);
+nElement, aIter, rPropSet);
 }
 }
 
@@ -1215,8 +1213,8 @@ public:
 protected:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/func/futransf.cxx |3 +--
 sd/source/ui/view/drviews2.cxx |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 594a27f191347fadf25ddf795b4f68263ef8abb2
Author: Caolán McNamara 
AuthorDate: Wed Dec 16 12:42:05 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:51:49 2020 +0100

tdf#138963 Clicking the position statusbar box disables selection

if there is no object selected, since...

commit d3dbbdce4eb71ae848e7682374e011c4a6129b15
Date:   Wed Jan 17 15:20:31 2018 +0100

lokdialog: Convert the Format -> ... -> Position and Size... to async 
exec.

Change-Id: Idcdbfb1366db61e247c31eab5cb27a39978b0fd9

Change-Id: I959789b055a880ac4c48a863c17eb6769b322577
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107800
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 4984c675ec4c..fa7398e48b43 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -106,8 +106,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
 bWelded = true;
 }
 
-if (!pDlg)
-return;
+assert(pDlg && "there must be a dialog at this point");
 
 auto pRequest = std::make_shared(rReq);
 rReq.Ignore(); // the 'old' request is not relevant any more
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 58cd5e5297b2..ae0f01121d63 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1461,7 +1461,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 case SID_ATTR_TRANSFORM:
 {
 SetCurrentFunction( FuTransform::Create( this, GetActiveWindow(), 
mpDrawView.get(), GetDoc(), rReq ) );
-if (rReq.GetArgs())
+// tdf#138963 conditions tested for here must be the same as those
+// of the early returns from FuTransform::DoExecute
+if (rReq.GetArgs() || !mpDrawView->AreObjectsMarked())
 {
 Invalidate(SID_RULER_OBJECT);
 Cancel();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 871940eba642bec3cc263b48048ee4ffbf8a6c0f
Author: Caolán McNamara 
AuthorDate: Tue Dec 15 14:51:47 2020 +
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:49:50 2020 +0100

tdf#138935 rsDeckId is invalid by the time collectUIInformation is called

Change-Id: I4afc1ed1bbbfbbd510617a51b9aa6d627471d80d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107706
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 68066f4f4918..b890f9950f56 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -608,6 +608,8 @@ void SidebarController::OpenThenToggleDeck (
 }
 }
 RequestOpenDeck();
+// before SwitchToDeck which may cause the rsDeckId string to be released
+collectUIInformation(rsDeckId);
 SwitchToDeck(rsDeckId);
 
 // Make sure the sidebar is wide enough to fit the requested content
@@ -618,8 +620,6 @@ void SidebarController::OpenThenToggleDeck (
 if (mnSavedSidebarWidth < nRequestedWidth)
 SetChildWindowWidth(nRequestedWidth);
 }
-
-collectUIInformation(rsDeckId);
 }
 
 void SidebarController::OpenThenSwitchToDeck (
___
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' - sw/source

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d6fe7099092ed74b3a2580e0d95ed9229e262212
Author: Justin Luth 
AuthorDate: Sat Aug 8 16:05:07 2020 +0300
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:41:32 2020 +0100

tdf#135329 revert sw MS export: prevent skipping at-char anchors

...because Step 2 solved the problem, and I don't want to mask
any future issues that miss an anchor position.

This reverts LO 7.1 commit d4045509e58180768368db7a77479fc027ff7c42
tdf#135329 sw MS export: prevent skipping at-char anchors
This patch is step 1 - write out bypassed flies.
Step 2 - don't bypass fly positions.

Change-Id: I5246ea531897de493eb050625cebcdcc2488605b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100390
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
(cherry picked from commit 9a8126262a8afba46efbfac5160b5f8cf13c9bd6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107386
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 407c5182e997..fc75ac5ff02a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -708,7 +708,8 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
 const SwPosition &rAnchor = maFlyIter->GetPosition();
 const sal_Int32 nPos = rAnchor.nContent.GetIndex();
 
-if ( nPos > nSwPos )
+assert(nPos >= nSwPos && "a fly must get flagged as a 
nextAttr/CurrentPos");
+if ( nPos != nSwPos )
 return FLY_NOT_PROCESSED ; // We haven't processed the fly
 
 const SdrObject* pSdrObj = 
maFlyIter->GetFrameFormat().FindRealSdrObject();
___
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' - chart2/qa oox/source

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx   |   37 +++-
 chart2/qa/extras/data/docx/testcustomshapepos.docx  |binary
 oox/source/drawingml/chart/chartdrawingfragment.cxx |9 
 3 files changed, 37 insertions(+), 9 deletions(-)

New commits:
commit 277b22981baae33ab7969538f00a5bb85e1be474
Author: Balazs Varga 
AuthorDate: Sun Dec 13 14:08:38 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:37:18 2020 +0100

tdf#138889 OOXML chart: fix import of rotated shapes

in charts, resulted e.g. distorted arrows.

Change-Id: I2d25aeeef8aed9fccacf3cc9f735123e8d891de5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107670
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit fbe77e5d61ca63a688c12be721e760935d78e780)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107801
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 19c2ebdda7a9..fa3fe8fef6e2 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -2610,6 +2612,12 @@ void Chart2ImportTest::testTdf134225()
 
 void Chart2ImportTest::testTdf136105()
 {
+// FIXME: the DPI check should be removed when either (1) the test is 
fixed to work with
+// non-default DPI; or (2) unit tests on Windows are made to use svp VCL 
plugin.
+if (Application::GetDefaultDevice()->GetDPIX() != 96
+|| Application::GetDefaultDevice()->GetDPIY() != 96)
+return;
+
 load("/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx");
 // 1st chart with fix inner position and size
 {
@@ -2770,15 +2778,26 @@ void Chart2ImportTest::testTdfCustomShapePos()
 Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), 
UNO_QUERY_THROW);
 Reference xDrawPageSupplier(xChartDoc, 
UNO_QUERY_THROW);
 Reference xDrawPage(xDrawPageSupplier->getDrawPage(), 
UNO_SET_THROW);
-Reference xCustomShape(xDrawPage->getByIndex(0), 
UNO_QUERY_THROW);
-
-// test position and size of a custom shape within a chart
-awt::Point aPosition = xCustomShape->getPosition();
-CPPUNIT_ASSERT_DOUBLES_EQUAL(8845, aPosition.X, 300);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(855, aPosition.Y, 300);
-awt::Size aSize = xCustomShape->getSize();
-CPPUNIT_ASSERT_DOUBLES_EQUAL(4831, aSize.Width, 300);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(1550, aSize.Height, 300);
+// test position and size of a custom shape within a chart, rotated by 0 
degree.
+{
+Reference xCustomShape(xDrawPage->getByIndex(0), 
UNO_QUERY_THROW);
+awt::Point aPosition = xCustomShape->getPosition();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(8845, aPosition.X, 300);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(855, aPosition.Y, 300);
+awt::Size aSize = xCustomShape->getSize();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(4831, aSize.Width, 300);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1550, aSize.Height, 300);
+}
+// test position and size of a custom shape within a chart, rotated by 90 
degree.
+{
+Reference xCustomShape(xDrawPage->getByIndex(1), 
UNO_QUERY_THROW);
+awt::Point aPosition = xCustomShape->getPosition();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1658, aPosition.X, 300);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(6119, aPosition.Y, 300);
+awt::Size aSize = xCustomShape->getSize();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(4165, aSize.Width, 300);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1334, aSize.Height, 300);
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
diff --git a/chart2/qa/extras/data/docx/testcustomshapepos.docx 
b/chart2/qa/extras/data/docx/testcustomshapepos.docx
index 31c5284e11b9..640c48ea4627 100644
Binary files a/chart2/qa/extras/data/docx/testcustomshapepos.docx and 
b/chart2/qa/extras/data/docx/testcustomshapepos.docx differ
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx 
b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 85eeb2986bcc..c41e2db49821 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -209,6 +209,15 @@ void ChartDrawingFragment::onEndElement()
 EmuRectangle aShapeRectEmu = mxAnchor->calcAnchorRectEmu( 
maChartRectEmu );
 if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && 
(aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) )
 {
+const sal_Int32 aRotation = mxShape->getRotation();
+if( (aRotation >= 45 * PER_DEGREE && aRotation < 135 * PER_DEGREE) 
|| (aRotation >= 225 * PER_DEGREE && aRotation < 315 * PER_DEGREE) )
+{
+sal_Int64 nHalfWidth = aShapeRectEmu.Width / 2;
+sal_Int64 nHalfHeight = aShapeRectEmu.Height / 2;
+aShapeRectEmu.X = aShapeRectEmu.X + nHalfWid

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Julien Nabet (via logerrit)]

 sc/source/ui/namedlg/namedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a10c7ec17fe57c0367ce5a4cbefd89e8b63e069b
Author: Julien Nabet 
AuthorDate: Sat Dec 12 12:16:27 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:36:30 2020 +0100

tdf#138822: really undo when clicking Cancel in managing Named Ranges

Change-Id: Ib4d15e7e5287221ea51eb3e20dd1811c97999306
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107635
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 1790ed500f3033581ee4a3ef43428d7fda4692cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107807

diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 69181ec246b2..4262a824f902 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -462,6 +462,7 @@ IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl, weld::Button&, void)
 
 IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl, weld::Button&, void)
 {
+mbCloseWithoutUndo = true;
 response(RET_CANCEL);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/shared/vtablefactory.cxx |   81 
 1 file changed, 43 insertions(+), 38 deletions(-)

New commits:
commit 052efd869e12796815401fb29a975e49866e6ce7
Author: Stephan Bergmann 
AuthorDate: Thu Dec 17 10:48:51 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 17 13:20:46 2020 +0100

Make the pthread_jit_write_protect_np call pair exception-safe

...just in case

Change-Id: Id056ee4dfd64dd186f01d117cfede28f4b7f6c09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107867
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 90c414290c1a..9d4c5d31dd3f 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -134,6 +134,13 @@ extern "C" void freeExec(
 #endif
 }
 
+#if defined MACOSX && defined __aarch64__
+struct JitMemoryProtectionGuard {
+JitMemoryProtectionGuard() { pthread_jit_write_protect_np(0); }
+~JitMemoryProtectionGuard() { pthread_jit_write_protect_np(1); }
+};
+#endif
+
 }
 
 class VtableFactory::GuardedBlocks:
@@ -342,52 +349,50 @@ sal_Int32 VtableFactory::createVtables(
 typelib_InterfaceTypeDescription * type, sal_Int32 vtableNumber,
 typelib_InterfaceTypeDescription * mostDerived, bool includePrimary) const
 {
+{
 #if defined MACOSX && defined __aarch64__
-// TODO: Should we handle resetting this in a exception-throwing-safe way?
-pthread_jit_write_protect_np(0);
+JitMemoryProtectionGuard guard;
 #endif
-if (includePrimary) {
-sal_Int32 slotCount
-= bridges::cpp_uno::shared::getPrimaryFunctions(type);
-Block block;
-if (!createBlock(block, slotCount)) {
-throw std::bad_alloc();
-}
-try {
-Slot * slots = initializeBlock(
-block.start, slotCount, vtableNumber, mostDerived);
-unsigned char * codeBegin =
-reinterpret_cast< unsigned char * >(slots);
-unsigned char * code = codeBegin;
-sal_Int32 vtableOffset = blocks.size() * sizeof (Slot *);
-for (typelib_InterfaceTypeDescription const * type2 = type;
- type2 != nullptr; type2 = type2->pBaseTypeDescription)
-{
-code = addLocalFunctions(
-&slots, code,
+if (includePrimary) {
+sal_Int32 slotCount
+= bridges::cpp_uno::shared::getPrimaryFunctions(type);
+Block block;
+if (!createBlock(block, slotCount)) {
+throw std::bad_alloc();
+}
+try {
+Slot * slots = initializeBlock(
+block.start, slotCount, vtableNumber, mostDerived);
+unsigned char * codeBegin =
+reinterpret_cast< unsigned char * >(slots);
+unsigned char * code = codeBegin;
+sal_Int32 vtableOffset = blocks.size() * sizeof (Slot *);
+for (typelib_InterfaceTypeDescription const * type2 = type;
+ type2 != nullptr; type2 = type2->pBaseTypeDescription)
+{
+code = addLocalFunctions(
+&slots, code,
 #ifdef USE_DOUBLE_MMAP
-reinterpret_cast(block.exec) - 
reinterpret_cast(block.start),
+reinterpret_cast(block.exec) - 
reinterpret_cast(block.start),
 #endif
-type2,
-baseOffset.getFunctionOffset(type2->aBase.pTypeName),
-bridges::cpp_uno::shared::getLocalFunctions(type2),
-vtableOffset);
-}
-flushCode(codeBegin, code);
+type2,
+baseOffset.getFunctionOffset(type2->aBase.pTypeName),
+bridges::cpp_uno::shared::getLocalFunctions(type2),
+vtableOffset);
+}
+flushCode(codeBegin, code);
 #ifdef USE_DOUBLE_MMAP
-//Finished generating block, swap writable pointer with executable
-//pointer
-std::swap(block.start, block.exec);
+//Finished generating block, swap writable pointer with 
executable
+//pointer
+std::swap(block.start, block.exec);
 #endif
-blocks.push_back(block);
-} catch (...) {
-freeBlock(block);
-throw;
+blocks.push_back(block);
+} catch (...) {
+freeBlock(block);
+throw;
+}
 }
 }
-#if defined MACOSX && defined __aarch64__
-pthread_jit_write_protect_np(1);
-#endif
 for (sal_Int32 i = 0; i < type->nBaseTypes; ++i) {
 vtableNumber = createVtables(
 blocks, baseOffset, type->ppBaseTypes[i],
_

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/range_name/tdf138822.py |   63 +++
 1 file changed, 63 insertions(+)

New commits:
commit 456cc328c43f67994629204003247923d783db96
Author: Xisco Fauli 
AuthorDate: Thu Dec 17 10:52:50 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:13:52 2020 +0100

tdf#138822: sc: Add UItest

Change-Id: Ibb1ad62679480e51caf8b89ebb14c7fb4cb9f5ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107868
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/range_name/tdf138822.py 
b/sc/qa/uitest/range_name/tdf138822.py
new file mode 100644
index ..361cc379e828
--- /dev/null
+++ b/sc/qa/uitest/range_name/tdf138822.py
@@ -0,0 +1,63 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import type_text
+
+class tdf138822(UITestCase):
+
+def test_tdf138822(self):
+self.ui_test.create_doc_in_start_center("calc")
+
+calcDoc = self.xUITest.getTopFocusWindow()
+xPosWindow = calcDoc.getChild('pos_window')
+self.assertEqual('A1', get_state_as_dict(xPosWindow)['Text'])
+
+self.ui_test.execute_modeless_dialog_through_command(".uno:DefineName")
+
+xManageNamesDialog = self.xUITest.getTopFocusWindow()
+
+xAddBtn = xManageNamesDialog.getChild("add")
+self.ui_test.close_dialog_through_button(xAddBtn)
+
+xDefineNamesDialog = self.xUITest.getTopFocusWindow()
+
+xAddBtn = xDefineNamesDialog.getChild("add")
+self.assertEqual("false", get_state_as_dict(xAddBtn)['Enabled'])
+
+xEdit = xDefineNamesDialog.getChild("edit")
+type_text(xEdit, "rangeName")
+
+self.assertEqual("true", get_state_as_dict(xAddBtn)['Enabled'])
+
+self.ui_test.close_dialog_through_button(xAddBtn)
+
+xManageNamesDialog = self.xUITest.getTopFocusWindow()
+
+xNamesList = xManageNamesDialog.getChild('names')
+self.assertEqual(1, len(xNamesList.getChildren()))
+self.assertEqual(get_state_as_dict(xNamesList.getChild('0'))["Text"], 
"rangeName\t$Sheet1.$A$1\tDocument (Global)")
+
+xCancelBtn = xManageNamesDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+# Open the dialog again
+self.ui_test.execute_modeless_dialog_through_command(".uno:DefineName")
+
+xManageNamesDialog = self.xUITest.getTopFocusWindow()
+xNamesList = xManageNamesDialog.getChild('names')
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 0 != 1
+self.assertEqual(0, len(xNamesList.getChildren()))
+
+xOkBtn = xManageNamesDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
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' - chart2/source sw/qa

[Tünde Tóth (via logerrit)]

 chart2/source/view/main/VLegend.cxx|   17 ++---
 sw/qa/extras/layout/data/tdf136816.odt |binary
 sw/qa/extras/layout/layout2.cxx|   15 +++
 3 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 0e30d1fcdd81c65bcf26723ba04d9dbd2bb08f30
Author: Tünde Tóth 
AuthorDate: Tue Dec 15 14:17:15 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 13:01:10 2020 +0100

tdf#136816: fix hidden legend entries in "Column and Line" charts

Regression from commit: 300e65cc47f3d6ae1563350757dbfadc080d7452
(tdf#123268 fix lost chart if all legend entries are hidden)

Change-Id: Id59cd8d681dada123feadbe7910be7fbc7ec37f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107757
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 1eb25c11500a235aa141a327a5489f6861e60a89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107802
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index 2a2048c35016..5a2ad59f9cc5 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -1000,8 +1000,6 @@ void VLegend::createShapes(
 std::vector aNewEntries = 
pLegendEntryProvider->createLegendEntries(
 
aMaxSymbolExtent, eLegendPosition, xLegendProp,
 
xLegendContainer, m_xShapeFactory, m_xContext, mrModel);
-if (aNewEntries.size() == 0)
-return;
 aViewEntries.insert( aViewEntries.end(), 
aNewEntries.begin(), aNewEntries.end() );
 }
 }
@@ -1042,17 +1040,14 @@ void VLegend::createShapes(
 // create the buttons
 pButton->createShapes(xModelPage);
 }
-}
 
-Reference< drawing::XShape > xBorder =
-pShapeFactory->createRectangle( xLegendContainer,
-aLegendSize,
-awt::Point(0,0),
-aLineFillProperties.first,
-aLineFillProperties.second, 
ShapeFactory::StackPosition::Bottom );
+Reference xBorder = 
pShapeFactory->createRectangle(
+xLegendContainer, aLegendSize, awt::Point(0, 0), 
aLineFillProperties.first,
+aLineFillProperties.second, 
ShapeFactory::StackPosition::Bottom);
 
-//because of this name this border will be used for marking the 
legend
-ShapeFactory::setShapeName( xBorder, "MarkHandles" );
+//because of this name this border will be used for marking 
the legend
+ShapeFactory::setShapeName(xBorder, "MarkHandles");
+}
 }
 }
 catch( const uno::Exception & )
diff --git a/sw/qa/extras/layout/data/tdf136816.odt 
b/sw/qa/extras/layout/data/tdf136816.odt
new file mode 100644
index ..0b6599bea319
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf136816.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 90990ffd6cd3..14492f240e4e 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -456,6 +456,21 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf75659)
 // These failed, if the legend names are empty strings.
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf136816)
+{
+SwDoc* pDoc = createDoc("tdf136816.odt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Check number of legend entries
+assertXPath(pXmlDoc, "//text[contains(text(),\"Column\")]", 2);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf126425)
 {
 SwDoc* pDoc = createDoc("long_legendentry.docx");
___
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' - sc/source

[Julien Nabet (via logerrit)]

 sc/source/ui/namedlg/namedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ccff3cc5830ff5780123722f809bbe748cc7e5fd
Author: Julien Nabet 
AuthorDate: Sat Dec 12 12:16:27 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 12:39:45 2020 +0100

tdf#138822: really undo when clicking Cancel in managing Named Ranges

Change-Id: Ib4d15e7e5287221ea51eb3e20dd1811c97999306
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107635
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 1790ed500f3033581ee4a3ef43428d7fda4692cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107806

diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 314cb42fbbfa..799e94a2e0e7 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -460,6 +460,7 @@ IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl, weld::Button&, void)
 
 IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl, weld::Button&, void)
 {
+mbCloseWithoutUndo = true;
 response(RET_CANCEL);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa

[Caolán McNamara (via logerrit)]

 sd/qa/unit/SdrPdfImportTest.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6546dcda7ee6136d41d56f757fed87f2919c3290
Author: Caolán McNamara 
AuthorDate: Wed Dec 16 09:07:56 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 12:21:40 2020 +0100

fix --disable-pdfium build

Change-Id: I6b7b089ecbd39336f4ea71d541112fd70c95acbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx
index 657bb416c361..f5e24fd19ede 100644
--- a/sd/qa/unit/SdrPdfImportTest.cxx
+++ b/sd/qa/unit/SdrPdfImportTest.cxx
@@ -15,11 +15,13 @@
 #include 
 #include 
 
+#if HAVE_FEATURE_PDFIUM
 // Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including 
windows.h in a way that
 // it will define e.g. Yield as a macro:
 #include 
 #include 
 #include 
+#endif
 
 #include 
 #include 
___
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' - sc/qa sc/source

[Tibor Nagy (via logerrit)]

 sc/qa/unit/data/xlsx/tdf122102.xlsx|binary
 sc/qa/unit/subsequent_filters-test.cxx |   38 +
 sc/source/filter/oox/extlstcontext.cxx |   13 ++-
 3 files changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 4bca4f507c064c18880bd8283aaba567865d2462
Author: Tibor Nagy 
AuthorDate: Tue Dec 15 18:58:33 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 12:06:02 2020 +0100

tdf#122102 XLSX import: fix "contains" conditional formatting

when using "Given text" type and cell reference
with "contains text" or "not contains text" conditions.

Co-authored-by: Attila Szűcs (NISZ)

Change-Id: Ifbd34ef9f7ee948b6ac42a890bd52f3fb8486aec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107791
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 0101975f8eac650bb87c4af81157cb33a6309e0e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107810
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/data/xlsx/tdf122102.xlsx 
b/sc/qa/unit/data/xlsx/tdf122102.xlsx
new file mode 100644
index ..bc1db82d78a7
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf122102.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 0730a77971be..28db571e66de 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -106,6 +106,7 @@ public:
 virtual void tearDown() override;
 
 //ods, xls, xlsx filter tests
+void testExtCondFormatXLSX();
 void testUpdateCircleInMergedCellODS();
 void testDeleteCircleInMergedCellODS();
 void testBooleanFormatXLSX();
@@ -296,6 +297,7 @@ public:
 void testDeleteCirclesInRowAndCol();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
+CPPUNIT_TEST(testExtCondFormatXLSX);
 CPPUNIT_TEST(testUpdateCircleInMergedCellODS);
 CPPUNIT_TEST(testDeleteCircleInMergedCellODS);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -530,6 +532,42 @@ void testRangeNameImpl(const ScDocument& rDoc)
 
 }
 
+void ScFiltersTest::testExtCondFormatXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("tdf122102.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf122102.xlsx", xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// contains text and not contains text conditions
+ScConditionalFormat* pFormatA1 = rDoc.GetCondFormat(0, 0, 0);
+CPPUNIT_ASSERT(pFormatA1);
+ScConditionalFormat* pFormatA2 = rDoc.GetCondFormat(0, 1, 0);
+CPPUNIT_ASSERT(pFormatA2);
+ScConditionalFormat* pFormatA3 = rDoc.GetCondFormat(0, 2, 0);
+CPPUNIT_ASSERT(pFormatA3);
+ScConditionalFormat* pFormatA4 = rDoc.GetCondFormat(0, 3, 0);
+CPPUNIT_ASSERT(pFormatA4);
+
+ScRefCellValue aCellA1(rDoc, ScAddress(0, 0, 0));
+OUString aCellStyleA1 = pFormatA1->GetCellStyle(aCellA1, ScAddress(0, 0, 
0));
+CPPUNIT_ASSERT(!aCellStyleA1.isEmpty());
+
+ScRefCellValue aCellA2(rDoc, ScAddress(0, 1, 0));
+OUString aCellStyleA2 = pFormatA2->GetCellStyle(aCellA2, ScAddress(0, 1, 
0));
+CPPUNIT_ASSERT(!aCellStyleA2.isEmpty());
+
+ScRefCellValue aCellA3(rDoc, ScAddress(0, 2, 0));
+OUString aCellStyleA3 = pFormatA3->GetCellStyle(aCellA3, ScAddress(0, 2, 
0));
+CPPUNIT_ASSERT(!aCellStyleA3.isEmpty());
+
+ScRefCellValue aCellA4(rDoc, ScAddress(0, 3, 0));
+OUString aCellStyleA4 = pFormatA4->GetCellStyle(aCellA4, ScAddress(0, 3, 
0));
+CPPUNIT_ASSERT(!aCellStyleA4.isEmpty());
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testUpdateCircleInMergedCellODS()
 {
 ScDocShellRef xDocSh = loadDoc("updateCircleInMergedCell.", FORMAT_ODS);
diff --git a/sc/source/filter/oox/extlstcontext.cxx 
b/sc/source/filter/oox/extlstcontext.cxx
index fadb4365265b..b413e9e58029 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -135,6 +135,16 @@ ContextHandlerRef 
ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl
 eOperator =  CondFormatBuffer::convertToInternalOperator(aToken);
 return this;
 }
+else if(aType == "containsText")
+{
+eOperator = ScConditionMode::ContainsText;
+return this;
+}
+else if(aType == "notContainsText")
+{
+eOperator = ScConditionMode::NotContainsText;
+return this;
+}
 else
 {
 SAL_WARN("sc", "unhandled XLS14_TOKEN(cfRule) with type: " << 
aType);
@@ -181,7 +191,8 @@ void ExtConditionalFormattingContext::onEndElement()
 {
 case XM_TOKEN(f):
 {
-rFormulas.push_back(aChars);
+if(!aChars.startsWith("ISERROR(SEARCH(") && 
!aChars.startsWith("NOT(ISERROR(SEARCH("))
+   rFormulas.push_back(aChars);
 }
 break;
 case XLS14_TOKEN( cfRule ):
___
Libreof

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/func/futransf.cxx |3 +--
 sd/source/ui/view/drviews2.cxx |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fc3ba80047a12c8577fc695e58fc8cb576777d83
Author: Caolán McNamara 
AuthorDate: Wed Dec 16 12:42:05 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 12:01:08 2020 +0100

tdf#138963 Clicking the position statusbar box disables selection

if there is no object selected, since...

commit d3dbbdce4eb71ae848e7682374e011c4a6129b15
Date:   Wed Jan 17 15:20:31 2018 +0100

lokdialog: Convert the Format -> ... -> Position and Size... to async 
exec.

Change-Id: Idcdbfb1366db61e247c31eab5cb27a39978b0fd9

Change-Id: I959789b055a880ac4c48a863c17eb6769b322577
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107799
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 4984c675ec4c..fa7398e48b43 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -106,8 +106,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
 bWelded = true;
 }
 
-if (!pDlg)
-return;
+assert(pDlg && "there must be a dialog at this point");
 
 auto pRequest = std::make_shared(rReq);
 rReq.Ignore(); // the 'old' request is not relevant any more
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 279eb753af57..4178150e872a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1485,7 +1485,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 case SID_ATTR_TRANSFORM:
 {
 SetCurrentFunction( FuTransform::Create( this, GetActiveWindow(), 
mpDrawView.get(), GetDoc(), rReq ) );
-if (rReq.GetArgs())
+// tdf#138963 conditions tested for here must be the same as those
+// of the early returns from FuTransform::DoExecute
+if (rReq.GetArgs() || !mpDrawView->AreObjectsMarked())
 {
 Invalidate(SID_RULER_OBJECT);
 Cancel();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source

[Noel (via logerrit)]

 xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx |   36 +++
 xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx |4 -
 xmloff/source/text/XMLIndexBibliographySourceContext.cxx |6 --
 xmloff/source/text/XMLIndexBibliographySourceContext.hxx |4 -
 xmloff/source/text/XMLIndexObjectSourceContext.cxx   |   18 +++
 xmloff/source/text/XMLIndexObjectSourceContext.hxx   |4 -
 xmloff/source/text/XMLIndexSourceBaseContext.cxx |   14 ++---
 xmloff/source/text/XMLIndexSourceBaseContext.hxx |4 -
 xmloff/source/text/XMLIndexTOCSourceContext.cxx  |   18 +++
 xmloff/source/text/XMLIndexTOCSourceContext.hxx  |4 -
 xmloff/source/text/XMLIndexTableSourceContext.cxx|   14 ++---
 xmloff/source/text/XMLIndexTableSourceContext.hxx|4 -
 xmloff/source/text/XMLIndexUserSourceContext.cxx |   24 --
 xmloff/source/text/XMLIndexUserSourceContext.hxx |4 -
 14 files changed, 65 insertions(+), 93 deletions(-)

New commits:
commit 5c543f7ae6de63ddf2a563162c296f69f74e7d38
Author: Noel 
AuthorDate: Tue Dec 15 15:18:47 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 12:00:08 2020 +0100

use views to parse

Change-Id: I1e6678e18e5ef298021c818036b44c5b71b180fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107760
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx 
b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 08522e6aee81..df1385d95b0e 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -62,17 +62,15 @@ 
XMLIndexAlphabeticalSourceContext::~XMLIndexAlphabeticalSourceContext()
 {
 }
 
-void XMLIndexAlphabeticalSourceContext::ProcessAttribute(
-sal_Int32 nAttributeToken,
-const OUString& rValue)
+void XMLIndexAlphabeticalSourceContext::ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter)
 {
 bool bTmp(false);
 
-switch (nAttributeToken)
+switch (aIter.getToken())
 {
 case XML_ELEMENT(TEXT, XML_MAIN_ENTRY_STYLE_NAME):
 {
-sMainEntryStyleName = rValue;
+sMainEntryStyleName = aIter.toString();
 OUString sDisplayStyleName = GetImport().GetStyleDisplayName(
 XmlStyleFamily::TEXT_TEXT, sMainEntryStyleName );
 const Reference < css::container::XNameContainer >&
@@ -82,78 +80,78 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute(
 break;
 
 case XML_ELEMENT(TEXT, XML_IGNORE_CASE):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bCaseSensitive = !bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_ALPHABETICAL_SEPARATORS):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bSeparators = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_COMBINE_ENTRIES):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bCombineEntries = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_COMBINE_ENTRIES_WITH_DASH):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bCombineDash = bTmp;
 }
 break;
 case XML_ELEMENT(TEXT, XML_USE_KEYS_AS_ENTRIES):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bEntry = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_COMBINE_ENTRIES_WITH_PP):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bCombinePP = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_CAPITALIZE_ENTRIES):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bUpperCase = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_COMMA_SEPARATED):
-if (::sax::Converter::convertBool(bTmp, rValue))
+if (::sax::Converter::convertBool(bTmp, aIter.toView()))
 {
 bCommaSeparated = bTmp;
 }
 break;
 
 case XML_ELEMENT(TEXT, XML_SORT_ALGORITHM):
-sAlgorithm = rValue;
+

[Libreoffice-commits] core.git: cui/qa sd/qa sfx2/uiconfig svx/qa sw/qa uitest/impress_tests

[Seth Chaiklin (via logerrit)]

 cui/qa/uitest/dialogs/chardlg.py |2 +-
 cui/qa/uitest/dialogs/pastedlg.py|2 +-
 sd/qa/uitest/impress_tests/autocorrectOptions.py |2 +-
 sd/qa/uitest/impress_tests/customSlideShow.py|2 +-
 sd/qa/uitest/impress_tests/documentProperties.py |2 +-
 sd/qa/uitest/impress_tests/insertSlide.py|4 ++--
 sd/qa/uitest/impress_tests/masterElements.py |2 +-
 sd/qa/uitest/impress_tests/renameSlide.py|2 +-
 sd/qa/uitest/impress_tests/slideShowSettings.py  |2 +-
 sd/qa/uitest/impress_tests/tdf126605.py  |2 +-
 sd/qa/uitest/impress_tests/tdf130440.py  |2 +-
 sd/qa/uitest/impress_tests/tdf91762.py   |2 +-
 sfx2/uiconfig/ui/templatedlg.ui  |7 ---
 svx/qa/uitest/table/tablecontroller.py   |2 +-
 sw/qa/uitest/writer_dialogs/openDialogs.py   |2 +-
 uitest/impress_tests/backgrounds.py  |2 +-
 uitest/impress_tests/drawinglayer.py |4 ++--
 uitest/impress_tests/layouts.py  |2 +-
 uitest/impress_tests/start.py|4 ++--
 19 files changed, 25 insertions(+), 24 deletions(-)

New commits:
commit 4484accf4d331a95ebf8475d6cd91950f4c27bcc
Author: Seth Chaiklin 
AuthorDate: Tue Dec 15 15:37:31 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Dec 17 11:25:49 2020 +0100

tdf#138976 change "Cancel" button to "Close" in Template Manager dialog

Change-Id: I3e8cbdb70f70002f1fe2b873e899f25a72463358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107704
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py
index 2545d268274a..fb1c1286cbae 100644
--- a/cui/qa/uitest/dialogs/chardlg.py
+++ b/cui/qa/uitest/dialogs/chardlg.py
@@ -16,7 +16,7 @@ class Test(UITestCase):
 # Start Impress.
 self.ui_test.create_doc_in_start_center("impress")
 template = self.xUITest.getTopFocusWindow()
-self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+self.ui_test.close_dialog_through_button(template.getChild("close"))
 doc = self.xUITest.getTopFocusWindow()
 editWin = doc.getChild("impress_win")
 # Select the title shape.
diff --git a/cui/qa/uitest/dialogs/pastedlg.py 
b/cui/qa/uitest/dialogs/pastedlg.py
index ccd33e02d11e..9ac40c55d2b6 100644
--- a/cui/qa/uitest/dialogs/pastedlg.py
+++ b/cui/qa/uitest/dialogs/pastedlg.py
@@ -16,7 +16,7 @@ class Test(UITestCase):
 # Copy a string in Impress.
 self.ui_test.create_doc_in_start_center("impress")
 template = self.xUITest.getTopFocusWindow()
-self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+self.ui_test.close_dialog_through_button(template.getChild("close"))
 doc = self.xUITest.getTopFocusWindow()
 editWin = doc.getChild("impress_win")
 # Select the title shape.
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py 
b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index feeabe5435b2..d386aa8b189c 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -16,7 +16,7 @@ class autocorrectOptions(UITestCase):
def test_autocorrect_options_impress(self):
 self.ui_test.create_doc_in_start_center("impress")
 xTemplateDlg = self.xUITest.getTopFocusWindow()
-xCancelBtn = xTemplateDlg.getChild("cancel")
+xCancelBtn = xTemplateDlg.getChild("close")
 self.ui_test.close_dialog_through_button(xCancelBtn)
 document = self.ui_test.get_component()
 
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py 
b/sd/qa/uitest/impress_tests/customSlideShow.py
index 61b15cda8743..9feef4a12a81 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -12,7 +12,7 @@ class customSlideShow(UITestCase):
 MainDoc = self.ui_test.create_doc_in_start_center("impress")
 MainWindow = self.xUITest.getTopFocusWindow()
 TemplateDialog = self.xUITest.getTopFocusWindow()
-cancel = TemplateDialog.getChild("cancel")
+cancel = TemplateDialog.getChild("close")
 self.ui_test.close_dialog_through_button(cancel)
 self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog")
 CustomSlideShows = self.xUITest.getTopFocusWindow()
diff --git a/sd/qa/uitest/impress_tests/documentProperties.py 
b/sd/qa/uitest/impress_tests/documentProperties.py
index 54ad2947b6bf..811feb106aab 100644
--- a/sd/qa/uitest/impress_tests/documentProperties.py
+++ b/sd/qa/uitest/impress_tests/documentProperties.py
@@ -17,7 +17,7 @@ class ImpressDocumentProperties(UITestCase):
def test_open_document_properties_impress(self):
 self.ui_test.create_doc_in_start_center("impress")
 xTemplateDlg = self.xUITest.getTopFoc

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/qa svx/source

[Regina Henschel (via logerrit)]

 svx/qa/unit/customshapes.cxx  |   82 ++
 svx/qa/unit/data/tdf138945_resizeRotatedShape.odg |binary
 svx/source/svdraw/svdoashp.cxx|   24 ++
 3 files changed, 106 insertions(+)

New commits:
commit c6bc280fa986bac1b62726a4a19fd0be1c735fc0
Author: Regina Henschel 
AuthorDate: Tue Dec 15 20:20:55 2020 +0100
Commit: Xisco Fauli 
CommitDate: Thu Dec 17 11:16:38 2020 +0100

tdf#138945 update fObjectRotation for NbcResize

SdrObjCustomShape::NbcResize uses the inherited SdrTextObj::NbcResize.
But a SdrTextObj does not know fObjectRotation. Explicit update to new
rotation angle after resize is needed.
The error became visible, if you changed width or height of a rotated
or sheared custom shape in the Position&Size dialog. Then the shape
handles were not on the shape outline.

Change-Id: Idbe47a3b1ef2b34e9645d62830cb330f2e49bd3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107792
Tested-by: Jenkins
Reviewed-by: Regina Henschel 
(cherry picked from commit d4ca360f6632f03e9fb7e9af37aac40d23f1249a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107803
Reviewed-by: Xisco Fauli 

diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 737ab5bdf6d0..e3a5e0ac92a3 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -90,6 +90,88 @@ sal_uInt8 CustomshapesTest::countShapes()
 return xDrawPage->getCount();
 }
 
+void lcl_AssertRectEqualWithTolerance(const OString& sInfo, const 
tools::Rectangle& rExpected,
+  const tools::Rectangle& rActual, const 
sal_Int32 nTolerance)
+{
+// Left
+OString sMsg = sInfo + " Left expected " + 
OString::number(rExpected.Left()) + " actual "
+   + OString::number(rActual.Left()) + " Tolerance " + 
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(),
+   std::abs(rExpected.Left() - rActual.Left()) <= 
nTolerance);
+
+// Top
+sMsg = sInfo + " Top expected " + OString::number(rExpected.Top()) + " 
actual "
+   + OString::number(rActual.Top()) + " Tolerance " + 
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), std::abs(rExpected.Top() - 
rActual.Top()) <= nTolerance);
+
+// Width
+sMsg = sInfo + " Width expected " + OString::number(rExpected.GetWidth()) 
+ " actual "
+   + OString::number(rActual.GetWidth()) + " Tolerance " + 
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(),
+   std::abs(rExpected.GetWidth() - rActual.GetWidth()) 
<= nTolerance);
+
+// Height
+sMsg = sInfo + " Height expected " + 
OString::number(rExpected.GetHeight()) + " actual "
+   + OString::number(rActual.GetHeight()) + " Tolerance " + 
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(),
+   std::abs(rExpected.GetHeight() - 
rActual.GetHeight()) <= nTolerance);
+}
+
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testResizeRotatedShape)
+{
+// tdf#138945 Setting width or height for a rotated or sheared shape in 
the Position&Size dialog
+// had resulted in a mismatch of handle position and shape outline. That 
becomes visible in object
+// properties as mismatch of frame rectangle and bound rectangle.
+// Problem was, that fObjectRotation was not updated.
+
+// Load document and get shape. It is a rectangle custom shape with 45° 
shear and 330° rotation.
+OUString aURL
+= m_directories.getURLFromSrc(sDataDirectory) + 
"tdf138945_resizeRotatedShape.odg";
+mxComponent = loadFromDesktop(aURL, 
"com.sun.star.comp.presentation.PresentationDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+uno::Reference xShape(getShape(0));
+
+// Change height and mirror vertical
+{
+SdrObjCustomShape& rSdrShape(
+static_cast(*GetSdrObjectFromXShape(xShape)));
+rSdrShape.NbcResize(rSdrShape.GetRelativePos(), Fraction(1.0), 
Fraction(-0.5));
+tools::Rectangle aSnapRect(rSdrShape.GetSnapRect());
+tools::Rectangle aBoundRect(rSdrShape.GetCurrentBoundRect());
+lcl_AssertRectEqualWithTolerance("height changed, mirror vert", 
aSnapRect, aBoundRect, 3);
+}
+
+// Change height
+{
+SdrObjCustomShape& rSdrShape(
+static_cast(*GetSdrObjectFromXShape(xShape)));
+rSdrShape.NbcResize(rSdrShape.GetRelativePos(), Fraction(1.0), 
Fraction(2.0));
+tools::Rectangle aSnapRect(rSdrShape.GetSnapRect());
+tools::Rectangle aBoundRect(rSdrShape.GetCurrentBoundRect());
+lcl_AssertRectEqualWithTolerance("height changed", aSnapRect, 
aBoundRect, 3);
+}
+
+// Change width
+{
+SdrObjCustomShape& rSdrShape(
+static_cast(*GetSdrObjectFromXShape(xShape)));
+rSdrShape.NbcResize(rSdrShape.GetRe

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/alignhorizontalcenter.png  |binary
 icon-themes/elementary/cmd/32/bezierfill.png |binary
 icon-themes/elementary/cmd/32/changepolygon.png  |binary
 icon-themes/elementary/cmd/32/connector.png  |binary
 icon-themes/elementary/cmd/32/connectorarrowend.png  |binary
 icon-themes/elementary/cmd/32/connectorarrows.png|binary
 icon-themes/elementary/cmd/32/connectorarrowstart.png|binary
 icon-themes/elementary/cmd/32/connectorcircleend.png |binary
 icon-themes/elementary/cmd/32/connectorcircles.png   |binary
 icon-themes/elementary/cmd/32/connectorcirclestart.png   |binary
 icon-themes/elementary/cmd/32/connectorcurve.png |binary
 icon-themes/elementary/cmd/32/connectorcurvearrowend.png |binary
 icon-themes/elementary/cmd/32/connectorcurvearrows.png   |binary
 icon-themes/elementary/cmd/32/connectorcurvearrowstart.png   |binary
 icon-themes/elementary/cmd/32/connectorcurvecircleend.png|binary
 icon-themes/elementary/cmd/32/connectorcurvecircles.png  |binary
 icon-themes/elementary/cmd/32/connectorcurvecirclestart.png  |binary
 icon-themes/elementary/cmd/32/connectorline.png  |binary
 icon-themes/elementary/cmd/32/connectorlinearrowend.png  |binary
 icon-themes/elementary/cmd/32/connectorlinearrows.png|binary
 icon-themes/elementary/cmd/32/connectorlinearrowstart.png|binary
 icon-themes/elementary/cmd/32/connectorlinecircleend.png |binary
 icon-themes/elementary/cmd/32/connectorlinecirclestart.png   |binary
 icon-themes/elementary/cmd/32/connectorlines.png |binary
 icon-themes/elementary/cmd/32/connectorlinesarrowend.png |binary
 icon-themes/elementary/cmd/32/connectorlinesarrows.png   |binary
 icon-themes/elementary/cmd/32/connectorlinesarrowstart.png   |binary
 icon-themes/elementary/cmd/32/connectorlinescircleend.png|binary
 icon-themes/elementary/cmd/32/connectorlinescirclestart.png  |binary
 icon-themes/elementary/cmd/32/freeline.png   |binary
 icon-themes/elementary/cmd/32/insertdraw.png |binary
 icon-themes/elementary/cmd/32/line.png   |binary
 icon-themes/elementary/cmd/32/line_diagonal.png  |binary
 icon-themes/elementary/cmd/32/linearrowcircle.png|binary
 icon-themes/elementary/cmd/32/linearrowend.png   |binary
 icon-themes/elementary/cmd/32/linearrows.png |binary
 icon-themes/elementary/cmd/32/linearrowsquare.png|binary
 icon-themes/elementary/cmd/32/linearrowstart.png |binary
 icon-themes/elementary/cmd/32/linecirclearrow.png|binary
 icon-themes/elementary/cmd/32/linesquarearrow.png|binary
 icon-themes/elementary/cmd/32/measureline.png|binary
 icon-themes/elementary/cmd/32/polygon.png|binary
 icon-themes/elementary/cmd/32/polygon_diagonal.png   |binary
 icon-themes/elementary/cmd/32/polygon_diagonal_unfilled.png  |binary
 icon-themes/elementary/cmd/32/polygon_unfilled.png   |binary
 icon-themes/elementary/cmd/lc_bezierfill.png |binary
 icon-themes/elementary/cmd/lc_changepolygon.png  |binary
 icon-themes/elementary/cmd/lc_connector.png  |binary
 icon-themes/elementary/cmd/lc_connectorarrowend.png  |binary
 icon-themes/elementary/cmd/lc_connectorarrows.png|binary
 icon-themes/elementary/cmd/lc_connectorarrowstart.png|binary
 icon-themes/elementary/cmd/lc_connectorcircleend.png |binary
 icon-themes/elementary/cmd/lc_connectorcircles.png   |binary
 icon-themes/elementary/cmd/lc_connectorcirclestart.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurve.png |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrowend.png |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrows.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurvearrowstart.png   |binary
 icon-themes/elementary/cmd/lc_connectorcurvecircleend.png|binary
 icon-themes/elementary/cmd/lc_connectorcurvecircles.png  |binary
 icon-themes/elementary/cmd/lc_connectorcurvecirclestart.png  |binary
 icon-themes/elementary/cmd/lc_connectorline.png  |binary
 icon-themes/elementary/cmd/lc_connectorlinearrowend.png  |binary
 icon-themes/elementary/cmd/lc_connectorlinearrows.png|binary
 icon-themes/elementary/cmd/lc_connectorlinearrowstart.png|binary
 icon-themes/elementary/cmd/lc_connectorlinecircleend.png |binary
 icon-themes/elementary/cmd/lc_connectorlinecirclestart.png   |binary
 icon-themes/elementary/cmd/lc_connectorl

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/source cui/uiconfig svx/source

[Miklos Vajna (via logerrit)]

 cui/source/dialogs/sdrcelldlg.cxx|7 +
 cui/source/inc/sdrcelldlg.hxx|2 +
 cui/uiconfig/ui/formatcellsdialog.ui |   48 +++
 svx/source/table/tablecontroller.cxx |   12 
 4 files changed, 69 insertions(+)

New commits:
commit 16d05d51444dff723fe0efc57d68750845ed3e34
Author: Miklos Vajna 
AuthorDate: Mon Dec 14 12:15:09 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 10:21:34 2020 +0100

tdf#129961 cui: start UI for table shadow as direct format

It reads from the doc model and shows it, but doesn't write it back yet.

(cherry picked from commit 74ba28fe238b7f15d1fb7d119e4cef3a7b544e0b)

Change-Id: I6611229e71d0a49f09576ca452b901958c33db58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107863
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index 3c745692f7ea..fda8b4ce1385 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -27,6 +27,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* 
pParent, const SfxItemS
 : SfxTabDialogController(pParent, "cui/ui/formatcellsdialog.ui", 
"FormatCellsDialog", pAttr)
 , mrOutAttrs(*pAttr)
 , mpColorTab(rModel.GetColorList())
+, mnColorTabState ( ChangeType::NONE )
 , mpGradientList(rModel.GetGradientList())
 , mpHatchingList(rModel.GetHatchList())
 , mpBitmapList(rModel.GetBitmapList())
@@ -36,6 +37,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* 
pParent, const SfxItemS
 AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS);
 AddTabPage("border", RID_SVXPAGE_BORDER );
 AddTabPage("area", RID_SVXPAGE_AREA);
+AddTabPage("shadow", SvxShadowTabPage::Create, nullptr);
 }
 
 void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
@@ -55,6 +57,11 @@ void SvxFormatCellsDialog::PageCreated(const OString& rId, 
SfxTabPage &rPage)
 SvxBorderTabPage& rBorderPage = static_cast(rPage);
 rBorderPage.SetTableMode();
 }
+else if (rId == "shadow")
+{
+static_cast(rPage).SetColorList( mpColorTab );
+static_cast(rPage).SetColorChgd( &mnColorTabState );
+}
 else
 SfxTabDialogController::PageCreated(rId, rPage);
 }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index a9f6183bd1d1..5b7e9ca71a20 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 class SdrModel;
 class SvxFormatCellsDialog : public SfxTabDialogController
@@ -30,6 +31,7 @@ private:
 const SfxItemSet&   mrOutAttrs;
 
 XColorListRef   mpColorTab;
+ChangeType  mnColorTabState;
 XGradientListRefmpGradientList;
 XHatchListRef   mpHatchingList;
 XBitmapListRef  mpBitmapList;
diff --git a/cui/uiconfig/ui/formatcellsdialog.ui 
b/cui/uiconfig/ui/formatcellsdialog.ui
index 32c9b0558c4e..3ac39e087551 100644
--- a/cui/uiconfig/ui/formatcellsdialog.ui
+++ b/cui/uiconfig/ui/formatcellsdialog.ui
@@ -285,6 +285,54 @@
 False
   
 
+
+  
+  
+True
+False
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+4
+  
+
+
+  
+True
+False
+Shadow
+  
+  
+5
+False
+  
+
   
   
 False
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index ee40835ec5d8..1dce1dab81ec 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -925,6 +925,18 @@ void SvxTableController::onFormatTable(const SfxRequest& 
rReq)
 aNewAttr.Put( aBoxItem );
 aNewAttr.Put( aBoxInfoItem );
 
+// Fill in shadow properties.
+const SfxItemSet& rTableItemSet = rTableObj.GetMergedItemSet();
+for (sal_uInt16 nWhich = SDRATTR_SHADOW_FIRST; nWhich <= 
SDRATTR_SHADOW_LAST; ++nWhich)
+{
+if (rTableItemSet.GetItemState(nWhich, false) != SfxItemState::SET)
+{
+continue;
+}
+
+aNewAttr.Put(rTableItemSet.Get(nWhich));
+}
+
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 VclPtr xDlg( 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26d70b088e7baf592d07c5a3db27e814efdaba43
Author: Heiko Tietze 
AuthorDate: Wed Dec 16 10:34:47 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Dec 17 10:05:37 2020 +0100

Update branding for Community Edition

See 
https://listarchives.documentfoundation.org/www/board-discuss/2020/msg00692.html

Change-Id: Iaa72b5c52f2678d85dc73bf8677237d4e82484f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107820
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit d8b01ac94c8ebd55bef6d00cbfa34775ea07271f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107809
Reviewed-by: Miklos Vajna 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index 16bf6e3656b6..a5e714304dac 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index 2a1daf9074b9..a4f36cd3b65d 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index 1c34be13a4a6..887c71c4bb31 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">Community Edition
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index 71338f00b49a..e7dfeba30884 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
___
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.0' - download.lst external/pdfium svx/source

[Miklos Vajna (via logerrit)]

 download.lst   |   
 4 
 external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2  |   
82 +
 external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 |   
58 
 external/pdfium/0004-svx-support-PDF-text-color.patch.2|  
119 +
 external/pdfium/0009-svx-support-color-text-for-imported-PDFs.patch.2  |  
100 +
 external/pdfium/0010-svx-support-importing-forms-from-PDFs.patch.2 |   
94 +
 external/pdfium/0011-svx-correctly-possition-form-objects-from-PDF.patch.2 |   
75 
 external/pdfium/0012-svx-import-processed-PDF-text.patch.2 |  
148 +
 external/pdfium/0014-svx-update-PDFium-patch-and-code.patch.2  |   
83 +
 external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2|   
77 +
 external/pdfium/Library_pdfium.mk  |   
 4 
 external/pdfium/UnpackedTarball_pdfium.mk  |   
11 
 external/pdfium/build.patch.1  |   
53 
 external/pdfium/edit.patch.1   |  
757 --
 external/pdfium/icu.patch.1|   
13 
 svx/source/svdraw/svdpdf.cxx   |   
 4 
 16 files changed, 891 insertions(+), 791 deletions(-)

New commits:
commit 3465490b8bcc9606596b1011a530f4955daf8d0a
Author: Miklos Vajna 
AuthorDate: Tue Jul 17 21:23:40 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 10:02:22 2020 +0100

pdfium: update to 3471

Allows dropping 4 API patches + the one that allows building against
system ICU.

(cherry picked from commit 1445d84cdc906fabf6cc7a59f3c94b4049477701)

Conflicts:
external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
external/pdfium/UnpackedTarball_pdfium.mk

[ Also split up edit.patch.1 which as done when forward-porting from
cp-6.0 to cp-6.2, so not something that could be backported explicitly. ]

Change-Id: Ib5c63ba7daf51b320c07b24486f7398bf71bcfbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107340
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 98c5a6ed32c2..37c69be838d2 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,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 := 
80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957
-export PDFIUM_TARBALL := pdfium-3426.tar.bz2
+export PDFIUM_SHA256SUM := 
4acbc905fee1743e96169ca155347a81fb2b0f381281109c1860aa4408ec6c4f
+export PDFIUM_TARBALL := pdfium-3471.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
diff --git a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2 
b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
new file mode 100644
index ..ef6649b5f4cb
--- /dev/null
+++ b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
@@ -0,0 +1,82 @@
+From 5f83d0a3fac4f8ccef457c03b74433ffd7b12e2a Mon Sep 17 00:00:00 2001
+From: Ashod Nakashian 
+Date: Tue, 5 Jun 2018 11:28:30 +0200
+Subject: [PATCH 02/14] svx: more accurate PDF text importing
+
+---
+ pdfium/fpdfsdk/fpdf_editpage.cpp | 84 
+ pdfium/public/fpdf_edit.h| 36 +
+ 2 files changed, 120 insertions(+)
+
+diff --git a/pdfium/fpdfsdk/fpdf_editpage.cpp 
b/pdfium/fpdfsdk/fpdf_editpage.cpp
+index 912df63..3244943 100644
+--- a/pdfium/fpdfsdk/fpdf_editpage.cpp
 b/pdfium/fpdfsdk/fpdf_editpage.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include "constants/page_object.h"
+ #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
++#include "core/fpdfapi/font/cpdf_font.h"
+ #include "core/fpdfapi/page/cpdf_form.h"
+ #include "core/fpdfapi/page/cpdf_formobject.h"
+ #include "core/fpdfapi/page/cpdf_imageobject.h"
+@@ -440,6 +441,26 @@ FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object,
+   pPageObj->Transform(matrix);
+ }
+ 
++FPDF_EXPORT int FPDF_CALLCONV
++FPDFTextObj_CountChars(FPDF_PAGEOBJECT text_object)
++{
++  if (!text_object)
++return 0;
++
++  CPDF_TextObject* pTxtObj = static_cast(text_object);
++  return pTxtObj->CountChars();
++}
++
++FPDF_EXPORT int FPDF_CALLCONV
++FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text_object)
++{
++  if (!text_object)
++re

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

[Ashod Nakashian (via logerrit)]

 vcl/source/window/window.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5a3837034960327743154887732c4cae04cfc971
Author: Ashod Nakashian 
AuthorDate: Sun Nov 8 09:15:25 2020 -0500
Commit: Michael Meeks 
CommitDate: Thu Dec 17 09:53:50 2020 +0100

vcl: lok: don't use window impl after destroy

When destroying floating windows, accessing the GetLOKNotifier
can segfault. The following is the stack-trace from such
a case.

/usr/bin/loolforkit(_ZN7SigUtil13dumpBacktraceEv+0x5e)[0x55cbf9da62fe]
/usr/bin/loolforkit(+0x1d0af5)[0x55cbf9da6af5]
/lib/x86_64-linux-gnu/libpthread.so.0(+0x128a0)[0x7fe0a125f8a0]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZNK3vcl6Window14GetLOKNotifierEv+0x7)[0x7fe09e67b827]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN3vcl6Window24GetParentWithLOKNotifierEv+0x2b)[0x7fe09e67b86b]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN14FloatingWindow12StateChangedE16StateChangedType+0x43)[0x7fe09e609a13]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN3vcl6Window4ShowEb9ShowFlags+0x2ba)[0x7fe09e67cd5a]

/opt/collaboraoffice6.4/program/libmergedlo.so(_Z21ImplDestroyHelpWindowR14ImplSVHelpDatab+0xe3)[0x7fe09e90c193]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN9Scheduler21ProcessTaskSchedulingEv+0x8ea)[0x7fe09e93817a]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN14SvpSalInstance12CheckTimeoutEb+0x107)[0x7fe09ea06807]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN14SvpSalInstance7DoYieldEbb+0x85)[0x7fe09ea06905]
/opt/collaboraoffice6.4/program/libmergedlo.so(+0x2f5d6fb)[0x7fe09e94f6fb]

/opt/collaboraoffice6.4/program/libmergedlo.so(_ZN11Application7ExecuteEv+0x45)[0x7fe09e950295]
/opt/collaboraoffice6.4/program/libmergedlo.so(+0x1f6d545)[0x7fe09d95f545]

/opt/collaboraoffice6.4/program/libmergedlo.so(_Z10ImplSVMainv+0x51)[0x7fe09e957321]

/opt/collaboraoffice6.4/program/libmergedlo.so(soffice_main+0x98)[0x7fe09d980b88]
/opt/collaboraoffice6.4/program/libmergedlo.so(+0x1f9e7c1)[0x7fe09d9907c1]

/usr/bin/loolforkit(_Z10lokit_mainRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_S6_S6_S6_m+0x2562)[0x55cbf9d4c792]
/usr/bin/loolforkit(+0x15fc77)[0x55cbf9d35c77]

/usr/bin/loolforkit(_Z18forkLibreOfficeKitRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_S6_S6_i+0xb44)[0x55cbf9d36b24]
/usr/bin/loolforkit(main+0x18a7)[0x55cbf9d00e17]
/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe7)[0x7fe0a0e7db97]
/usr/bin/loolforkit(_start+0x2a)[0x55cbf9d07efa]

Change-Id: Ia467d51896d1ac657bde5ae2803fcb2557ebd3fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105445
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 012c4389e2ce..b3f6ce9e9a29 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3243,12 +3243,12 @@ ILibreOfficeKitNotifier::~ILibreOfficeKitNotifier()
 
 const vcl::ILibreOfficeKitNotifier* Window::GetLOKNotifier() const
 {
-return mpWindowImpl->mpLOKNotifier;
+return mpWindowImpl ? mpWindowImpl->mpLOKNotifier : nullptr;
 }
 
 vcl::LOKWindowId Window::GetLOKWindowId() const
 {
-return mpWindowImpl->mnLOKWindowId;
+return mpWindowImpl ? mpWindowImpl->mnLOKWindowId : 0;
 }
 
 VclPtr Window::GetParentWithLOKNotifier()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff

[Noel Grandin (via logerrit)]

 include/xmloff/xmluconv.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a66163657c0f069e1da2944cf376d61a77696787
Author: Noel Grandin 
AuthorDate: Wed Dec 16 17:08:50 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 09:45:38 2020 +0100

prevent accidentally passing a temporary

to a class that stores a & to the parameter.

Change-Id: Ia1dcd01f6ff4f961b5ba55f0db5c4944e4da52e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107849
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 06e047648832..40edab42cdfd 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -60,6 +60,9 @@ private:
 
 public:
 SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = u' 
' );
+/** just so no-one accidentally passes a temporary to this, and ends up 
with this class
+ * accessing the temporary after the temporary has been deleted. */
+SvXMLTokenEnumerator( OUString&& , sal_Unicode cSeparator = u' ' ) = 
delete;
 
 bool getNextToken( OUString& rToken );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source

[Noel (via logerrit)]

 xmloff/source/text/txtparai.cxx |   45 
 1 file changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 6e1cbf1cfa047007d048a70c6bf3abe67866f65d
Author: Noel 
AuthorDate: Tue Dec 15 15:41:39 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 17 09:43:09 2020 +0100

use views to parse

Change-Id: I6c396d37df3c0c823e9cf61738825a126e1a2cb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107763
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 2319af663736..c3ef3d9b3e7f 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -661,7 +661,7 @@ public:
 
 virtual void SAL_CALL characters( const OUString& i_rChars ) override;
 
-virtual void ProcessAttribute(sal_Int32 nAttributeToken, OUString const & 
i_rValue);
+virtual void ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter);
 
 virtual void InsertMeta(const Reference & i_xInsertionRange)
 = 0;
@@ -686,7 +686,7 @@ void XMLMetaImportContextBase::startFastElement(
 const Reference & xAttrList)
 {
 for (auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ))
-ProcessAttribute(aIter.getToken(), aIter.toString());
+ProcessAttribute(aIter);
 }
 
 void XMLMetaImportContextBase::endFastElement(sal_Int32 )
@@ -719,13 +719,12 @@ void XMLMetaImportContextBase::characters( const 
OUString& i_rChars )
 GetImport().GetTextImport()->InsertString(i_rChars, m_rIgnoreLeadingSpace);
 }
 
-void XMLMetaImportContextBase::ProcessAttribute(sal_Int32 nAttributeToken,
-OUString const & i_rValue)
+void XMLMetaImportContextBase::ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter)
 {
-if ( nAttributeToken == XML_ELEMENT(XML, XML_ID) )
-m_XmlId = i_rValue;
+if ( aIter.getToken() == XML_ELEMENT(XML, XML_ID) )
+m_XmlId = aIter.toString();
 else
-XMLOFF_WARN_UNKNOWN_ATTR("xmloff", nAttributeToken, i_rValue);
+XMLOFF_WARN_UNKNOWN("xmloff", aIter);
 }
 
 namespace {
@@ -748,8 +747,7 @@ public:
 XMLHints_Impl& i_rHints,
 bool & i_rIgnoreLeadingSpace );
 
-virtual void ProcessAttribute(sal_Int32 nAttributeToken,
-OUString const & i_rValue) override;
+virtual void ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter) override;
 
 virtual void InsertMeta(const Reference & i_xInsertionRange) 
override;
 };
@@ -767,28 +765,26 @@ XMLMetaImportContext::XMLMetaImportContext(
 {
 }
 
-void XMLMetaImportContext::ProcessAttribute(sal_Int32 nAttributeToken,
-OUString const & i_rValue)
+void XMLMetaImportContext::ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter)
 {
-switch (nAttributeToken)
+switch (aIter.getToken())
 {
 // RDFa
 case XML_ELEMENT(XHTML, XML_ABOUT):
-m_sAbout = i_rValue;
+m_sAbout = aIter.toString();
 m_bHaveAbout = true;
 break;
 case XML_ELEMENT(XHTML, XML_PROPERTY):
-m_sProperty = i_rValue;
+m_sProperty = aIter.toString();
 break;
 case XML_ELEMENT(XHTML, XML_CONTENT):
-m_sContent = i_rValue;
+m_sContent = aIter.toString();
 break;
 case XML_ELEMENT(XHTML, XML_DATATYPE):
-m_sDatatype = i_rValue;
+m_sDatatype = aIter.toString();
 break;
 default:
-XMLMetaImportContextBase::ProcessAttribute(
-nAttributeToken, i_rValue);
+XMLMetaImportContextBase::ProcessAttribute(aIter);
 }
 }
 
@@ -835,8 +831,7 @@ public:
 XMLHints_Impl& i_rHints,
 bool & i_rIgnoreLeadingSpace );
 
-virtual void ProcessAttribute(sal_Int32 nAttributeToken,
-OUString const & i_rValue) override;
+virtual void ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter) override;
 
 virtual void InsertMeta(const Reference & i_xInsertionRange) 
override;
 };
@@ -853,17 +848,15 @@ XMLMetaFieldImportContext::XMLMetaFieldImportContext(
 {
 }
 
-void XMLMetaFieldImportContext::ProcessAttribute(sal_Int32 nAttributeToken,
-OUString const & i_rValue)
+void XMLMetaFieldImportContext::ProcessAttribute(const 
sax_fastparser::FastAttributeList::FastAttributeIter & aIter)
 {
-switch (nAttributeToken)
+switch (aIter.getToken())
 {
 case XML_ELEMENT(STYLE, XML_DATA_STYLE_NAME):
-m_DataStyleName = i_rValue;
+m_DataStyleName = aIter.toString();
 break;
 default:
-XMLMetaImportContextBase::ProcessAttribute(
-nAttributeToken, i_rValue);
+XMLMetaImportContextBase::ProcessAttribute(aIter);
 }
 }
 

[Libreoffice-commits] core.git: icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8b01ac94c8ebd55bef6d00cbfa34775ea07271f
Author: Heiko Tietze 
AuthorDate: Wed Dec 16 10:34:47 2020 +0100
Commit: Heiko Tietze 
CommitDate: Thu Dec 17 09:27:41 2020 +0100

Update branding for Community Edition

See 
https://listarchives.documentfoundation.org/www/board-discuss/2020/msg00692.html

Change-Id: Iaa72b5c52f2678d85dc73bf8677237d4e82484f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107820
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index 16bf6e3656b6..a5e714304dac 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index 2a1daf9074b9..a4f36cd3b65d 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index 1c34be13a4a6..887c71c4bb31 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">Community Edition
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index 71338f00b49a..e7dfeba30884 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
+http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/pdfium

[Miklos Vajna (via logerrit)]

 external/pdfium/FPDF_GetTrailerEnds-make-this-not-depend-on-whitespa.patch.1 | 
  55 ++
 external/pdfium/UnpackedTarball_pdfium.mk| 
   3 
 2 files changed, 58 insertions(+)

New commits:
commit 89d8c762496cf874d6352167df280c33b7ba5ea0
Author: Miklos Vajna 
AuthorDate: Wed Dec 16 21:03:44 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Dec 17 09:08:37 2020 +0100

pdfium: backport GetTrailerEnds whitespace fix

Fixes the problem that sometimes a valid sig is detected as a partial
one.

Change-Id: I68107569bf8c331170902b1918a70ea4b9b659a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107856
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git 
a/external/pdfium/FPDF_GetTrailerEnds-make-this-not-depend-on-whitespa.patch.1 
b/external/pdfium/FPDF_GetTrailerEnds-make-this-not-depend-on-whitespa.patch.1
new file mode 100644
index ..10398bae6415
--- /dev/null
+++ 
b/external/pdfium/FPDF_GetTrailerEnds-make-this-not-depend-on-whitespa.patch.1
@@ -0,0 +1,55 @@
+From c10d17dee78d48d5e56da965e0cd02d28fd513a5 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Wed, 9 Dec 2020 17:42:53 +
+Subject: [PATCH] FPDF_GetTrailerEnds: make this not depend on whitespace
+
+PDF-1.7 calls out no bytes other than whitespace when specifying what
+can occur between endstream and endobj, so whitespace needs to be
+handled. When CPDF_SyntaxParser::ReadStream() reads the stream, it reads
+'endobj', and then resets the position back to the end of 'endstream'.
+This mechanism is disabled in case there is whitespace between the
+tokens and the newline, see the end of the function.
+
+This results in reporting no trailer ends, as the parsing fails, as the
+next token is expected to be 'endobj', but it's the ID of the next
+object instead.
+
+Fix the problem by handling whitespace in
+CPDF_SyntaxParser::ReadStream() where it was looking for \ntoken\n, not
+allowing whitespace between the token and the following newline.
+
+Change-Id: I7048e8d081af04af3dd08d957212c885b7982b5e
+Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76850
+Commit-Queue: Tom Sepez 
+Reviewed-by: Tom Sepez 
+---
+ core/fpdfapi/parser/cpdf_syntax_parser.cpp|  8 ++
+ fpdfsdk/fpdf_view_embeddertest.cpp| 14 +++
+ .../resources/trailer_end_trailing_space.in   | 86 
+ .../resources/trailer_end_trailing_space.pdf  | 99 +++
+ 4 files changed, 207 insertions(+)
+ create mode 100644 testing/resources/trailer_end_trailing_space.in
+ create mode 100644 testing/resources/trailer_end_trailing_space.pdf
+
+diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp 
b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+index 06389bccc..5318efdc1 100644
+--- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
 b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+@@ -795,6 +795,14 @@ RetainPtr CPDF_SyntaxParser::ReadStream(
+   memset(m_WordBuffer, 0, kEndObjStr.GetLength() + 1);
+   GetNextWordInternal(nullptr);
+ 
++  // Allow whitespace after endstream and before a newline.
++  unsigned char ch = 0;
++  while (GetNextChar(ch)) {
++if (!PDFCharIsWhitespace(ch) || PDFCharIsLineEnding(ch))
++  break;
++  }
++  SetPos(GetPos() - 1);
++
+   int numMarkers = ReadEOLMarkers(GetPos());
+   if (m_WordSize == static_cast(kEndObjStr.GetLength()) &&
+   numMarkers != 0 &&
+-- 
+2.26.2
+
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index c0cc000e40be..87012e73f931 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -17,7 +17,10 @@ pdfium_patches += c++20-comparison.patch
 pdfium_patches += AnnotationInkAndVertices.patch.1
 pdfium_patches += AnnotationBorderProperties.patch.1
 pdfium_patches += AnnotationLineStartAndEnd.patch.1
+# Backport of .
 pdfium_patches += SignatureGetDocMDPPermission.patch.1
+# Backport of .
+pdfium_patches += FPDF_GetTrailerEnds-make-this-not-depend-on-whitespa.patch.1
 
 # Work around  "c++20 
rewritten operator==
 # recursive call mixing friend and external operators for template class" in 
GCC with
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits