diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 20:25:26 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 21:49:50 +0200 |
| commit | e030422305590084263b7490301c3b7ea356d424 (patch) | |
| tree | f8a96f0de858fb453915738d34218b4859400645 /sw | |
| parent | 16d202f29cafbdc8d0648b830d2209f5c61c878f (diff) | |
Paragraph related part of Background Tab is unused now
For paragraphs Area Tab is used for setting background.
Change-Id: I83859a1b2125374b81c084cfa45487a42adcd5a6
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docstyle.cxx | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 468b9fec1f39..e29858a40d71 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -200,11 +200,6 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent, m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA )); m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) ); - //UUUU remove? - //OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); - //OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - //m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); @@ -472,8 +467,6 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) else if (nId == m_nBackgroundId) { SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::NONE; - if( SFX_STYLE_FAMILY_PARA == nType ) - nFlagType |= SvxBackgroundTabFlags::SHOW_PARACTL; if( SFX_STYLE_FAMILY_CHAR != nType ) nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR; if( SFX_STYLE_FAMILY_CHAR == nType ) diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 77e79afc13a8..3c76f2564644 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -751,8 +751,6 @@ sal_uInt16 SwDocShell::Edit( { SfxItemSet& rSet = xTmp->GetItemSet(); ::SwToSfxPageDescAttr( rSet ); - // firstly only a Zero - rSet.Put(SwBackgroundDestinationItem(SID_PARA_BACKGRND_DESTINATION, 0)); // merge list level indent attributes into the item set if needed xTmp->MergeIndentAttrsOfListStyle( rSet ); } diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 578445b7779d..6aeb0fbfb5f5 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -407,7 +407,7 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument, SID_SWREGISTER_COLLECTION, SID_SWREGISTER_COLLECTION, // [10451 SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM, // [10457 SID_SWREGISTER_MODE, SID_SWREGISTER_MODE, // [10467 - SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR, // [10590 + SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR, // [10590 SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE, // [10855 SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE, // [12065 FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, // [21123 @@ -803,7 +803,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) switch ( pItem->Which() ) { case SID_ATTR_AUTO_STYLE_UPDATE: - case SID_PARA_BACKGRND_DESTINATION: case RES_PAGEDESC: //CTL not yet supported case RES_CHRATR_CTL_FONT: |