include/unotools/tempfile.hxx | 1 - unotools/source/ucbhelper/tempfile.cxx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit 3c01b243a5c939e7cac32e7d2ec6095ace091df7 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Mon Feb 19 12:52:21 2024 +0600 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Mon Feb 19 10:03:14 2024 +0100 Unfriend SetTempNameBaseDirectory TempFileNamed: :GetURL is enough in this case. Change-Id: Id5eb66103328b063cb7dc64472fc5ba556a51109 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163578 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index a8bbcd747ff7..e67491102511 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -118,7 +118,6 @@ UNOTOOLS_DLLPUBLIC OUString GetTempNameBaseDirectory(); */ class UNOTOOLS_DLLPUBLIC TempFileNamed { -friend UNOTOOLS_DLLPUBLIC OUString SetTempNameBaseDirectory( const OUString & ); OUString aName; std::unique_ptr<SvStream> pStream; diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 1723605e2825..7a02c6bba7b1 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -567,7 +567,7 @@ OUString SetTempNameBaseDirectory( const OUString &rBaseName ) TempFileNamed aBase( {}, true ); if ( aBase.IsValid() ) // use it in case of success - gTempNameBase_Impl = ensureTrailingSlash(aBase.aName); + gTempNameBase_Impl = ensureTrailingSlash(aBase.GetURL()); // return system path of used directory osl::FileBase::getSystemPathFromFileURL(gTempNameBase_Impl, aTmp);