summaryrefslogtreecommitdiff
path: root/sw/source/uibase/shells/basesh.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/shells/basesh.cxx')
-rw-r--r--sw/source/uibase/shells/basesh.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 67e8ecfd7b64..bb9f4a975297 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1237,11 +1237,14 @@ void SwBaseShell::Execute(SfxRequest &rReq)
default:
bMore = true;
}
- if(bMore && pArgs)
- {
- pItem = nullptr;
- pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
- if(pItem)
+
+
+ if(!bMore || !pArgs)
+ return;
+
+ pItem = nullptr;
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
+ if(pItem)
switch(nSlot)
{
case SID_ATTR_BRUSH:
@@ -1304,8 +1307,6 @@ void SwBaseShell::Execute(SfxRequest &rReq)
default:
OSL_FAIL("wrong Dispatcher");
}
-
- }
}
// Here the state for SID_IMAP / SID_CONTOUR will be handled