[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/core/text/EnhancedPDFExportHelper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b78c67c56500955a65c5f982a77d14fb451f9cf0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 12:39:38 2011 +0300

    Typo
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 880651e..7518da3 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -381,7 +381,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
             {
                 FrmTagIdMap& rFrmTagIdMap = SwEnhancedPDFExportHelper::GetFrmTagIdMap();
                 const FrmTagIdMap::const_iterator aIter =  rFrmTagIdMap.find( pKey );
-                if ( aIterm != rFrmTagIdMap.end() )
+                if ( aIter != rFrmTagIdMap.end() )
                     nReopenTag = (*aIter).second;
             }
         }
commit 47a0a2e765aa7f364e4dd373b2779cc4f20a17c6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 12:00:57 2011 +0300

    Add iterator sanity check, seems to fix fdo#36820
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 8090509..880651e 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -381,7 +381,8 @@ bool SwTaggedPDFHelper::CheckReopenTag()
             {
                 FrmTagIdMap& rFrmTagIdMap = SwEnhancedPDFExportHelper::GetFrmTagIdMap();
                 const FrmTagIdMap::const_iterator aIter =  rFrmTagIdMap.find( pKey );
-                nReopenTag = (*aIter).second;
+                if ( aIterm != rFrmTagIdMap.end() )
+                    nReopenTag = (*aIter).second;
             }
         }
     }