summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-02-28 09:16:48 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-03-01 02:51:28 +0100
commitd64ce643275e0b2b0dea9e532fc261391dc8793c (patch)
tree92e204b4d9e2e795c73fb6bea7efd81b39386252 /reportdesign
parent25cd843664919974f0d21ca7a0b02cc43e9eeabb (diff)
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@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx4
1 files changed, 4 insertions, 0 deletions
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));