pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 971126 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/971126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=252
This commit is contained in:
Dominique Leuenberger 2022-04-22 19:53:14 +00:00 committed by Git OBS Bridge
commit 307fe3e7fa
15 changed files with 529 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

436
bsc1192616.patch Normal file
View File

@ -0,0 +1,436 @@
From d2a2d16b4836bf62db7c32faffa0c5b6d0d30a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCl=C5=9Fah=20K=C3=B6se?= <gulsah.kose@collabora.com>
Date: Mon, 11 Apr 2022 18:33:30 +0300
Subject: [PATCH] Revert "Revert "tdf#135843 Implement inside horizontal
vertical borders.""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit ea5a3e0247b1230c1fe7e2cb0afc597e56d0b4c2.
Change-Id: Ibd333c1e7b1530a2b6d9b8c5efbf4d9c822fa058
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132885
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
---
oox/inc/drawingml/table/tablecell.hxx | 2 +
oox/source/drawingml/table/tablecell.cxx | 112 ++++++++++++++++--
.../drawingml/table/tableproperties.cxx | 16 ++-
sd/qa/unit/data/pptx/bnc480256-2.pptx | Bin 0 -> 23387 bytes
sd/qa/unit/data/pptx/tdf135843_insideH.pptx | Bin 0 -> 33449 bytes
sd/qa/unit/import-tests.cxx | 2 +-
sd/qa/unit/layout-tests.cxx | 38 ++++++
7 files changed, 158 insertions(+), 12 deletions(-)
create mode 100644 sd/qa/unit/data/pptx/bnc480256-2.pptx
create mode 100644 sd/qa/unit/data/pptx/tdf135843_insideH.pptx
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index d6e91da042f7..988b0d057a13 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -82,6 +82,8 @@ private:
oox::drawingml::LineProperties maLinePropertiesRight;
oox::drawingml::LineProperties maLinePropertiesTop;
oox::drawingml::LineProperties maLinePropertiesBottom;
+ oox::drawingml::LineProperties maLinePropertiesInsideH;
+ oox::drawingml::LineProperties maLinePropertiesInsideV;
oox::drawingml::LineProperties maLinePropertiesTopLeftToBottomRight;
oox::drawingml::LineProperties maLinePropertiesBottomLeftToTopRight;
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index e5ab3372d42e..15ab06303e3b 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -81,6 +81,14 @@ static void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
aBorderLine.LineDistance = 0;
}
+ else
+ {
+ aBorderLine.Color = sal_Int32( COL_AUTO );
+ aBorderLine.OuterLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
+ aBorderLine.InnerLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
+ aBorderLine.LineWidth = 12700;
+ aBorderLine.LineDistance = 0;
+ }
if ( rLineProperties.moPresetDash.has() )
{
@@ -150,9 +158,16 @@ static void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
oox::drawingml::LineProperties& rRightBorder,
oox::drawingml::LineProperties& rTopBorder,
oox::drawingml::LineProperties& rBottomBorder,
+ oox::drawingml::LineProperties& rInsideHBorder,
+ oox::drawingml::LineProperties& rInsideVBorder,
oox::drawingml::LineProperties& rTopLeftToBottomRightBorder,
oox::drawingml::LineProperties& rBottomLeftToTopRightBorder,
- TableStylePart& rTableStylePart )
+ TableStylePart& rTableStylePart,
+ bool bIsWholeTable = false,
+ sal_Int32 nCol = 0,
+ sal_Int32 nMaxCol = 0,
+ sal_Int32 nRow = 0,
+ sal_Int32 nMaxRow = 0)
{
::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
if ( rPartFillPropertiesPtr )
@@ -169,12 +184,35 @@ static void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
}
}
- applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder );
- applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder );
- applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder );
- applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder );
- applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder );
- applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder );
+ // Left, right, top and bottom side of the whole table should be mean outer frame of the whole table.
+ // Without this check it means left top right and bottom of whole cells of whole table.
+ if (bIsWholeTable)
+ {
+ if (nCol == 0)
+ applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder );
+ if (nCol == nMaxCol)
+ applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder );
+ if (nRow == 0)
+ applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder );
+ if (nRow == nMaxRow)
+ applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder );
+
+ applyBorder( rFilterBase, rTableStylePart, XML_insideH, rInsideHBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_insideV, rInsideVBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder );
+ }
+ else
+ {
+ applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_insideH, rInsideHBorder );
+ applyBorder( rFilterBase, rTableStylePart, XML_insideV, rInsideVBorder );
+ }
aTextCharProps.maLatinFont = rTableStylePart.getLatinFont();
aTextCharProps.maAsianFont = rTableStylePart.getAsianFont();
@@ -233,6 +271,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
oox::drawingml::LineProperties aLinePropertiesRight;
oox::drawingml::LineProperties aLinePropertiesTop;
oox::drawingml::LineProperties aLinePropertiesBottom;
+ oox::drawingml::LineProperties aLinePropertiesInsideH;
+ oox::drawingml::LineProperties aLinePropertiesInsideV;
oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
@@ -241,9 +281,16 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
- rTable.getWholeTbl() );
+ rTable.getWholeTbl(),
+ true,
+ nColumn,
+ nMaxColumn,
+ nRow,
+ nMaxRow );
if ( rProperties.isFirstRow() && ( nRow == 0 ) )
{
@@ -252,6 +299,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getFirstRow() );
@@ -263,6 +312,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getLastRow() );
@@ -274,6 +325,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getFirstCol() );
@@ -285,6 +338,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getLastCol() );
@@ -306,6 +361,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand2H() );
@@ -317,6 +374,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand1H() );
@@ -330,6 +389,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getNwCell() );
@@ -341,6 +402,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getSwCell() );
@@ -352,6 +415,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getNeCell() );
@@ -363,6 +428,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getSeCell() );
@@ -384,6 +451,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand2V() );
@@ -395,6 +464,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight,
aLinePropertiesTop,
aLinePropertiesBottom,
+ aLinePropertiesInsideH,
+ aLinePropertiesInsideV,
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand1V() );
@@ -405,8 +476,11 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
aLinePropertiesRight.assignUsed( maLinePropertiesRight );
aLinePropertiesTop.assignUsed( maLinePropertiesTop );
aLinePropertiesBottom.assignUsed( maLinePropertiesBottom );
+ aLinePropertiesInsideH.assignUsed( maLinePropertiesInsideH );
+ aLinePropertiesInsideV.assignUsed( maLinePropertiesInsideV );
aLinePropertiesTopLeftToBottomRight.assignUsed( maLinePropertiesTopLeftToBottomRight );
aLinePropertiesBottomLeftToTopRight.assignUsed( maLinePropertiesBottomLeftToTopRight );
+
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesLeft, PROP_LeftBorder );
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesRight, PROP_RightBorder );
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTop, PROP_TopBorder );
@@ -414,6 +488,28 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTopLeftToBottomRight, PROP_DiagonalTLBR );
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottomLeftToTopRight, PROP_DiagonalBLTR );
+ // Convert insideH to Top and Bottom, InsideV to Left and Right. Exclude the outer borders.
+ if(nRow != 0)
+ {
+ aLinePropertiesInsideH.assignUsed( aLinePropertiesTop );
+ applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideH, PROP_TopBorder );
+ }
+ if(nRow != nMaxRow)
+ {
+ aLinePropertiesInsideH.assignUsed( aLinePropertiesBottom );
+ applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideH, PROP_BottomBorder );
+ }
+ if(nColumn != 0)
+ {
+ aLinePropertiesInsideV.assignUsed( aLinePropertiesLeft );
+ applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideV, PROP_LeftBorder );
+ }
+ if(nColumn != nMaxColumn)
+ {
+ aLinePropertiesInsideV.assignUsed( aLinePropertiesRight );
+ applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideV, PROP_RightBorder );
+ }
+
if (rProperties.getBgColor().isUsed() && !maFillProperties.maFillColor.isUsed() && maFillProperties.moFillType.get() == XML_noFill)
{
maFillProperties.moFillType = XML_solidFill;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 1622b8fc22ca..2c45004b3357 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -143,7 +143,8 @@ void TableProperties::pushToPropSet(const ::oox::core::XmlFilterBase& rFilterBas
{
sal_Int32 nColumn = 0;
sal_Int32 nColumnSize = tableRow.getTableCells().size();
- sal_Int32 nRemovedColumn = 0; //
+ sal_Int32 nRemovedColumn = 0;
+ sal_Int32 nRemovedRow = 0;
for (sal_Int32 nColIndex = 0; nColIndex < nColumnSize; nColIndex++)
{
@@ -169,6 +170,9 @@ void TableProperties::pushToPropSet(const ::oox::core::XmlFilterBase& rFilterBas
// props with pushToXCell.
bMerged = true;
}
+
+ if (rTableCell.getRowSpan() > 1)
+ nRemovedRow = (rTableCell.getRowSpan() - 1);
}
Reference<XCellRange> xCellRange(xTable, UNO_QUERY_THROW);
@@ -190,11 +194,17 @@ void TableProperties::pushToPropSet(const ::oox::core::XmlFilterBase& rFilterBas
else
xCell = xCellRange->getCellByPosition(nColumn, nRow);
+
+ sal_Int32 nMaxCol = tableRow.getTableCells().size() - nRemovedColumn - 1;
+ sal_Int32 nMaxRow = mvTableRows.size() - nRemovedRow - 1;
+
rTableCell.pushToXCell(rFilterBase, pMasterTextListStyle, xCell, *this, rTableStyle,
- nColumn, tableRow.getTableCells().size() - 1, nRow,
- mvTableRows.size() - 1);
+ nColumn, nMaxCol, nRow, nMaxRow);
+
if (bMerged)
nColumn += nRemovedColumn;
+
+ nRemovedRow = 0;
}
++nColumn;
}
--
2.34.1
From 6bf805ffb62a13f2f44a26f47f732f05c954ef49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCl=C5=9Fah=20K=C3=B6se?= <gulsah.kose@collabora.com>
Date: Mon, 14 Mar 2022 14:52:59 +0300
Subject: [PATCH] tdf#147766 Export empty lines as line with noFill
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We have a case that 0 width line but has auto color. If that case
exported there is no line over there, LO handles normally but MSO draws
back borders as default. To prevent this we have to export them as line
with noFill.
testTableBorderLineStyle change reverts a workaround for
3faf005a367cbd28077403bf93810bbaf4805851
testBnc480256 Cell(1,0) still invisible. We are just checking
this with another way.
Change-Id: If5f6d2dbdba5c295d58307fcfe3b37629ede8a8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131532
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132886
---
oox/source/drawingml/table/tablecell.cxx | 10 +---------
oox/source/export/shapes.cxx | 6 ++++++
sd/qa/unit/export-tests.cxx | 3 ++-
sd/qa/unit/import-tests.cxx | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 15ab06303e3b..fdf7950dcf2c 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -73,20 +73,12 @@ static void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
aBorderLine.LineDistance = 0;
}
- else if ( rLineProperties.moLineWidth.get(0)!=0 )
- {
- aBorderLine.Color = sal_Int32( COL_AUTO );
- aBorderLine.OuterLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
- aBorderLine.InnerLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
- aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
- aBorderLine.LineDistance = 0;
- }
else
{
aBorderLine.Color = sal_Int32( COL_AUTO );
aBorderLine.OuterLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
aBorderLine.InnerLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
- aBorderLine.LineWidth = 12700;
+ aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
aBorderLine.LineDistance = 0;
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 138106938ee2..97d09ca1be2e 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1975,6 +1975,12 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r
DrawingML::WriteSolidFill( ::Color(ColorTransparency, rBorderLine.Color) );
mpFS->endElementNS( XML_a, XML_line );
}
+ else if( nBorderWidth == 0)
+ {
+ mpFS->startElementNS(XML_a, XML_line);
+ mpFS->singleElementNS(XML_a, XML_noFill);
+ mpFS->endElementNS( XML_a, XML_line );
+ }
}
void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& xCellPropSet)
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index f1d0281aab0d..729d9f154b12 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -602,9 +602,10 @@ void SdExportTest::testBnc480256()
xCell->getPropertyValue("FillColor") >>= nColor;
CPPUNIT_ASSERT_EQUAL(Color(0x4697e0), nColor);
+ // This border should be invisible.
xCell.set(xTable->getCellByPosition(1, 0), uno::UNO_QUERY_THROW);
xCell->getPropertyValue("BottomBorder") >>= aBorderLine;
- CPPUNIT_ASSERT_EQUAL(COL_AUTO, Color(ColorTransparency, aBorderLine.Color));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sal_Int32(aBorderLine.LineWidth));
xDocShRef->DoClose();
}
--
2.34.1

