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

[Jim Raykowski (via logerrit)]

 sc/source/ui/styleui/styledlg.cxx |    4 ++--
 sw/source/ui/fmtui/tmpdlg.cxx     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 582f8d35471a121ac92e5552ef77d9f430941ae7
Author:     Jim Raykowski <raykowj at gmail..com>
AuthorDate: Fri Dec 13 23:12:51 2019 -0900
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Sun Dec 15 08:12:36 2019 +0100

    Use SvxBkgTabPage::GetRanges for new background tab pages
    
    Commit 03facb4bb75e4283c91de6f081ee96137ca4346c introduced GetRanges
    function for SvxBkgTabPage. This patch replaces all uses of
    SvxBackgroundTabPage::GetRanges for new background tab pages with
    SvxBkgTabPage::GetRanges.
    
    Change-Id: I5dd16617d25b09bcf2e02656abd84db25f7b614e
    Reviewed-on: https://gerrit.libreoffice.org/85137
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index ca6c1b727169..dd965a9aee8e 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -54,7 +54,7 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent,
     {
         AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) );
         AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
-        AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+        AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ) );
         AddTabPage("header", &ScHeaderPage::Create,      &ScHeaderPage::GetRanges );
         AddTabPage("footer", &ScFooterPage::Create,      &ScFooterPage::GetRanges );
         AddTabPage("sheet", &ScTablePage::Create,     &ScTablePage::GetRanges );
@@ -73,7 +73,7 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent,
         else
             RemoveTabPage("asiantypo");
         AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ));
-        AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+        AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ));
         AddTabPage("protection", &ScTabPageProtection::Create,    &ScTabPageProtection::GetRanges);
     }
 }
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 65d7f278ff12..917328b2bc0d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -94,7 +94,7 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
             AddTabPage("fonteffect", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ));
             AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ));
             AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ));
-            AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+            AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ));
             AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ));
             SvtCJKOptions aCJKOptions;
             if(nHtmlMode & HTMLMODE_ON || !aCJKOptions.IsDoubleLinesEnabled())
@@ -120,7 +120,7 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
 
             AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
 
-            AddTabPage("highlighting", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+            AddTabPage("highlighting", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ));
 
             AddTabPage("tabs", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),        pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );