Kaydet (Commit) 68484613 authored tarafından Michael Stahl's avatar Michael Stahl

editeng: wrong default item for EE_PARA_HANGINGPUNCTUATION

Change-Id: Ib23b5847625964c701bda23d7c58ad32c6024c9b
üst 79f4b7a7
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <editeng/flditem.hxx> #include <editeng/flditem.hxx>
#include <editeng/emphasismarkitem.hxx> #include <editeng/emphasismarkitem.hxx>
#include <editeng/scriptspaceitem.hxx> #include <editeng/scriptspaceitem.hxx>
#include <editeng/hngpnctitem.hxx>
#include <editeng/numdef.hxx> #include <editeng/numdef.hxx>
#include <svl/itempool.hxx> #include <svl/itempool.hxx>
#include <svl/grabbagitem.hxx> #include <svl/grabbagitem.hxx>
...@@ -105,7 +106,7 @@ SfxPoolItem** GlobalEditData::GetDefItems() ...@@ -105,7 +106,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ); ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS ); ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, false ); ppDefItems[2] = new SvxHangingPunctuationItem(false, EE_PARA_HANGINGPUNCTUATION);
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, true ); ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, true );
ppDefItems[4] = new SvxScriptSpaceItem( true, EE_PARA_ASIANCJKSPACING ); ppDefItems[4] = new SvxScriptSpaceItem( true, EE_PARA_ASIANCJKSPACING );
ppDefItems[5] = new SvxNumBulletItem( aDefaultNumRule, EE_PARA_NUMBULLET ); ppDefItems[5] = new SvxNumBulletItem( aDefaultNumRule, EE_PARA_NUMBULLET );
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "svx/xattr.hxx" #include "svx/xattr.hxx"
#include <svx/svdetc.hxx> #include <svx/svdetc.hxx>
#include <editeng/bulletitem.hxx> #include <editeng/bulletitem.hxx>
#include <editeng/hngpnctitem.hxx>
#include <svx/polysc3d.hxx> #include <svx/polysc3d.hxx>
#include <svx/extrud3d.hxx> #include <svx/extrud3d.hxx>
#include <svx/svdoashp.hxx> #include <svx/svdoashp.hxx>
...@@ -6165,7 +6166,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& ...@@ -6165,7 +6166,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
if ( GetAttrib( PPT_ParaAttr_AsianLB_1, nVal, nDestinationInstance ) ) if ( GetAttrib( PPT_ParaAttr_AsianLB_1, nVal, nDestinationInstance ) )
rSet.Put( SfxBoolItem( EE_PARA_FORBIDDENRULES, nVal != 0 ) ); rSet.Put( SfxBoolItem( EE_PARA_FORBIDDENRULES, nVal != 0 ) );
if ( GetAttrib( PPT_ParaAttr_AsianLB_3, nVal, nDestinationInstance ) ) if ( GetAttrib( PPT_ParaAttr_AsianLB_3, nVal, nDestinationInstance ) )
rSet.Put( SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, nVal != 0 ) ); rSet.Put(SvxHangingPunctuationItem(nVal != 0, EE_PARA_HANGINGPUNCTUATION));
if ( GetAttrib( PPT_ParaAttr_BiDi, nVal, nDestinationInstance ) ) if ( GetAttrib( PPT_ParaAttr_BiDi, nVal, nDestinationInstance ) )
rSet.Put( SvxFrameDirectionItem( nVal == 1 ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) ); rSet.Put( SvxFrameDirectionItem( nVal == 1 ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment