[Libreoffice-commits] core.git: svtools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 30 22:07:03 UTC 2018
svtools/source/misc/embedhlp.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4fa9e6f7f891b335ae1b432e0848c1e46c8fe3ef
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Tue Oct 30 18:49:53 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Oct 30 23:06:37 2018 +0100
svtools: fix up misleading indentation
The intention was to only conditionally warn. Thanks Noel for spotting
my mistake.
Change-Id: Iaa035dba1f834c13a179ef66c3f39777f3843bdb
Reviewed-on: https://gerrit.libreoffice.org/62641
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index f321f0ed4b1a..fa7f7b791b1d 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -432,11 +432,13 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
}
if (bUpdate && !*mpImpl->pGraphic && aOldGraphic)
+ {
// We used to have an old graphic, tried to update and the update
// failed. Go back to the old graphic instead of having no graphic at
// all.
(*mpImpl->pGraphic) = aOldGraphic;
SAL_WARN("svtools.misc", "EmbeddedObjectRef::GetReplacement: update failed");
+ }
}
const Graphic* EmbeddedObjectRef::GetGraphic() const
More information about the Libreoffice-commits
mailing list