svtools/source/misc/embedhlp.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit aee75c86e8100c406893dd8abaf358bf822f6e5e Author: Miklos Vajna <[email protected]> AuthorDate: Tue Oct 30 18:49:53 2018 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Oct 31 09:24:50 2018 +0100 svtools: fix up misleading indentation The intention was to only conditionally warn. Thanks Noel for spotting my mistake. Reviewed-on: https://gerrit.libreoffice.org/62641 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins (cherry picked from commit 4fa9e6f7f891b335ae1b432e0848c1e46c8fe3ef) Conflicts: svtools/source/misc/embedhlp.cxx Change-Id: Iaa035dba1f834c13a179ef66c3f39777f3843bdb diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index f4447bb1d5b1..967a6e471435 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -436,11 +436,13 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) } if (bUpdate && mpImpl->pGraphic->GetType() == GraphicType::NONE && aOldGraphic.GetType() != GraphicType::NONE) + { // 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 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
