[Libreoffice-commits] core.git: reportdesign/source sc/inc sc/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Thu Mar 1 01:51:52 UTC 2018
reportdesign/source/core/api/ReportDefinition.cxx | 4 ++++
sc/inc/unonames.hxx | 3 +++
sc/source/ui/unoobj/styleuno.cxx | 5 +++++
3 files changed, 12 insertions(+)
New commits:
commit d64ce643275e0b2b0dea9e532fc261391dc8793c
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 28 09:16:48 2018 +0900
sc: add props. BackGraphic as replacement for BackGraphicURL
...and also add and adjust in the report designer
Change-Id: I5593f4d0bf9daf94f7d521f9c195e27a98282b2b
Reviewed-on: https://gerrit.libreoffice.org/50537
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index d1d24803159c..48d911541b2a 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -145,6 +145,7 @@
#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter"
#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation"
#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL"
+#define SC_UNO_PAGE_HDRGRF "HeaderBackGraphic"
#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder"
#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder"
#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder"
@@ -167,6 +168,7 @@
#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter"
#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation"
#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL"
+#define SC_UNO_PAGE_FTRGRF "FooterBackGraphic"
#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder"
#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder"
#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder"
@@ -304,6 +306,7 @@ OStyle::OStyle()
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound, cppu::UnoType<style::GraphicLocation>::get(), css::uno::Any(style::GraphicLocation_NONE));
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL, ++i,nBound, cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRGRF, ++i,nBound, cppu::UnoType<graphic::XGraphic>::get(), css::uno::Any(uno::Reference<graphic::XGraphic>()));
registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, ++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(true));
registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
@@ -327,6 +330,7 @@ OStyle::OStyle()
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid, cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid, cppu::UnoType<style::GraphicLocation>::get(), css::uno::Any(style::GraphicLocation_NONE));
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL, ++i,nBound|nMayBeVoid, cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRGRF, ++i,nBound|nMayBeVoid, cppu::UnoType<graphic::XGraphic>::get(), css::uno::Any(uno::Reference<graphic::XGraphic>()));
registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN, ++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(true));
registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 0f61dcd2a7d4..a2f080ab6377 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -406,6 +406,7 @@
#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter"
#define SC_UNO_PAGE_GRAPHICLOC "BackGraphicLocation"
#define SC_UNO_PAGE_GRAPHICURL "BackGraphicURL"
+#define SC_UNO_PAGE_GRAPHIC "BackGraphic"
#define SC_UNO_PAGE_LEFTBORDER SC_UNONAME_LEFTBORDER
#define SC_UNO_PAGE_RIGHTBORDER SC_UNONAME_RIGHTBORDER
#define SC_UNO_PAGE_BOTTBORDER SC_UNONAME_BOTTBORDER
@@ -452,6 +453,7 @@
#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter"
#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation"
#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL"
+#define SC_UNO_PAGE_HDRGRF "HeaderBackGraphic"
#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder"
#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder"
#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder"
@@ -474,6 +476,7 @@
#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter"
#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation"
#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL"
+#define SC_UNO_PAGE_FTRGRF "FooterBackGraphic"
#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder"
#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder"
#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder"
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 1b38a451a033..a75154cde393 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -184,6 +184,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
{OUString(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_FILTER },
{OUString(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, ::cppu::UnoType<style::GraphicLocation>::get(), 0, MID_GRAPHIC_POSITION },
{OUString(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_URL },
+ {OUString(SC_UNO_PAGE_GRAPHIC), ATTR_BACKGROUND, ::cppu::UnoType<graphic::XGraphic>::get(), 0, MID_GRAPHIC },
{OUString(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT },
{OUString(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
{OUString(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, ::cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE | CONVERT_TWIPS },
@@ -199,6 +200,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
{OUString(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(), 0, 0 },
+ {OUString(SC_UNO_PAGE_FTRGRF), SC_WID_UNO_FOOTERSET,::cppu::UnoType<graphic::XGraphic>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(), 0, 0 },
{OUString(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 },
@@ -226,6 +228,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
{OUString(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(), 0, 0 },
+ {OUString(SC_UNO_PAGE_HDRGRF), SC_WID_UNO_HEADERSET,::cppu::UnoType<graphic::XGraphic>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(), 0, 0 },
{OUString(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{OUString(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 },
@@ -305,6 +308,7 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap()
{OUString(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_FILTER },
{OUString(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, ::cppu::UnoType<style::GraphicLocation>::get(), 0, MID_GRAPHIC_POSITION },
{OUString(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_URL },
+ {OUString(SC_UNO_PAGE_HDRGRF), ATTR_BACKGROUND, ::cppu::UnoType<graphic::XGraphic>::get(), 0, MID_GRAPHIC },
{OUString(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT },
{OUString(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
{OUString(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_LO_MARGIN | CONVERT_TWIPS },
@@ -344,6 +348,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
{OUString(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_FILTER },
{OUString(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, ::cppu::UnoType<style::GraphicLocation>::get(), 0, MID_GRAPHIC_POSITION },
{OUString(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, ::cppu::UnoType<OUString>::get(), 0, MID_GRAPHIC_URL },
+ {OUString(SC_UNO_PAGE_FTRGRF), ATTR_BACKGROUND, ::cppu::UnoType<graphic::XGraphic>::get(), 0, MID_GRAPHIC },
{OUString(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT },
{OUString(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
{OUString(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_UP_MARGIN | CONVERT_TWIPS },
More information about the Libreoffice-commits
mailing list