3
libreoffice-7.3.2.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be96b0c9c7af7e24564729281ca6cef4eadfb06c9b30131a6fc94fa3e43b46a8
size 255657596

16
libreoffice-7.3.2.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7Jn0ACgkQ9DSh76/u
rqNfUxAAhPQ5P5VP1nEZUxfuUe/qn3EFikPHcdC0//jSsF7NBmHYJv7boI52yk8A
B9v3nNL+nJHDwxd+tP7uSPy5nGn1KiNvvYHSSnh2gC5/B5q77sYmRYju+HmB81pv
o9eZ36TzGkdcI2/QY4XyfwoP9hdRGD627pemZQ5SDYPogwFjqsfulX9jJUPBhkQn
smsiaIcoaoOhlJCYQudkVAl+r9rt3wvncrZwGnJ3bp1yK2XrG0hW55y1tIyyhkHQ
5jvdCdTi3N+Caf8RwuhEgJ6zR9suKNgjb64gv39fYALeAGbcFfH8NiAqMmkeR0z/
meQuCBwZI+IA3CQ+EoKbjEuCGpczM95v1CrLP4PAlqLdgoPaVoDJiXqMubdiEzk6
9+Ktuu//FzwBBuv1HJjTonfmEzam+aC0KbliN4wLcKpQlnlFywfPhVE/nWKwoqgN
bzklkQJSjB0XD6kIAKRD1I1pQ/EX/w3lRuiPJUx17Z9L/CAlt3Rvu63LGkooliVc
XzlhSHXYirZothIuIQDr/gqsOost4VwCOFS4OuZDz2f8dZ/2SJ6V3QQw3Wgqev+b
IUr21I7cpGiEbIrVsQPx4mGvNsCV8WY/ngI88Ujd/ndgyLXEiL2FOOzgaKKz+azg
Ftl1LND0UC9m8RPc6SZHlo50r1pvLoWELICgKQjlZ7uAypOXudo=
=dVS1
-----END PGP SIGNATURE-----

