diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 21:39:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 09:59:04 +0200 |
commit | 9c111cc4302bf344b4093693e64833d6bd870602 (patch) | |
tree | 7d59d01fe41dd7af996e33d2a0cd72a4b64e3c71 /starmath | |
parent | b1ea5cc2ee0b50651c7cac4d85a49a199693ed1c (diff) |
Just use Any ctor instead of makeAny in starmath
Change-Id: I8264c2330837fbd46ea372a8e370bb43ca1fb7b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133775
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/mathml/export.cxx | 6 | ||||
-rw-r--r-- | starmath/source/mathml/import.cxx | 6 | ||||
-rw-r--r-- | starmath/source/mathml/mathmlexport.cxx | 6 | ||||
-rw-r--r-- | starmath/source/mathml/mathmlimport.cxx | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/starmath/source/mathml/export.cxx b/starmath/source/mathml/export.cxx index b7b7d6c82733..7115e7a1a8f3 100644 --- a/starmath/source/mathml/export.cxx +++ b/starmath/source/mathml/export.cxx @@ -144,7 +144,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium) xInfoSet->setPropertyValue("UsePrettyPrinting", Any(true)); // Set base URI - xInfoSet->setPropertyValue(u"BaseURI", makeAny(rMedium.GetBaseURL(true))); + xInfoSet->setPropertyValue(u"BaseURI", Any(rMedium.GetBaseURL(true))); if (!m_bFlat) //Storage (Package) of Stream { @@ -165,7 +165,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium) { OUString aName = pDocHierarchItem->GetValue(); if (!aName.isEmpty()) - xInfoSet->setPropertyValue("StreamRelPath", makeAny(aName)); + xInfoSet->setPropertyValue("StreamRelPath", Any(aName)); } } else @@ -395,7 +395,7 @@ bool SmMLExportWrapper::WriteThroughComponentS(const Reference<embed::XStorage>& xSet->setPropertyValue("UseCommonStoragePasswordEncryption", Any(true)); // set Base URL - rPropSet->setPropertyValue("StreamName", makeAny(OUString(pStreamName))); + rPropSet->setPropertyValue("StreamName", Any(OUString(pStreamName))); // write the stuff // Note: export through an XML exporter component (output stream version) diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx index ea3f63eee264..950bbff4dfe3 100644 --- a/starmath/source/mathml/import.cxx +++ b/starmath/source/mathml/import.cxx @@ -156,7 +156,7 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium) // Set base URI // needed for relative URLs; but it's OK to import e.g. MathML from the clipboard without one SAL_INFO_IF(rMedium.GetBaseURL().isEmpty(), "starmath", "SmMLImportWrapper: no base URL"); - xInfoSet->setPropertyValue("BaseURI", makeAny(rMedium.GetBaseURL())); + xInfoSet->setPropertyValue("BaseURI", Any(rMedium.GetBaseURL())); // Fetch progress range sal_Int32 nProgressRange(rMedium.IsStorage() ? 3 : 1); @@ -182,7 +182,7 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium) } if (!aName.isEmpty()) - xInfoSet->setPropertyValue("StreamRelPath", makeAny(aName)); + xInfoSet->setPropertyValue("StreamRelPath", Any(aName)); } // Check if use OASIS ( new document format ) @@ -535,7 +535,7 @@ ErrCode SmMLImportWrapper::ReadThroughComponentS(const uno::Reference<embed::XSt aAny >>= bEncrypted; // Set base URL and open stream - rPropSet->setPropertyValue("StreamName", makeAny(OUString(pStreamName))); + rPropSet->setPropertyValue("StreamName", Any(OUString(pStreamName))); Reference<io::XInputStream> xStream = xEventsStream->getInputStream(); // Execute read diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx index b52b447b3439..142ba6fd665c 100644 --- a/starmath/source/mathml/mathmlexport.cxx +++ b/starmath/source/mathml/mathmlexport.cxx @@ -148,7 +148,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) // Set base URI OUString sPropName("BaseURI"); - xInfoSet->setPropertyValue(sPropName, makeAny(rMedium.GetBaseURL(true))); + xInfoSet->setPropertyValue(sPropName, Any(rMedium.GetBaseURL(true))); sal_Int32 nSteps = 0; if (xStatusIndicator.is()) @@ -173,7 +173,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) if (!aName.isEmpty()) { sPropName = "StreamRelPath"; - xInfoSet->setPropertyValue(sPropName, makeAny(aName)); + xInfoSet->setPropertyValue(sPropName, Any(aName)); } } @@ -300,7 +300,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(const Reference<embed::XStorage>& // set Base URL if (rPropSet.is()) { - rPropSet->setPropertyValue("StreamName", makeAny(sStreamName)); + rPropSet->setPropertyValue("StreamName", Any(sStreamName)); } // write the stuff diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index f8c845e93dee..6020b5ffb044 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -144,7 +144,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) // needed for relative URLs; but it's OK to import e.g. MathML from the // clipboard without one SAL_INFO_IF(baseURI.isEmpty(), "starmath", "SmXMLImportWrapper: no base URL"); - xInfoSet->setPropertyValue("BaseURI", makeAny(baseURI)); + xInfoSet->setPropertyValue("BaseURI", Any(baseURI)); sal_Int32 nSteps = 3; if (!(rMedium.IsStorage())) @@ -176,7 +176,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) if (!aName.isEmpty()) { - xInfoSet->setPropertyValue("StreamRelPath", makeAny(aName)); + xInfoSet->setPropertyValue("StreamRelPath", Any(aName)); } } @@ -374,7 +374,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(const uno::Reference<embed::XSt // set Base URL if (rPropSet.is()) { - rPropSet->setPropertyValue("StreamName", makeAny(sStreamName)); + rPropSet->setPropertyValue("StreamName", Any(sStreamName)); } Reference<io::XInputStream> xStream = xEventsStream->getInputStream(); |