diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-08-08 14:35:25 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-08-08 14:36:40 +0200 |
commit | f71f962af74ceceb51c6ada5ea616c7cff576c2b (patch) | |
tree | 17ce6946ff4e70e817a1fb85112470e074f06047 | |
parent | revert this and rely on changed SAL_ALLOW_LINKOO_SYMLINKS behaviour (diff) | |
download | core-f71f962af74ceceb51c6ada5ea616c7cff576c2b.tar.gz core-f71f962af74ceceb51c6ada5ea616c7cff576c2b.zip |
fix crash and fix rtl logic
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 8 |
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() ) { |