date:20220202

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

2022-02-02 Thread Tünde Tóth (via logerrit)

 oox/source/drawingml/fillproperties.cxx |2 ++
 oox/source/export/drawingml.cxx |   15 +++
 sw/qa/extras/uiwriter/uiwriter4.cxx |   10 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit b8925251e48534706c6960a54c320d3879317321
Author: Tünde Tóth 
AuthorDate: Mon Jan 17 15:00:13 2022 +0100
Commit: László Németh 
CommitDate: Thu Feb 3 08:59:10 2022 +0100

tdf#146822 OOXML: fix export of the transparency in hatch fill

The transparency value of the hatch was not exported.

Follow-up to commit 001afbed910b7e565f602c1b11b1b4538cd59442
"tdf#127989 OOXML: fix import of transparent hatching".

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

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 5d17c321d0f8..2b682bcd1b99 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -812,6 +812,8 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 {
 eFillStyle = FillStyle_HATCH;
 rPropMap.setProperty( ShapeProperty::FillHatch, 
createHatch( maPatternProps.moPattPreset.get(), aColor.getColor( 
rGraphicHelper, nPhClr ) ) );
+if( aColor.hasTransparency() )
+rPropMap.setProperty( ShapeProperty::FillTransparency, 
aColor.getTransparency() );
 
 // Set background color for hatch
 if(maPatternProps.maPattBgColor.isUsed())
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 09ca9c22915a..87bbe81bd88a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1658,12 +1658,19 @@ void DrawingML::WritePattFill(const 
Reference& rXPropSet, const cs
 {
 mpFS->startElementNS(XML_a, XML_pattFill, XML_prst, 
GetHatchPattern(rHatch));
 
+sal_Int32 nAlpha = MAX_PERCENT;
+if (GetProperty(rXPropSet, "FillTransparence"))
+{
+sal_Int32 nTransparency = 0;
+mAny >>= nTransparency;
+nAlpha = (MAX_PERCENT - (PER_PERCENT * nTransparency));
+}
+
 mpFS->startElementNS(XML_a, XML_fgClr);
-WriteColor(::Color(ColorTransparency, rHatch.Color));
+WriteColor(::Color(ColorTransparency, rHatch.Color), nAlpha);
 mpFS->endElementNS( XML_a , XML_fgClr );
 
 ::Color nColor = COL_WHITE;
-sal_Int32 nAlpha  = 0;
 
 if ( GetProperty( rXPropSet, "FillBackground" ) )
 {
@@ -1671,13 +1678,13 @@ void DrawingML::WritePattFill(const 
Reference& rXPropSet, const cs
 mAny >>= isBackgroundFilled;
 if( isBackgroundFilled )
 {
-nAlpha = MAX_PERCENT;
-
 if( GetProperty( rXPropSet, "FillColor" ) )
 {
 mAny >>= nColor;
 }
 }
+else
+nAlpha = 0;
 }
 
 mpFS->startElementNS(XML_a, XML_bgClr);
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index c1635b64ffad..29d31a0940b2 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -3681,7 +3681,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, 
testTdf143760WrapContourToOff)
 CPPUNIT_ASSERT_EQUAL(false, getProperty(getShape(1), 
"SurroundContour"));
 }
 
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf127989)
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testHatchFill)
 {
 createSwDoc();
 
@@ -3695,16 +3695,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf127989)
 xShapeProps->setPropertyValue("FillStyle", 
uno::makeAny(drawing::FillStyle_HATCH));
 xShapeProps->setPropertyValue("FillHatchName", 
uno::makeAny(OUString("Black 0 Degrees")));
 xShapeProps->setPropertyValue("FillBackground", uno::makeAny(false));
+xShapeProps->setPropertyValue("FillTransparence", 
uno::makeAny(sal_Int32(30)));
 uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
 xDrawPage->add(xShape);
 
 // Save it as DOCX and load it again.
-reload("Office Open XML Text", "tdf127989.docx");
+reload("Office Open XML Text", "hatchFill.docx");
 CPPUNIT_ASSERT_EQUAL(1, getShapes());
 
-// Without fix this had failed, because the background of the hatch was 
not set as 'no background'.
+// tdf#127989 Without fix this had failed, because the background of the 
hatch was not set as 'no background'.
 CPPUNIT_ASSERT(!getProperty(getShape(1), "FillBackground"));
+
+// tdf#146822 Without fix this had failed, because the transparency value 
of the hatch was not exported.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(30), getProperty(getShape(1),

[Libreoffice-bugs] [Bug 147152] Recent document pointers to a network (sftp) storage currently not available hang LibreOffice on startup

2022-02-02 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=147152

--- Comment #2 from Mike Kaganski  ---
It should not be a duplicate. 7.2.5 already includes a fix for the specific
problem in bug 131850; and there may be other problems in other scenarios, like
this one - maybe we have some special processing for the sftp URLs. Needs
reproducing, debugging and separate fixing; so this needs an own issue - like
here.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 147152] Recent document pointers to a network (sftp) storage currently not available hang LibreOffice on startup

2022-02-02 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=147152

Timo Jyrinki  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|UNCONFIRMED |RESOLVED

--- Comment #1 from Timo Jyrinki  ---
Doh, now I found immediately 131850 after filing this.

I'm using 7.2.5, will re-test with 7.2.6 later.

*** This bug has been marked as a duplicate of bug 131850 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 147152] New: Recent document pointers to a network (sftp) storage currently not available hang LibreOffice on startup

2022-02-02 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=147152

Bug ID: 147152
Summary: Recent document pointers to a network (sftp) storage
currently not available hang LibreOffice on startup
Product: LibreOffice
Version: unspecified
Hardware: All
OS: Linux (All)
Status: UNCONFIRMED
Severity: normal
Priority: medium
Component: filters and storage
Assignee: libreoffice-bugs@lists.freedesktop.org
Reporter: timo.jyrinki+libreoff...@iki.fi

# Test case:

1. Mount eg gvfs sftp file share and open a document from there.
2. Close LO, unmount the share
3. Start LO

# Observed behavior:

LibreOffice hangs indefinitely.

# Excepted behavior:

Do not try to access all files in recent documents on startup, and even later
if accessing on user's request do a timeout with error message.

# Workaround 1:

Before every LO startup, one can run:

> sed -i '/sftp/d' ~/.config/libreoffice/4/user/registrymodifications.xcu

Which for example in this case removes lines like:

> oor:path="/org.openoffice.Office.Histories/Histories/org.openoffice.Office.Histories:HistoryInfo['PickList']/OrderList"> oor:name="8" oor:op="replace"> oor:op="fuse">sftp://olo/home/timo/Asiakirjat/kauppalaskut.ods

# Workaround 2:

Follow
https://www.libreofficehelp.com/how-to-delete-recent-documents-list-in-libreoffice/
and set the value to 0 to disable recent documents.

# History:

This is only a gut feeling / vague memories but this may heve gotten worse
somewhere in LO 7.x - it used to be it timed out, now it seems like a complete
hang.

---

I'm happy to help debugging if anyone tells me what/how to debug/run (I can
follow technical debugging instructions) - the wiki instructions seem just a
bit broad and I wouldn't know what exactly to provide.

1 2 3 4 >

1 - 100 of 329 matches

Mail list logo