once more unto the breech dear fellows

workaround GCC4.8 issue

Change-Id: Iea4d10a02a114ce94e0219e8b89acf48db5411d0

2 files changed, 2 insertions, 3 deletions

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 66d20b44227a..6c7235d87943 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -452,14 +452,13 @@ void DrawXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* >
 
         elem.Children.splice( elem.Children.end(), pNext->Children );
         // workaround older compilers that do not have std::list::erase(const_iterator)
-#if defined __GNUC__ == 4 && __GNUC_MINOR__ <= 8
+#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8
         std::list< Element* >::iterator tmpIt = elem.Parent->Children.begin();
         std::advance(tmpIt, std::distance(elem.Parent->Children.cbegin(), next_it));
         elem.Parent->Children.erase(tmpIt);
 #else
         elem.Parent->Children.erase(next_it);
 #endif
-
         delete pNext;
     }
 }
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 4759b1983aa2..82f8c38bc27e 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -403,7 +403,7 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element*
 
         elem.Children.splice( elem.Children.end(), pNext->Children );
         // workaround older compilers that do not have std::list::erase(const_iterator)
-#if defined __GNUC__ == 4 && __GNUC_MINOR__ <= 8
+#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8
         std::list< Element* >::iterator tmpIt = elem.Parent->Children.begin();
         std::advance(tmpIt, std::distance(elem.Parent->Children.cbegin(), next_it));
         elem.Parent->Children.erase(tmpIt);