3
libreoffice-7.3.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f56f6fa977b308749988be6b8048a9486e8ff84d661f67e4244b679bb8e2c8b9
size 256040876

16
libreoffice-7.3.3.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2EsACgkQ9DSh76/u
rqOcaBAAyYRZQLbSMSLxZoNBNZEUcUdp0NsEwlmE2HhYMzYM/6MA2DXO0fYMVsVQ
n2Q8OUF6b7yK4bQ4bA5UdWliCwuPFA+h8xJ4lInJPT3/4/bJiZ408b4IkcOvLwa4
UqEMtuvCeq6eptsNUPUDxfq1BoSSjz0S8rj8IH0TbTBprmEVUiTcYVI+kxtwu9uh
Qbosvh+/rtD8Ge+eA1zEDpzXXveVa0E9YHEO9sx/t1vGgmFWDBLwBqQ9SrJ+n1mT
/TZzE3Mnq2v+3h43VvFWm4MLHJ8pJtxw26zy5+NoneGDUvQD+L9q4przCRHXq4ja
3OLxgx1Cz+C7F8POdgyWDd7PDrMzF+ts4vs33Lu7ofXE6/DmLHH1Ez1O69hZXUXU
azvZIz7DLpPJWM0CVN+zTHEJyv+1s6sFwZlai+P4JRN1N9Be5S9ybU1EAc+kzdtf
wWmvtcY50YnLRg7W1AvsBvkwWtv9QW9k/h3gWzZyqx5XjqmJ4Wgi77fEFWMflVEC
STdmDnQwuvRRJ2d8vEEqY8Ti7xgHN0cUi31f+Wna+sfvlI6Y4ZMzMdF5KYrJMxkJ
TPaycH/dWoI8liImt5sqDIpTMK64St+hqeehhB3M2S6yvf+wGMJID9+Vt3Jrb3aG
3XZBJ6HXt50Ju62+2/eqdsUcQ/FNYjXwOE0cBSy7KiFBg1y/1E0=
=YUNP
-----END PGP SIGNATURE-----

