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

2018-03-09 Thread Tomaž Vajngerl 
 reportdesign/source/core/api/ReportDefinition.cxx |4 
 sc/inc/unonames.hxx   |2 --
 sc/source/ui/unoobj/styleuno.cxx  |2 --
 svx/source/form/formcontrolfactory.cxx|2 +-
 sw/inc/unoprnms.hxx   |3 ---
 5 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 1dc39d36806cc9382763bfd0b74e3d28e3fa1365
Author: Tomaž Vajngerl 
Date:   Fri Mar 9 14:50:09 2018 +0900

remove references to {Header,Footer,Para}GraphicURL

Change-Id: I559f25ee99f7b8b49545390479cbb06d3c601d3c
Reviewed-on: https://gerrit.libreoffice.org/50982
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 48d911541b2a..09d9f2105a71 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -144,7 +144,6 @@
 #define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent"
 #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"
@@ -167,7 +166,6 @@
 #define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent"
 #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"
@@ -305,7 +303,6 @@ OStyle::OStyle()
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,  ++i,nBound, 
cppu::UnoType::get(), css::uno::makeAny(COL_TRANSPARENT));
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT,  ++i,nBound, 
cppu::UnoType::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC,   ++i,nBound, 
cppu::UnoType::get(), 
css::uno::Any(style::GraphicLocation_NONE));
-registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL,   ++i,nBound, 
cppu::UnoType::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRF,  ++i,nBound, 
cppu::UnoType::get(), 
css::uno::Any(uno::Reference()));
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, 
++i,nBound,cppu::UnoType::get(), css::uno::Any(true));
 registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound, 
cppu::UnoType::get(), css::uno::makeAny(0));
@@ -329,7 +326,6 @@ OStyle::OStyle()
 registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::makeAny(COL_TRANSPARENT));
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC,   ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), 
css::uno::Any(style::GraphicLocation_NONE));
-registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL,   ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRF,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), 
css::uno::Any(uno::Reference()));
 registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN, 
++i,nBound|nMayBeVoid,cppu::UnoType::get(), css::uno::Any(true));
 registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::makeAny(0));
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 7e6efaa432d4..e7f92a01e3e4 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -451,7 +451,6 @@
 #define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent"
 #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"
@@ -474,7 +473,6 @@
 #define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent"
 #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"
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 61f3f56cc2be..1dc1c7b7136c 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++

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

2018-02-28 Thread Tomaž Vajngerl 
 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 
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 
Reviewed-by: Tomaž Vajngerl 

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::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC,   ++i,nBound, 
cppu::UnoType::get(), 
css::uno::Any(style::GraphicLocation_NONE));
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL,   ++i,nBound, 
cppu::UnoType::get(), css::uno::Any(OUString()));
+registerPropertyNoMember(SC_UNO_PAGE_FTRGRF,  ++i,nBound, 
cppu::UnoType::get(), 
css::uno::Any(uno::Reference()));
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, 
++i,nBound,cppu::UnoType::get(), css::uno::Any(true));
 registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound, 
cppu::UnoType::get(), css::uno::makeAny(0));
 registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  ++i,nBound, 
cppu::UnoType::get(), css::uno::makeAny(0));
@@ -327,6 +330,7 @@ OStyle::OStyle()
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::Any(OUString()));
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC,   ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), 
css::uno::Any(style::GraphicLocation_NONE));
 registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL,   ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::Any(OUString()));
+registerPropertyNoMember(SC_UNO_PAGE_HDRGRF,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), 
css::uno::Any(uno::Reference()));
 registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN, 
++i,nBound|nMayBeVoid,cppu::UnoType::get(), css::uno::Any(true));
 registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::makeAny(0));
 registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST,  ++i,nBound|nMayBeVoid, 
cppu::UnoType::get(), css::uno::makeAny(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