sc/source/ui/view/tabview5.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 1e7f551b92bca8f3d2f73b39dd428ac55f2a5567
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 13 23:56:39 2015 +0200
second attempt to blind fix MSVC werror C4701,C4703
Change-Id: Ic9d8ee4a88e9bfb6586417c66fb197becd5cfa46
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 35d5a40..971fe9c 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