3
libreoffice-help-7.3.2.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:addb19304e3330f49614eb979541cf1bdf93b481dcce22fdee20fbb193066aec
size 112209056

16
libreoffice-help-7.3.2.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7JoMACgkQ9DSh76/u
rqMi7Q//dQuVLDFP0jKQiyXCK/hU1JAJ1ozosoCrPIjloArJJT3ucvfnMOndL9Sj
Vudv6ucQzRZ3sFUfwK8fXkcyCs60dZmfARd824GnQh2FxOtbj9VEju1g+vREnUpk
4ows/Rvij8XWI3R/CgoN+FwPTdW3OM/DM+R3SaE8lOFgyvxO5VYNXw/UctdS9MOV
oMPKklmhv4pSngCiqwizhmD6uNlWgne1jC8Ow7/ym1WGzTucZkEhGHmuAqyhkqd+
ZY6lBZrU0g3RSagmWoRT7J5/RyBmsshv+q35ndHSCiASjmVxi0l28DYmliICqA8Y
gjawiv9SJKCJbxyC1C07Hyv5Gp9H2SYSkpq5C79OtmqXS7OORrSaxE5Kg17TzPxO
sQPahi+lP7GnSGPafdYy5bdEOGDIpVDgJ7GIKnlnefRKZjUbO4fNZjuFwTDxNDpg
kbIvX0mpCgbNja+e/hOMnvBOz6+3HJEPLT00zXWjmIwsyDnuj5r29X18LiXYWFTw
IXe7xaoiYgp8a3bh4ovfPXd/KKI96E1kKo0eBQuhVJLAma6BKwVyL2hoCYTzmTC9
4sSKlfpBVOLtDjH79Y66Nn2TXaENDYy8KASlrUuKlZvYqSWWm1qJm3Qbrwj7ccyx
WIyKh3cDip0Kko4Nk4EvH242GavMWc5LYkByuvd4p+HrHvNW2CQ=
=7Wl9
-----END PGP SIGNATURE-----

3
libreoffice-help-7.3.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e597d4dde72046263cfd50fbd850bcb6c2ec2a1507e26309b06b1e973cc34e3
size 112208648

16
libreoffice-help-7.3.3.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2FEACgkQ9DSh76/u
rqOjCBAApZSXLskl2pKWe79sWlHxelfSXW0TdjE1x/fSkHdVkyqJUf97k0tv3bhv
6NW/ZT+QG2z09AnpU+3Cim80sbuP0rBIgffP+5J4LPjkl1vA5SA2sij1Wzip1BiK
hm9S8F3704qINj0JSCY2RLkOxPZNfhkt5HROft0fxyKN++hEZpKApjFMTbcQiFQQ
2vXGvYxg3rDHf/l36fuisCvkzahB+mlLvUKEVHTLF+tTbydWjyYfrpAuORbc08og
PexINzFKS4EvxzYVgx+R9yeDbDQzhFZJ4HAVIzH0qFVLmxVJqpg6G/+QyAVqoOZ0
7EdTkG1RJr+b1GpQNnXu00ohegwIfFxJfYFZCT9Ja1wYWr2iLe1YA6r4x61mtBqU
Yw+LjDktGXtUNsyDpIEdhzoL226yegmBWhNyPPB9Lm/Oz+394zW8bmI16c/CAimq
u9YHCWX5UMD3v0ZunfpP04Zxh+AluznJPBb8h5fFs1CQ2gK270kVwAahUi2g7Rd7
Qz48n/rSvZcQjZBG7Wv9zjCF9/dkbru9Gdw8HFiy86xA6tLEi1il2P5muHhA44Om
QdFwvNEQo0nhwbBL5aNOzaN1iMWutDPwAeN66Mu/KeMQWz0yH25P3DdoECizLHTR
FbMX8ZmymoZitO6/bG8S64DSkArcNz23cl6NyVSHiNDvoGh10Ek=
=KWNE
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.3.2.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2588507b425bc7047b6325fcde8a2fcc9a927cee5b76065f42ddb68bad0fd71
size 196162372

