summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-23 09:49:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-23 09:53:34 +0100
commit73c24e114bbbeaf9e7320bde43f6f07bed01f25b (patch)
tree041d8981bd39e1e7d58f421bde19da9413c973c7
parentc2ba881c00a1cc7b509c5777e2d4655d6bef558a (diff)
Resolves: fdo#68372 crash when moving the ruler
Change-Id: Ie01bdd491b41c1fbcd46dcc119afa01583ed852a
-rw-r--r--sw/source/ui/shells/textsh1.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index f700e967c4aa..15e7f7f5d5c7 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -931,10 +931,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
// Current page format
::SwToSfxPageDescAttr( aCoreSet );
- OString sDefPage;
- if (pItem)
- sDefPage = OUStringToOString(((const SfxStringItem*)pItem)->GetValue(), RTL_TEXTENCODING_UTF8);
-
// Properties of numbering
if( rWrtSh.GetDoc()->GetCurrNumRule( *pPaM->GetPoint() ) )
{
@@ -948,6 +944,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( bUseDialog && GetActiveView() )
{
+ OString sDefPage;
+ if (pItem)
+ sDefPage = OUStringToOString(((const SfxStringItem*)pItem)->GetValue(), RTL_TEXTENCODING_UTF8);
+
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");