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

editeng: wrong default item for EE_PARA_FORBIDDENRULES

Change-Id: Idad6192fd1e3049913fac3dd906264fde6d1914e
üst 68484613
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <editeng/emphasismarkitem.hxx> #include <editeng/emphasismarkitem.hxx>
#include <editeng/scriptspaceitem.hxx> #include <editeng/scriptspaceitem.hxx>
#include <editeng/hngpnctitem.hxx> #include <editeng/hngpnctitem.hxx>
#include <editeng/forbiddenruleitem.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>
...@@ -107,7 +108,7 @@ SfxPoolItem** GlobalEditData::GetDefItems() ...@@ -107,7 +108,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 SvxHangingPunctuationItem(false, EE_PARA_HANGINGPUNCTUATION); ppDefItems[2] = new SvxHangingPunctuationItem(false, EE_PARA_HANGINGPUNCTUATION);
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, true ); ppDefItems[3] = new SvxForbiddenRuleItem(true, EE_PARA_FORBIDDENRULES);
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 );
ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, false ); ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, false );
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <svx/svdetc.hxx> #include <svx/svdetc.hxx>
#include <editeng/bulletitem.hxx> #include <editeng/bulletitem.hxx>
#include <editeng/hngpnctitem.hxx> #include <editeng/hngpnctitem.hxx>
#include <editeng/forbiddenruleitem.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>
...@@ -6164,7 +6165,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& ...@@ -6164,7 +6165,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(SvxForbiddenRuleItem(nVal != 0, EE_PARA_FORBIDDENRULES));
if ( GetAttrib( PPT_ParaAttr_AsianLB_3, nVal, nDestinationInstance ) ) if ( GetAttrib( PPT_ParaAttr_AsianLB_3, nVal, nDestinationInstance ) )
rSet.Put(SvxHangingPunctuationItem(nVal != 0, EE_PARA_HANGINGPUNCTUATION)); rSet.Put(SvxHangingPunctuationItem(nVal != 0, EE_PARA_HANGINGPUNCTUATION));
......
...@@ -810,7 +810,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r ...@@ -810,7 +810,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
rEditSet.Put( SvxPostureItem ( eCtlItalic, EE_CHAR_ITALIC_CTL ) ); rEditSet.Put( SvxPostureItem ( eCtlItalic, EE_CHAR_ITALIC_CTL ) );
rEditSet.Put( SvxContourItem ( bOutline, EE_CHAR_OUTLINE ) ); rEditSet.Put( SvxContourItem ( bOutline, EE_CHAR_OUTLINE ) );
rEditSet.Put( SvxShadowedItem ( bShadow, EE_CHAR_SHADOW ) ); rEditSet.Put( SvxShadowedItem ( bShadow, EE_CHAR_SHADOW ) );
rEditSet.Put( SfxBoolItem ( EE_PARA_FORBIDDENRULES, bForbidden ) ); rEditSet.Put( SvxForbiddenRuleItem(bForbidden, EE_PARA_FORBIDDENRULES) );
rEditSet.Put( SvxEmphasisMarkItem( eEmphasis, EE_CHAR_EMPHASISMARK ) ); rEditSet.Put( SvxEmphasisMarkItem( eEmphasis, EE_CHAR_EMPHASISMARK ) );
rEditSet.Put( SvxCharReliefItem( eRelief, EE_CHAR_RELIEF ) ); rEditSet.Put( SvxCharReliefItem( eRelief, EE_CHAR_RELIEF ) );
rEditSet.Put( SvxLanguageItem ( eLang, EE_CHAR_LANGUAGE ) ); rEditSet.Put( SvxLanguageItem ( eLang, EE_CHAR_LANGUAGE ) );
......
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