summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2011-08-08 14:35:25 +0200
committerLuboš Luňák <l.lunak@suse.cz>2011-08-08 14:36:40 +0200
commitf71f962af74ceceb51c6ada5ea616c7cff576c2b (patch)
tree17ce6946ff4e70e817a1fb85112470e074f06047 /sw
parent6773616a235fbc55272a64c0e5718278bd007c39 (diff)
fix crash and fix rtl logic
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7c08c39279d1..89cbd7c5bd6c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3619,12 +3619,12 @@ void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
const SfxItemSet* pItems = GetExport().GetCurItemSet();
const SvxFrameDirectionItem* rFrameDir = static_cast< const SvxFrameDirectionItem* >( pItems->GetItem( RES_FRAMEDIR ) );
- bool bRtl = false;
- short nDir = rFrameDir->GetValue();
- bRtl = ( nDir == FRMDIR_HORI_RIGHT_TOP );
-
+ short nDir = FRMDIR_ENVIRONMENT;
+ if( rFrameDir != NULL )
+ nDir = rFrameDir->GetValue();
if ( nDir == FRMDIR_ENVIRONMENT )
nDir = GetExport( ).GetDefaultFrameDirection( );
+ bool bRtl = ( nDir == FRMDIR_HORI_RIGHT_TOP );
switch ( rAdjust.GetAdjust() )
{