Paragraph related part of Background Tab is unused now

For paragraphs Area Tab is used for setting background.

Change-Id: I83859a1b2125374b81c084cfa45487a42adcd5a6

cui/source/inc/backgrnd.hxx

@@ -30,7 +30,6 @@
 class BackgroundPreviewImpl;
 class SvxOpenGraphicDialog;
 struct SvxBackgroundTable_Impl;
-struct SvxBackgroundPara_Impl;
 struct SvxBackgroundPage_Impl;
 class SvxBrushItem;
 
@@ -62,8 +61,6 @@ public:
     void                ShowSelector();
     /// for the Writer (cells/rows/tables)
     void                ShowTblControl();
-    /// for the Writer (paragraph/characters)
-    void                ShowParaControl(bool bCharOnly = false);
 
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 protected:
@@ -79,7 +76,6 @@ private:
     VclPtr<ListBox>                m_pLbSelect;
     VclPtr<FixedText>              m_pTblDesc;
     VclPtr<ListBox>                m_pTblLBox;
-    VclPtr<ListBox>                m_pParaLBox;
 
     VclPtr<FixedText>              m_pBackGroundColorLabelFT;
     VclPtr<VclFrame>               m_pBackGroundColorFrame;
@@ -120,7 +116,6 @@ private:
     SvxOpenGraphicDialog* pImportDlg;
 
     SvxBackgroundTable_Impl*    pTableBck_Impl;///< Items for Sw-Table must be corrected
-    SvxBackgroundPara_Impl* pParaBck_Impl;///< also for the paragraph style
     std::unique_ptr<SvxBrushItem> pHighlighting;
 
     void                FillColorValueSets_Impl();
@@ -144,7 +139,6 @@ private:
     DECL_LINK( FileClickHdl_Impl, CheckBox* );
     DECL_LINK(BackgroundColorHdl_Impl, void *);
     DECL_LINK( TblDestinationHdl_Impl, ListBox* );
-    DECL_LINK( ParaDestinationHdl_Impl, ListBox* );
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX

cui/uiconfig/ui/backgroundpage.ui

@@ -97,21 +97,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkComboBoxText" id="paralb">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
-                <items>
-                  <item translatable="yes">Paragraph</item>
-                  <item translatable="yes">Character</item>
-                </items>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="left_attach">3</property>

include/svx/flagsdef.hxx

@@ -42,7 +42,6 @@ enum class SvxBackgroundTabFlags
 {
     NONE                = 0x00,
     SHOW_SELECTOR       = 0x01,
-    SHOW_PARACTL        = 0x02,
     SHOW_TBLCTL         = 0x08,
     SHOW_HIGHLIGHTING   = 0x10,
 };

include/svx/svxids.hrc

@@ -584,7 +584,6 @@
 
 // CAUTION! Range <587 .. 587> used by EditEngine (!)
 
-#define SID_PARA_BACKGRND_DESTINATION                   ( SID_SVX_START + 590 )
 
 // CAUTION! Range <591 .. 591> used by EditEngine (!)
 

svx/source/dialog/srchdlg.cxx

@@ -1911,8 +1911,6 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
     sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
     pWhRanges[nPos++] = nBrushWhich;
     pWhRanges[nPos++] = nBrushWhich;
-    pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION;
-    pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION;
     pWhRanges[nPos] = 0;
     SfxItemPool& rPool = pSh->GetPool();
     SfxItemSet aSet( rPool, pWhRanges.get() );
@@ -1920,7 +1918,6 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
 
     aSet.InvalidateAllItems();
     aSet.Put(SvxBrushItem(nBrushWhich));
-    aSet.Put(SfxUInt16Item(SID_PARA_BACKGRND_DESTINATION, PARA_DEST_CHAR));
 
     if ( bSearch )
     {

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 )

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 );
     }

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: