Caolán McNamara
3 years ago
parent
6735516bb4
commit
b51bf013f0
@ -1,69 +0,0 @@
|
||||
From 5d56e9f13b9c6ccad080efaea9cbc7f065b56bac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 12 Aug 2021 12:55:30 +0100
|
||||
Subject: [PATCH] Resolves: tdf#132739 two style tags where there should be
|
||||
just one
|
||||
|
||||
Change-Id: Id9c8c8cc8c5ffdd21ba79ff39a6279cf2ddc8025
|
||||
---
|
||||
sw/source/filter/html/css1atr.cxx | 4 +++-
|
||||
sw/source/filter/html/htmltabw.cxx | 9 ++++++---
|
||||
sw/source/filter/html/wrthtml.hxx | 2 +-
|
||||
3 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
|
||||
index 7b1a5cc19be3..c401d95a788f 100644
|
||||
--- a/sw/source/filter/html/css1atr.cxx
|
||||
+++ b/sw/source/filter/html/css1atr.cxx
|
||||
@@ -2113,10 +2113,12 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF
|
||||
Strm().WriteChar( '\"' );
|
||||
}
|
||||
|
||||
-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
|
||||
+void SwHTMLWriter::OutCSS1_TableCellBordersAndBG(SwFrameFormat const& rFrameFormat, const SvxBrushItem *pBrushItem)
|
||||
{
|
||||
SwCSS1OutMode const aMode( *this,
|
||||
CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX, nullptr );
|
||||
+ if (pBrushItem)
|
||||
+ OutCSS1_SvxBrush(*this, *pBrushItem, Css1Background::Table, nullptr);
|
||||
OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
|
||||
if (!m_bFirstCSS1Property)
|
||||
{
|
||||
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
|
||||
index 4c83319747b7..63812a9b3ef6 100644
|
||||
--- a/sw/source/filter/html/htmltabw.cxx
|
||||
+++ b/sw/source/filter/html/htmltabw.cxx
|
||||
@@ -424,11 +424,14 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
|
||||
// Avoid non-CSS version in the ReqIF case.
|
||||
rWrt.OutBackground( pBrushItem, false );
|
||||
|
||||
- if( rWrt.m_bCfgOutStyles )
|
||||
- OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
|
||||
+ if (!rWrt.m_bCfgOutStyles)
|
||||
+ pBrushItem = nullptr;
|
||||
}
|
||||
|
||||
- rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
|
||||
+ // tdf#132739 with rWrt.m_bCfgOutStyles of true bundle the brush item css
|
||||
+ // properties into the same "style" tag as the borders so there is only one
|
||||
+ // style tag
|
||||
+ rWrt.OutCSS1_TableCellBordersAndBG(*pBox->GetFrameFormat(), pBrushItem);
|
||||
|
||||
sal_uInt32 nNumFormat = 0;
|
||||
double nValue = 0.0;
|
||||
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
|
||||
index ab282ba652ff..f82325ee50ae 100644
|
||||
--- a/sw/source/filter/html/wrthtml.hxx
|
||||
+++ b/sw/source/filter/html/wrthtml.hxx
|
||||
@@ -494,7 +494,7 @@
|
||||
void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, std::u16string_view rAltText, HtmlFrmOpts nFrameOpts);
|
||||
|
||||
void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat );
|
||||
- void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat);
|
||||
+ void OutCSS1_TableCellBordersAndBG(const SwFrameFormat& rFrameFormat, const SvxBrushItem *pBrushItem);
|
||||
void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol );
|
||||
void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, HtmlFrmOpts nFrameOpts,
|
||||
const SdrObject *pSdrObj=nullptr,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 142e236c6dedc03915d2b3fe2cb6122ad714ac09 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 16:15:13 +0100
|
||||
Subject: [PATCH] arm: fix bridge
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
which went a little wrong in
|
||||
|
||||
commit dd91d3389c26645459d3b80649941d65efa4f63f
|
||||
Date: Sat Jan 2 14:36:44 2021 +0100
|
||||
|
||||
Fix some warnings for Raspberry pi 4 (part3)
|
||||
|
||||
Change-Id: Ief7e1146b7480a1c16ec0810f991296710214332
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120830
|
||||
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
||||
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
||||
|
||||
and...
|
||||
|
||||
arm: nStackBytes was already the right amount of bytes
|
||||
|
||||
regression from...
|
||||
|
||||
commit 6e3424ca1131fe371f63e456267de476b5eb0eae
|
||||
Date: Sat Jan 2 11:03:12 2021 +0100
|
||||
|
||||
Fix some warnings for Raspberry pi 4 (part2)
|
||||
|
||||
which changed that
|
||||
|
||||
Change-Id: I9a19d7d6bc1e4115ffffbe32d8d62be5d275d500
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120747
|
||||
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
||||
Reviewed-by: René Engelhard <rene@debian.org>
|
||||
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
||||
---
|
||||
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
|
||||
index 8533415ed087..a22ac393b5f7 100644
|
||||
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
|
||||
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
|
||||
@@ -251,7 +251,7 @@ void callVirtualMethod(
|
||||
{
|
||||
// 8-bytes aligned
|
||||
sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 8;
|
||||
- sal_uInt32 *stack = static_cast<sal_uInt32 *>(__builtin_alloca( nStackBytes * sizeof(sal_uInt32)));
|
||||
+ sal_uInt32 *stack = static_cast<sal_uInt32 *>(__builtin_alloca( nStackBytes ));
|
||||
memcpy( stack, pStack, nStackBytes );
|
||||
}
|
||||
|
||||
@@ -298,9 +298,9 @@ void callVirtualMethod(
|
||||
|
||||
#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
|
||||
if ( nr < arm::MAX_GPR_REGS ) \
|
||||
- pGPR[nr++] = reinterpret_cast<sal_uInt32>( pSV ); \
|
||||
+ pGPR[nr++] = *reinterpret_cast<const sal_uInt32*>( pSV ); \
|
||||
else \
|
||||
- *pDS++ = reinterpret_cast<sal_uInt32>( pSV );
|
||||
+ *pDS++ = *reinterpret_cast<const sal_uInt32*>( pSV );
|
||||
|
||||
#ifdef __ARM_EABI__
|
||||
#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
|
||||
@@ -310,8 +310,8 @@ void callVirtualMethod(
|
||||
} \
|
||||
if ( nr < arm::MAX_GPR_REGS ) \
|
||||
{ \
|
||||
- *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *static_cast<sal_uInt32 *>( pSV ); \
|
||||
- *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *(static_cast<sal_uInt32 *>( pSV ) + 1); \
|
||||
+ pGPR[nr++] = *static_cast<const sal_uInt32 *>( pSV ); \
|
||||
+ pGPR[nr++] = *(static_cast<const sal_uInt32 *>( pSV ) + 1); \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
@@ -319,8 +319,8 @@ void callVirtualMethod(
|
||||
{ \
|
||||
++pDS; \
|
||||
} \
|
||||
- *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[0]; \
|
||||
- *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[1]; \
|
||||
+ *pDS++ = static_cast<sal_uInt32 *>( pSV )[0]; \
|
||||
+ *pDS++ = static_cast<sal_uInt32 *>( pSV )[1]; \
|
||||
}
|
||||
#else
|
||||
#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in new issue