[Libreoffice-commits] core.git: 2 commits - cui/source sw/source

[Jim Raykowski]

 cui/source/tabpages/backgrnd.cxx     |    6 ++++++
 sw/source/ui/dialog/uiregionsw.cxx   |    9 +++++++--
 sw/source/ui/index/cnttab.cxx        |    2 +-
 sw/source/uibase/dialog/regionsw.cxx |    2 ++
 sw/source/uibase/shells/textidx.cxx  |    1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 6a4db3a7a57926d586bb4e43ae2d77ea29847fcd
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Thu May 31 17:27:57 2018 -0800

    tdf#105225 A TOX background tab page based on the area tab page
    
    Change-Id: Icc799b98b4ebf8dee6afab98d4a353f7b03e4449
    Reviewed-on: https://gerrit.libreoffice.org/55151
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 79eeb008953c..9a24ea2cfcb6 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -299,7 +299,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
     m_nSelectId = AddTabPage("index", SwTOXSelectTabPage::Create, nullptr);
     AddTabPage("styles", SwTOXStylesTabPage::Create, nullptr);
     m_nColumnId = AddTabPage("columns", SwColumnPage::Create, nullptr);
-    m_nBackGroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr);
+    m_nBackGroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr);
     m_nEntriesId = AddTabPage("entries", SwTOXEntryTabPage::Create, nullptr);
     if(!pCurTOX)
         SetCurPageId(m_nSelectId);
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 099c5c4448fe..e6e13ad10f2a 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -110,6 +110,7 @@ void SwTextShell::ExecIdx(SfxRequest const &rReq)
                     RES_LR_SPACE, RES_LR_SPACE,
                     RES_BACKGROUND, RES_BACKGROUND,
                     RES_COL, RES_COL,
+                    XATTR_FILL_FIRST, XATTR_FILL_LAST,
                     SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
                     FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE>{});
             SwWrtShell& rSh = GetShell();
commit 94cb2ac3cb5f2c951f70c3bf6b28aad9e2c0bdb7
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Thu May 31 15:03:03 2018 -0800

    tdf#105225 A section background tab page based on the area tab page
    
    Change-Id: Ibe758cab371bc53207bd2ca617d123b7d660a774
    Reviewed-on: https://gerrit.libreoffice.org/55149
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6ad1cb6cc74a..c6e4a8952c6f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1577,6 +1577,12 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
         }
         else if (nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)
             bHighlighting = bool(nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING);
+        else if (nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR)
+        {
+            VclPtr<vcl::Window> pBtn;
+            get(pBtn, "btnbitmap");
+            pBtn->Show();
+        }
     }
     SvxAreaTabPage::PageCreated( aSet );
 }
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 025f9b90ecde..6e1b83666fea 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -64,6 +64,8 @@
 #include <svx/flagsdef.hxx>
 #include <memory>
 
+#include <svx/unobrushitemhelper.hxx>
+
 using namespace ::com::sun::star;
 
 namespace {
@@ -1062,6 +1064,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void)
             RES_BACKGROUND, RES_BACKGROUND,
             RES_COL, RES_COL,
             RES_FTN_AT_TXTEND, RES_FRAMEDIR,
+            XATTR_FILL_FIRST, XATTR_FILL_LAST,
             SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>{});
 
     aSet.Put( pSectRepr->GetCol() );
@@ -1072,6 +1075,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void)
     aSet.Put( pSectRepr->GetFrameDir() );
     aSet.Put( pSectRepr->GetLRSpace() );
 
+    setSvxBrushItemAsFillAttributesToTargetSet(pSectRepr->GetBackground(), aSet);
+
     const SwSectionFormats& rDocFormats = rSh.GetDoc()->GetSections();
     SwSectionFormats aOrigArray(rDocFormats);
 
@@ -1417,7 +1422,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
     OSL_ENSURE(pFact, "Dialog creation failed!");
     m_nSectionPageId = AddTabPage("section", SwInsertSectionTabPage::Create, nullptr);
     m_nColumnPageId = AddTabPage("columns",   SwColumnPage::Create,    nullptr);
-    m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr);
+    m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr);
     m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
     m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
 
@@ -2099,7 +2104,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialog creation failed!");
     m_nColumnPageId = AddTabPage("columns",   SwColumnPage::Create,    nullptr);
-    m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr );
+    m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr );
     m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
     m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
 
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 114871e0e080..65815235fe42 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -65,6 +65,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
             RES_BACKGROUND, RES_BACKGROUND,
             RES_COL, RES_COL,
             RES_FTN_AT_TXTEND, RES_FRAMEDIR,
+            XATTR_FILL_FIRST, XATTR_FILL_LAST,
             SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>{});
 
     if (!pSet || pSet->Count()==0)
@@ -183,6 +184,7 @@ IMPL_LINK( SwWrtShell, InsertRegionDialog, void*, p, void )
             RES_FRM_SIZE, RES_FRM_SIZE,
             RES_BACKGROUND, RES_BACKGROUND,
             RES_COL, RES_COL,
+            XATTR_FILL_FIRST, XATTR_FILL_LAST,
             SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>{});
     SwRect aRect;
     CalcBoundRect(aRect, RndStdIds::FLY_AS_CHAR);