diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/draw/eventimp.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index aced8d37b245..5fbd002b1be0 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -753,7 +753,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen if( !sRelPath.isEmpty() ) aBaseURL.insertName( sRelPath ); aBaseURL.insertName( sName ); - msOrigFileName = aBaseURL.GetMainURL(INetURLObject::DECODE_TO_IURI); + msOrigFileName = aBaseURL.GetMainURL(INetURLObject::DecodeMechanism::ToIUri); } mpImpl->mStreamName = sName; // Note: may be empty (XSLT) @@ -2152,7 +2152,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue) //#i61943# relative URLs need special handling INetURLObject aTemp( mpImpl->msPackageURI ); bool bWasAbsolute = false; - sValue = aTemp.smartRel2Abs(sValue, bWasAbsolute ).GetMainURL(INetURLObject::DECODE_TO_IURI); + sValue = aTemp.smartRel2Abs(sValue, bWasAbsolute ).GetMainURL(INetURLObject::DecodeMechanism::ToIUri); } } catch(const uno::Exception&) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 9f17b994b5aa..2cafa7e7ede3 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1679,7 +1679,7 @@ OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const INetURLObject aAbsURL; if( mpImpl->aBaseURL.GetNewAbsURL( rValue, &aAbsURL ) ) - return aAbsURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); + return aAbsURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); else return rValue; } @@ -1883,12 +1883,12 @@ SvXMLImport::GetComponentContext() const OUString SvXMLImport::GetBaseURL() const { - return mpImpl->aBaseURL.GetMainURL( INetURLObject::NO_DECODE ); + return mpImpl->aBaseURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } OUString SvXMLImport::GetDocumentBase() const { - return mpImpl->aDocBase.GetMainURL( INetURLObject::NO_DECODE ); + return mpImpl->aDocBase.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } // Convert drawing object positions from OOo file format to OASIS (#i28749#) diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 31eb727e5404..b18c8792ac38 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -251,7 +251,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons const OUString &rTmp = rImp.GetAbsoluteReference(sValue); INetURLObject::translateToInternal( rTmp, msBookmark, - INetURLObject::DECODE_UNAMBIGUOUS ); + INetURLObject::DecodeMechanism::Unambiguous ); } } break; |