diff options
| author | Eike Rathke <erack@redhat.com> | 2015-08-13 23:56:39 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-08-13 23:57:21 +0200 |
| commit | 1e7f551b92bca8f3d2f73b39dd428ac55f2a5567 (patch) | |
| tree | ae5c3371d1fec7dfcbb2744990ff2d25f7059c0b | |
| parent | e2d31d96f645619b534465c548962b07848a55e4 (diff) | |
second attempt to blind fix MSVC werror C4701,C4703
Change-Id: Ic9d8ee4a88e9bfb6586417c66fb197becd5cfa46
| -rw-r--r-- | sc/source/ui/view/tabview5.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 35d5a408a5d3..971fe9cb0cc0 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -304,11 +304,10 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) if (comphelper::LibreOfficeKit::isActive()) { - ScDocShell* pDocSh; - ScModelObj* pModelObj; + ScDocShell* pDocSh = GetViewData().GetDocShell(); + ScModelObj* pModelObj = pDocSh ? ScModelObj::getImplementation( pDocSh->GetModel()) : nullptr; - if ( ( pDocSh = GetViewData().GetDocShell() ) != nullptr && - ( pModelObj = ScModelObj::getImplementation( pDocSh->GetModel() )) != nullptr ) + if (pModelObj) { Size aDocSize = pModelObj->getDocumentSize(); std::stringstream ss; |