[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - xmloff/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 26 19:35:08 UTC 2016
xmloff/source/core/xmlmultiimagehelper.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit e153df58650cc7eb7a87de03d7228dbbaffdfcfb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 13 17:29:51 2016 +0100
-Werror=address
the original looks odd, but the code was like that ever since it got introduced
with 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 "re-base on ALv2 code. Includes
(at least) relevant parts of:"
Change-Id: I327c5a53a2634aca1b36367ee09c068ac610d3f4
(cherry picked from commit 09f1bd85d432d130cd54d329d01a020728757c2e)
Signed-off-by: David Tardon <dtardon at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/24406
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index 9a6711f..e7eeb62 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -136,10 +136,7 @@ SvXMLImportContextRef MultiImageImportHelper::solveMultipleImages()
void MultiImageImportHelper::addContent(const SvXMLImportContext& rSvXMLImportContext)
{
- if(dynamic_cast< const SvXMLImportContext* >(&rSvXMLImportContext))
- {
- maImplContextVector.push_back(SvXMLImportContextRef(const_cast< SvXMLImportContext* >(&rSvXMLImportContext)));
- }
+ maImplContextVector.push_back(SvXMLImportContextRef(const_cast< SvXMLImportContext* >(&rSvXMLImportContext)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list