diff --git a/0001-add-char-highlighting-background-tab-to-graphics-sty.patch b/0001-add-char-highlighting-background-tab-to-graphics-sty.patch new file mode 100644 index 0000000..c2b4fb2 --- /dev/null +++ b/0001-add-char-highlighting-background-tab-to-graphics-sty.patch @@ -0,0 +1,99 @@ +From c4bc798c3b2043b0e92573c87c4fb3e17043ee59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 11 Aug 2017 12:31:13 +0100 +Subject: [PATCH] add char highlighting (background) tab to graphics styles + dialog + +Change-Id: I2cf3872116ae59051847d73612a2f4f8385d34d8 +--- + sd/source/ui/dlg/tabtempl.cxx | 7 +++++++ + sd/source/ui/func/fuchar.cxx | 2 +- + sd/source/ui/inc/tabtempl.hxx | 1 + + sd/uiconfig/simpress/ui/templatedialog.ui | 14 ++++++++++++++ + 4 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx +index 17e962b..9042bf5 100644 +--- a/sd/source/ui/dlg/tabtempl.cxx ++++ b/sd/source/ui/dlg/tabtempl.cxx +@@ -71,6 +71,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, + , m_nFontId(0) + , m_nFontEffectId(0) + , m_nIndentsId(0) ++ , m_nBackgroundId(0) + , m_nTextId(0) + , m_nAnimationId(0) + , m_nDimensionId(0) +@@ -88,6 +89,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, + m_nFontId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME); + m_nFontEffectId = AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS); + m_nIndentsId = AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH); ++ m_nBackgroundId = AddTabPage("background", RID_SVXPAGE_BACKGROUND); + m_nTextId = AddTabPage("text", RID_SVXPAGE_TEXTATTR); + m_nAnimationId = AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION); + m_nDimensionId = AddTabPage("dimensioning", RID_SVXPAGE_MEASURE); +@@ -149,6 +151,11 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) + { + rPage.PageCreated(aSet); + } ++ else if (nId == m_nBackgroundId) ++ { ++ aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR))); ++ rPage.PageCreated(aSet); ++ } + else if (nId == m_nTextId) + { + rPage.PageCreated(aSet); +diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx +index b5c5a18..1ffa757 100644 +--- a/sd/source/ui/func/fuchar.cxx ++++ b/sd/source/ui/func/fuchar.cxx +@@ -68,7 +68,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) + SfxItemSet aEditAttr( mpDoc->GetPool() ); + mpView->GetAttributes( aEditAttr ); + +- SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items{}); ++ SfxItemSet aNewAttr(mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END); + aNewAttr.Put( aEditAttr, false ); + + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); +diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx +index d5c2f5e..bc00417 100644 +--- a/sd/source/ui/inc/tabtempl.hxx ++++ b/sd/source/ui/inc/tabtempl.hxx +@@ -50,6 +50,7 @@ private: + sal_uInt16 m_nFontId; + sal_uInt16 m_nFontEffectId; + sal_uInt16 m_nIndentsId; ++ sal_uInt16 m_nBackgroundId; + sal_uInt16 m_nTextId; + sal_uInt16 m_nAnimationId; + sal_uInt16 m_nDimensionId; +diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui +index 961a0bb..380f9f0 100644 +--- a/sd/uiconfig/simpress/ui/templatedialog.ui ++++ b/sd/uiconfig/simpress/ui/templatedialog.ui +@@ -204,6 +204,20 @@ + + + ++ ++ True ++ False ++ Highlighting ++ ++ ++ 6 ++ False ++ ++ ++ ++ ++ ++ + + True + False +-- +2.9.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 7d3d069..fda5575 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -246,6 +246,7 @@ Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch3: 0001-rename-IsAutoCapitalizeWordDelim-to-NonFieldWordDeli.patch Patch4: 0002-consider-field-marks-as-text-for-auto-quotes.patch +Patch5: 0001-add-char-highlighting-background-tab-to-graphics-sty.patch %if 0%{?rhel} # not upstreamed @@ -2200,6 +2201,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Fri Aug 11 2017 Caolán McNamara - 1:5.4.0.3-5 +- implement char highlighting ui for graphics styles + * Thu Aug 03 2017 David Tardon - 1:5.4.0.3-4 - rebuild for poppler 0.57.0