coverity#1323757 Dereference before null check

Change-Id: I5353b78b6961d28fb3f42e5f2073e9a83ac1037c (cherry picked from commit 13fdf04f)

coverity#1323757 Dereference before null check
Change-Id: I5353b78b6961d28fb3f42e5f2073e9a83ac1037c (cherry picked from commit 13fdf04f)
3dfdf8c1 · Caolán McNamara · Miklos Vajna · f3f09557 · 3dfdf8c1
Kaydet (Commit) 3dfdf8c1 authored Eyl 10, 2015 tarafından Caolán McNamara Kaydeden (comit) Miklos Vajna Kas 18, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 16 deletions

unomod.cxx sw/source/uibase/uno/unomod.cxx +22 -16

No files found.
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -706,33 +706,39 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
        break;
        case HANDLE_VIEWSET_ONLINE_LAYOUT :
        {
-            SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
-            if (pView && !bVal != !aOpt.getBrowseMode())
+            if ( pView )
            {
-                aOpt.setBrowseMode( bVal );
-                pView->GetWrtShell().ApplyViewOptions( aOpt );
+                SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
+                if (!bVal != !aOpt.getBrowseMode())
+                {
+                    aOpt.setBrowseMode( bVal );
+                    pView->GetWrtShell().ApplyViewOptions( aOpt );

-                // must be set in mpViewOption as this will overwrite settings in _post!
-                if(mpViewOption)
-                    mpViewOption->setBrowseMode(bVal);
+                    // must be set in mpViewOption as this will overwrite settings in _post!
+                    if(mpViewOption)
+                        mpViewOption->setBrowseMode(bVal);

-                pView->GetDocShell()->ToggleLayoutMode(pView);
+                    pView->GetDocShell()->ToggleLayoutMode(pView);
+                }
            }
        }
        break;
        case HANDLE_VIEWSET_HIDE_WHITESPACE:
        {
-            SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
-            if (pView && !bVal != !aOpt.IsHideWhitespaceMode())
+            if ( pView )
            {
-                aOpt.SetHideWhitespaceMode( bVal );
-                pView->GetWrtShell().ApplyViewOptions( aOpt );
+                SwViewOption aOpt(*pView->GetWrtShell().GetViewOptions());
+                if (!bVal != !aOpt.IsHideWhitespaceMode())
+                {
+                    aOpt.SetHideWhitespaceMode( bVal );
+                    pView->GetWrtShell().ApplyViewOptions( aOpt );

-                // must be set in mpViewOption as this will overwrite settings in _post!
-                if(mpViewOption)
-                    mpViewOption->SetHideWhitespaceMode(bVal);
+                    // must be set in mpViewOption as this will overwrite settings in _post!
+                    if(mpViewOption)
+                        mpViewOption->SetHideWhitespaceMode(bVal);

-                pView->GetDocShell()->ToggleLayoutMode(pView);
+                    pView->GetDocShell()->ToggleLayoutMode(pView);
+                }
            }
        }
        break;