16
libreoffice-translations-7.3.2.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7JoQACgkQ9DSh76/u
rqPJ/A//Th8zGDAr3KfC7lVrUH1ROFyxzWoXeOR0JnvLYbq3/iPLfSSM4bAFvNeT
xLuAESGyO4lOoDb2zHTpfIIgxlG8VFzaalVlAAqZuiKhVPgqwawLVtGwrM/jQOnD
FOJ9xXzRvaAFTsTJ/000NSOw5LRCTqyEtCGGOc1T8+6lotpXon8VgVR+RiyJoXdh
tL0h060rBzK5XvJi3JJDVmjqJjMdBVF6GTyEIV48ENfJbMHfdHDoVDy7CdbkWfQ4
V339rwrDcBNr3SIlhKj7NQBPVjNbG5wO9PqeJ+LXopEvGuS2yZH3irIZjZuh9uUL
jx2uXg+m0F4ZqUlyaprc0wAvNABYsjdLo38iwm3S35wY23Sf13Et4GfKckznAlap
Z1eoips1ETS6dDyYEdICQ/T/IVdAhCQSzqidO4b8JpzrPzPk8zOaT/bw9Wrbe1Lq
dayS2Abdl/xxHCfHpHYXVn/IJYNlvVZ/ldFS1zB17mZn19+CPCCYFjtaM0CwZnmi
rKh7kDeyVSHNIr+WkZHU4p2Uxt6aSTkBraLidZ+5DDbFr+FD3ooO9wA3q7K9UP7x
L+V5iVqQhymbjSHvkeFmfBOscwdtBVTM71jASAiEXyGmmD7zrqrMdXh+lxRpOYyA
e/d3iyHR4DB814PxpXrQfG6D80KRIGdJe23lf3FRrXleUt+gyOQ=
=aLpH
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.3.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36399cc3c89135eabb1b906232261ce5c515ba63945cf68a5751d1e81165ab60
size 196250044

