include/oox/export/drawingml.hxx | 6 ++---
oox/source/export/drawingml.cxx | 26 ++++++++--------------
oox/source/export/vmlexport.cxx | 4 +--
sc/source/filter/excel/xeescher.cxx | 2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 6 ++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 ++++++++--------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 8 +++++-
7 files changed, 36 insertions(+), 35 deletions(-)
New commits:
commit c90de36ede6d35e2cf1ebea195e0ff28f618f319
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Sep 20 21:22:54 2023 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Sep 25 20:26:31 2023 +0200
change bool header or footer parameter to use enum type instead
Is much more readable.
Change-Id: Ie81aaf344758182915796b18efbe25d3f45df4b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157236
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 72b35d7d544d..13836906c53e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3460,21 +3460,22 @@ void
DomainMapper_Impl::ConvertHeaderFooterToTextFrame(bool bDynamicHeightTop, b
}
}
-void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader,
SectionPropertyMap::PageType eType)
+void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType,
SectionPropertyMap::PageType eType)
{
m_bSaveParaHadField = m_bParaHadField;
m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted,
m_nTableDepth));
m_bTextInserted = false;
m_nTableDepth = 0;
- const PropertyIds ePropIsOn = bHeader? PROP_HEADER_IS_ON:
PROP_FOOTER_IS_ON;
- const PropertyIds ePropShared = bHeader? PROP_HEADER_IS_SHARED:
PROP_FOOTER_IS_SHARED;
- const PropertyIds ePropTextLeft = bHeader? PROP_HEADER_TEXT_LEFT:
PROP_FOOTER_TEXT_LEFT;
- const PropertyIds ePropText = bHeader? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
+ bool bHeader = ePagePartType == PagePartType::Header;
+
+ const PropertyIds ePropIsOn = bHeader ? PROP_HEADER_IS_ON:
PROP_FOOTER_IS_ON;
+ const PropertyIds ePropShared = bHeader ? PROP_HEADER_IS_SHARED:
PROP_FOOTER_IS_SHARED;
+ const PropertyIds ePropTextLeft = bHeader ? PROP_HEADER_TEXT_LEFT:
PROP_FOOTER_TEXT_LEFT;
+ const PropertyIds ePropText = bHeader ? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
m_bDiscardHeaderFooter = true;
- m_eInHeaderFooterImport
- = bHeader ? HeaderFooterImportState::header :
HeaderFooterImportState::footer;
+ m_eInHeaderFooterImport = bHeader ? HeaderFooterImportState::header :
HeaderFooterImportState::footer;
//get the section context
PropertyMapPtr pContext =
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
@@ -3560,12 +3561,12 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
{
- PushPageHeaderFooter(/* bHeader = */ true, eType);
+ PushPageHeaderFooter(PagePartType::Header, eType);
}
void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
{
- PushPageHeaderFooter(/* bHeader = */ false, eType);
+ PushPageHeaderFooter(PagePartType::Footer, eType);
}
void DomainMapper_Impl::PopPageHeaderFooter()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c19de5a5c4b9..676a0d3196d9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -426,6 +426,12 @@ struct SymbolData
{ }
};
+enum class PagePartType
+{
+ Header,
+ Footer
+};
+
class DomainMapper;
class DomainMapper_Impl final
{
@@ -1194,7 +1200,7 @@ public:
OUString getFontNameForTheme(const Id id);
private:
- void PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType
eType);
+ void PushPageHeaderFooter(PagePartType ePagePartType,
SectionPropertyMap::PageType eType);
// Start a new index section; if needed, finish current paragraph
css::uno::Reference<css::beans::XPropertySet>
StartIndexSectionChecked(const OUString& sServiceName);
std::vector<css::uno::Reference< css::drawing::XShape > >
m_vTextFramesForChaining ;
commit 33c347fb3b0fbbae9c1005b1ca7a6105284a6d31
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sun Sep 17 23:00:17 2023 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Sep 25 20:26:24 2023 +0200
oox: remove returning sRelId and rename WriteImage
Rename WriteImage -> writeGraphicToStorage to make it more clear
what the method does.
Remove returning the rel ID string in some methods that write the
graphic into the stream (or the call chain), as it is never used
later on, so it is better to not return it if it is not used (it
could be abused).
Change-Id: I78558671b82aedb34bd0f37bf7781c47ebf1cf5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157235
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 872dbfd98618..d50023be1c17 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -265,7 +265,7 @@ public:
{}
OUString writeToStorage(Graphic const& rGraphic, bool bRelPathToMedia =
false);
- OUString writeBlip(Graphic const& rGraphic, std::vector<model::BlipEffect>
const& rEffects, bool bRelPathToMedia = false);
+ void writeBlip(Graphic const& rGraphic, std::vector<model::BlipEffect>
const& rEffects, bool bRelPathToMedia = false);
};
class OOX_DLLPUBLIC DrawingML
@@ -350,7 +350,7 @@ public:
void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; }
/// If bRelPathToMedia is true add "../" to image folder path while adding
the image relationship
- OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia =
false );
+ OUString writeGraphicToStorage( const Graphic &rGraphic , bool
bRelPathToMedia = false );
void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteColor( const OUString& sColorSchemeName, const
css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32
nAlpha = MAX_PERCENT );
@@ -420,7 +420,7 @@ public:
void WriteLinespacing(const css::style::LineSpacing& rLineSpacing, float
fFirstCharHeight);
- OUString WriteXGraphicBlip(css::uno::Reference<css::beans::XPropertySet>
const & rXPropSet,
+ void WriteXGraphicBlip(css::uno::Reference<css::beans::XPropertySet> const
& rXPropSet,
css::uno::Reference<css::graphic::XGraphic>
const & rxGraphic,
bool bRelPathToMedia);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 98496aa2c1f8..41b6fe8d4838 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1283,11 +1283,9 @@ const char* DrawingML::GetRelationCompPrefix() const
return getRelationCompPrefix(meDocumentType);
}
-OUString GraphicExport::writeBlip(Graphic const& rGraphic,
std::vector<model::BlipEffect> const& rEffects, bool bRelPathToMedia)
+void GraphicExport::writeBlip(Graphic const& rGraphic,
std::vector<model::BlipEffect> const& rEffects, bool bRelPathToMedia)
{
- OUString sRelId;
-
- sRelId = writeToStorage(rGraphic, bRelPathToMedia);
+ OUString sRelId = writeToStorage(rGraphic, bRelPathToMedia);
mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
@@ -1401,8 +1399,6 @@ OUString GraphicExport::writeBlip(Graphic const&
rGraphic, std::vector<model::Bl
}
mpFS->endElementNS(XML_a, XML_blip);
-
- return sRelId;
}
OUString GraphicExport::writeToStorage(const Graphic& rGraphic , bool
bRelPathToMedia)
@@ -1533,10 +1529,10 @@ OUString GraphicExport::writeToStorage(const Graphic&
rGraphic , bool bRelPathTo
return sRelId;
}
-OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia
)
+OUString DrawingML::writeGraphicToStorage( const Graphic& rGraphic , bool
bRelPathToMedia )
{
- GraphicExport exporter(mpFS, mpFB, meDocumentType);
- return exporter.writeToStorage(rGraphic, bRelPathToMedia);
+ GraphicExport aExporter(mpFS, mpFB, meDocumentType);
+ return aExporter.writeToStorage(rGraphic, bRelPathToMedia);
}
void DrawingML::WriteMediaNonVisualProperties(const
css::uno::Reference<css::drawing::XShape>& xShape)
@@ -1699,17 +1695,17 @@ void
DrawingML::WriteImageBrightnessContrastTransparence(uno::Reference<beans::X
}
}
-OUString DrawingML::WriteXGraphicBlip(uno::Reference<beans::XPropertySet>
const & rXPropSet,
+void DrawingML::WriteXGraphicBlip(uno::Reference<beans::XPropertySet> const &
rXPropSet,
uno::Reference<graphic::XGraphic> const
& rxGraphic,
bool bRelPathToMedia)
{
OUString sRelId;
if (!rxGraphic.is())
- return sRelId;
+ return;
Graphic aGraphic(rxGraphic);
- sRelId = WriteImage(aGraphic, bRelPathToMedia);
+ sRelId = writeGraphicToStorage(aGraphic, bRelPathToMedia);
mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
@@ -1718,8 +1714,6 @@ OUString
DrawingML::WriteXGraphicBlip(uno::Reference<beans::XPropertySet> const
WriteArtisticEffect(rXPropSet);
mpFS->endElementNS(XML_a, XML_blip);
-
- return sRelId;
}
void DrawingML::WriteXGraphicBlipMode(uno::Reference<beans::XPropertySet>
const & rXPropSet,
@@ -3171,12 +3165,12 @@ void DrawingML::WriteParagraphNumbering(const
Reference< XPropertySet >& rXPropS
BitmapEx aDestBitmap(Bitmap(aDestSize, vcl::PixelFormat::N24_BPP),
aMask);
aDestBitmap.CopyPixel(aDestRect, aSourceRect, &aSourceBitmap);
Graphic aDestGraphic(aDestBitmap);
- sRelationId = WriteImage(aDestGraphic);
+ sRelationId = writeGraphicToStorage(aDestGraphic);
fBulletSizeRel = 1.0f;
}
else
{
- sRelationId = WriteImage(aGraphic);
+ sRelationId = writeGraphicToStorage(aGraphic);
}
mpFS->singleElementNS( XML_a, XML_buSzPct,
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 5923e13d0def..d0d4774d94fb 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -726,7 +726,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const tools::Rectangle&
const uno::Reference<graphic::XGraphic>& xGraphic
= pSdrGrafObj->getSignatureLineUnsignedGraphic();
Graphic aGraphic(xGraphic);
- OUString aImageId =
m_pTextExport->GetDrawingML().WriteImage(aGraphic, false);
+ OUString aImageId =
m_pTextExport->GetDrawingML().writeGraphicToStorage(aGraphic, false);
pAttrList->add(FSNS(XML_r, XML_id), aImageId);
imageData = true;
}
@@ -740,7 +740,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const tools::Rectangle&
aStream.Seek(0);
Graphic aGraphic;
GraphicConverter::Import(aStream, aGraphic);
- OUString aImageId =
m_pTextExport->GetDrawingML().WriteImage(aGraphic, false);
+ OUString aImageId =
m_pTextExport->GetDrawingML().writeGraphicToStorage(aGraphic, false);
pAttrList->add(FSNS(XML_r, XML_id), aImageId);
imageData = true;
}
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index c7926a9b6f12..87ef6e9ff964 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -438,7 +438,7 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm )
sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetCurrentStream();
DrawingML aDML(pWorksheet, &rStrm, drawingml::DOCUMENT_XLSX);
- OUString rId = aDML.WriteImage( maGraphic );
+ OUString rId = aDML.writeGraphicToStorage(maGraphic);
pWorksheet->singleElement(XML_picture, FSNS(XML_r, XML_id), rId);
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 683457983c20..7839f70cfa76 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5209,7 +5209,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
aGraphic = *pOLENode->GetGraphic();
m_rDrawingML.SetFS(m_pSerializer); // to be sure that we write to the
right stream
- OUString aImageId = m_rDrawingML.WriteImage(aGraphic, false);
+ OUString aImageId = m_rDrawingML.writeGraphicToStorage(aGraphic,
false);
aRelId = OUStringToOString(aImageId, RTL_TEXTENCODING_UTF8);
nImageType = XML_embed;
@@ -5840,7 +5840,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
// write preview image
const Graphic* pGraphic = rNode.GetGraphic();
m_rDrawingML.SetFS(m_pSerializer);
- OUString sImageId = m_rDrawingML.WriteImage( *pGraphic );
+ OUString sImageId = m_rDrawingML.writeGraphicToStorage(*pGraphic);
if ( sDrawAspect == "Content" )
{
@@ -10211,7 +10211,7 @@ void DocxAttributeOutput::BulletDefinition(int nId,
const Graphic& rGraphic, Siz
XML_style, aStyle,
FSNS(XML_o, XML_bullet), "t");
- OUString aRelId = m_rDrawingML.WriteImage(rGraphic);
+ OUString aRelId = m_rDrawingML.writeGraphicToStorage(rGraphic);
m_pSerializer->singleElementNS( XML_v, XML_imagedata,
FSNS(XML_r, XML_id), aRelId,
FSNS(XML_o, XML_title), "");
