[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - filter/source

[Andras Timar]

 filter/source/svg/svgexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d70884569c5ed09675c3b3f50117aa54636cc479
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 23 12:56:35 2014 +0200

    Resolves: fdo#62682 crash on second export of svg
    
    because the first export has left "dangling" CalcFieldValueHdl Links in
    Outliners that got created based on the Drawing Outliner while it had a
    temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl
    installed when the old Drawing Outliner one was re-installed.
    
    (cherry picked from commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff)
    
    Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 4265f35..e6cf93a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -619,7 +619,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
                         //the maOldFieldHdl for all that have ended up using
                         //maNewFieldHdl
                         std::vector<SdrOutliner*> aOutliners(mpSdrModel->GetActiveOutliners());
-                        for (auto aIter = aOutliners.begin(); aIter != aOutliners.end(); ++aIter)
+                        for (std::vector<SdrOutliner*>::iterator aIter = aOutliners.begin(); aIter != aOutliners.end(); ++aIter)
                         {
                             SdrOutliner* pOutliner = *aIter;
                             if (maNewFieldHdl == pOutliner->GetCalcFieldValueHdl())