3 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 69e5ed9cb688..c9f300379892 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -119,7 +119,8 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     if( bSaveUndo )
     {
         // the reading of the page template cannot be undone!
-        if( ( bReadPageDescs = po->aOpt.IsPageDescs() ) )
+        bReadPageDescs = po->aOpt.IsPageDescs();
+        if( bReadPageDescs )
         {
             bSaveUndo = false;
             pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7d81018855be..9b4fac0e3d48 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -593,10 +593,13 @@ void SwHTMLParser::Continue( int nToken )
     }
 
     m_bSetModEnabled = false;
-    if( m_pDoc->GetDocShell() &&
-        (m_bSetModEnabled = m_pDoc->GetDocShell()->IsEnableSetModified()) )
+    if( m_pDoc->GetDocShell() )
     {
-        m_pDoc->GetDocShell()->EnableSetModified( false );
+        m_bSetModEnabled = m_pDoc->GetDocShell()->IsEnableSetModified();
+        if( m_bSetModEnabled )
+        {
+            m_pDoc->GetDocShell()->EnableSetModified( false );
+        }
     }
 
     // waehrend des einlesens kein OLE-Modified rufen
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 90e60214fd84..08099375f463 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -287,7 +287,8 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic,
     if (nData > 0)
     {
         rpGraphic = new Graphic();
-        if (!(bOk = SwWW8ImplReader::GetPictGrafFromStream(*rpGraphic, *pSt)))
+        bOk = SwWW8ImplReader::GetPictGrafFromStream(*rpGraphic, *pSt);
+        if (!bOk)
             DELETEZ(rpGraphic);
     }
     return bOk; // Contains graphic