summaryrefslogtreecommitdiff
path: root/writerperfect/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-02 14:31:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-02 22:01:00 +0200
commit64106353c98e8cb0c99c9e4ff509348edf8ed911 (patch)
treea15af34219de10df7609457fadd3a73d9960b5d8 /writerperfect/source
parent92fc91bbb865af2888a0717cdaef5e2af5b4b719 (diff)
Just use Any ctor instead of makeAny in writerperfect
(which needs one more false loplugin:redundantfcast suppression case) Change-Id: Ib8a72a510384f497bddaef5b812a46ea473481d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133703 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'writerperfect/source')
-rw-r--r--writerperfect/source/writer/EPUBExportFilter.cxx4
-rw-r--r--writerperfect/source/writer/EPUBPackage.cxx2
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx5
3 files changed, 6 insertions, 5 deletions
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx
index 129d2941c795..cdd7d1d2cb82 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -111,9 +111,9 @@ sal_Bool EPUBExportFilter::filter(const uno::Sequence<beans::PropertyValue>& rDe
{ OUString(), 0, uno::Type(), 0, 0 } };
uno::Reference<beans::XPropertySet> xInfoSet(
comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(aInfoMap)));
- xInfoSet->setPropertyValue("BaseURI", uno::makeAny(aSourceURL));
+ xInfoSet->setPropertyValue("BaseURI", uno::Any(aSourceURL));
- xInitialization->initialize({ uno::makeAny(xExportHandler), uno::makeAny(xInfoSet) });
+ xInitialization->initialize({ uno::Any(xExportHandler), uno::Any(xInfoSet) });
uno::Reference<document::XExporter> xExporter(xInitialization, uno::UNO_QUERY);
xExporter->setSourceDocument(mxSourceDocument);
uno::Reference<document::XFilter> xFilter(xInitialization, uno::UNO_QUERY);
diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx
index 476c3a94625a..727a8ed7e3de 100644
--- a/writerperfect/source/writer/EPUBPackage.cxx
+++ b/writerperfect/source/writer/EPUBPackage.cxx
@@ -52,7 +52,7 @@ EPUBPackage::EPUBPackage(uno::Reference<uno::XComponentContext> xContext,
// MIME type must be uncompressed.
uno::Reference<beans::XPropertySet> xPropertySet(mxOutputStream, uno::UNO_QUERY);
- xPropertySet->setPropertyValue("Compressed", uno::makeAny(false));
+ xPropertySet->setPropertyValue("Compressed", uno::Any(false));
mxOutputStream.clear();
}
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 3efd6eab7ddd..ae7b33518eed 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -286,8 +286,9 @@ void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage& rPage, bo
if (!xSaxWriter.is())
return;
- uno::Sequence<uno::Any> aArguments = { uno::makeAny<uno::Sequence<beans::PropertyValue>>(
- { comphelper::makePropertyValue("DTDString", false) }) };
+ // [-loplugin:redundantfcast] false positive:
+ uno::Sequence<uno::Any> aArguments = { uno::Any(uno::Sequence<beans::PropertyValue>(
+ { comphelper::makePropertyValue("DTDString", false) })) };
uno::Reference<svg::XSVGWriter> xSVGWriter(
xCtx->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.svg.SVGWriter", aArguments, xCtx),