16
libreoffice-translations-7.3.3.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2FIACgkQ9DSh76/u
rqNrBw/9EVLCWjpl1z+1bnpct51yINB4ATLR4rYUX8JcCUC8veJNdr2Fb/X2VN8O
xxFEq8Z6akHSy4YDTMu9VR3dj6bKmmk16xv8SWj2GIfUPmth/JpOd6OcYgGa8Bj3
rKzMTaGjJWvVIx0GirdsJ2oV//PII3Hyqc1MLHXF4mKnH5/Nm9e7DEGDs5/qBaym
kRdQIK7GJkxkacbyS8B+WdbqsAjMWoKPmfVuuu8r3JW1KLDzm5oP/6jSBlQlMnLc
r3fxCYBNqivt3P4UtEWDgEa/3JY8vqXLJx1iVLHWSLnk7FJtf8ICcqZ+nZDW60dC
2wKmEtnzlzvxJIzlBkM7IvdNkC8XHILfT76c0dWRdhkZRKes8M9Pa2X/PQxa5jgO
V4WX70HBQN+OgBwJInJoKsAoCNGGsBetA9ftl6REU3d0lqKsUCUGn0b120+O7FUq
cA6otjO9FBdQcrjxw+StLi6Yen7BkS4WuCOLXSe0jyzv3UIro/15ocCYEEmTX+YV
OvH3WudFt9x3Z5U1XrzTyXbu0kOj58NgM/exO9xgQ9OmRYGBeU3HN713hA/wSF1/
YdXPdRldMQptsqQuiLdUp8uZOm11ghd0GvK6vFilI00HYir7nfJjp2JzZ0Md4+rz
kd3W2P8FSndAhoFRI5Qyc1qwWhplmTy9P5bkHTsIhQ1XX2hbPNM=
=xL43
-----END PGP SIGNATURE-----

31
libreoffice.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update to version 7.3.3.1:
There is no changelog available
* Fixes bsc#1196499
- Remove upstreamed patches:
* bsc1195881.patch
* bsc1196212.patch
-------------------------------------------------------------------
Wed Apr 13 10:50:07 UTC 2022 - Andras Timar <andras.timar@collabora.com>
- Fix bsc#1192616 - LO-L3: Extraneous/missing lines in table in Impress versus PowerPoint
* bsc1192616.patch
-------------------------------------------------------------------
Wed Apr 6 10:09:59 UTC 2022 - Andras Timar <andras.timar@collabora.com>
- Fix bsc#1195881 - LO-L3: Bullets appear larger and green (instead of black)
* bsc1195881.patch
-------------------------------------------------------------------
Thu Mar 31 10:33:24 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
@ -11,6 +33,13 @@ Thu Mar 31 10:33:24 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
You can find the complete release notes here:
https://wiki.documentfoundation.org/Releases/7.3.2/RC2
-------------------------------------------------------------------
Fri Mar 25 12:13:06 UTC 2022 - Andras Timar <andras.timar@collabora.com>
- Fix bsc#1196212 - LO-L3: Text with tabs appears quite different in
Impress than in PowerPoint
* bsc1196212.patch
-------------------------------------------------------------------
Fri Mar 25 11:45:21 UTC 2022 - Cor Blom <cornelis@solcon.nl>
@ -35,7 +64,7 @@ Wed Mar 9 16:33:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Refresh patches:
* 0001-Revert-java-9-changes.patch
* fix_gtk_popover_on_3.20.patch
* fix_gtk_popover_on_3.20.patch
-------------------------------------------------------------------
Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

8
libreoffice.spec
View File

@ -47,7 +47,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.3.2.2
Version: 7.3.3.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -105,6 +105,8 @@ Patch3: mediawiki-no-broken-help.diff
Patch6: gcc11-fix-error.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
# Bug 1192616 - LO-L3: Extraneous/missing lines in table in Impress versus PowerPoint
Patch13: bsc1192616.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@ -124,8 +126,9 @@ BuildRequires: commons-logging
BuildRequires: cups-devel
# Use bundled curl on SLE-12-SP5
%if 0%{suse_version} >= 1500
Source2013: %{external_url}/curl-7.79.1.tar.xz
BuildRequires: curl-devel >= 7.68.0
%else
Source2013: %{external_url}/curl-7.79.1.tar.xz
%endif
# Needed for tests
BuildRequires: dejavu-fonts
@ -1014,6 +1017,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch3
%patch6 -p1
%patch9 -p1
%patch13 -p1
%if 0%{?suse_version} < 1500
%patch10 -p1
%patch101 -p1