diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-01-10 19:37:05 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-01-14 12:21:51 +0100 |
| commit | afa109d947c811cdce15413fdb536dc4bd90526b (patch) | |
| tree | 243f8d577d1d4aab127bf23336cef796d14560a8 /unotools | |
| parent | 58d4b1aae1a599322b27ec388b62d8a6ed158ef9 (diff) | |
tdf#146375 Cannot rename user-defined categories in template manager
Regression from
commit 3624a703361b108d22448bd60a97733f05e37820
tdf#135316 remove OTempFileService pessimisation
So fix two things here
(1) make it so the tempfile service flushes the SvStream buffer
and resets the file position, so we can read the data
after writing it.
(2) Simplify the UCB usage to just write the contents of the tempfile
via the tempfile InputStream, which is simpler and safer
Change-Id: I15ed3b02c2d6415d10a9579f66374e6268188d5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128195
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128274
Tested-by: Jenkins
(cherry picked from commit d1068539a1eb305ebcbb301f2f8f6fda0ab2d6ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128342
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/xtempfile.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 4982520abfeb..c97bb424e561 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -217,6 +217,12 @@ void SAL_CALL OTempFileService::closeOutput( ) throw css::io::NotConnectedException ( OUString(), static_cast < css::uno::XWeak * > (this ) ); mbOutClosed = true; + if (mpStream) + { + // so that if you then open the InputStream, you can read the content + mpStream->Flush(); + mpStream->Seek(0); + } if ( mbInClosed ) { |