diff options
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 4 | ||||
-rw-r--r-- | sc/inc/unonames.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontrolfactory.cxx | 2 | ||||
-rw-r--r-- | sw/inc/unoprnms.hxx | 3 |
5 files changed, 1 insertions, 12 deletions
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<sal_Int32>::get(), css::uno::makeAny(COL_TRANSPARENT)); 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)); @@ -329,7 +326,6 @@ OStyle::OStyle() registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny(COL_TRANSPARENT)); 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)); 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 +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -198,7 +198,6 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {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 }, @@ -226,7 +225,6 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {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 }, diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index f0512d2e85b3..3939717ea324 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -295,7 +295,7 @@ namespace svxform "ParaLineSpacing", "ParaBackColor", "ParaBackTransparent", - "ParaBackGraphicURL", + "ParaBackGraphic", "ParaBackGraphicFilter", "ParaBackGraphicLocation", "ParaLastLineAdjust", diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 135071cc128c..c314a4a021d4 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -26,13 +26,10 @@ #define UNO_NAME_IS_PHYSICAL "IsPhysical" #define UNO_NAME_IS_AUTO_UPDATE "IsAutoUpdate" #define UNO_NAME_DISPLAY_NAME "DisplayName" -#define UNO_NAME_PARA_GRAPHIC_URL "ParaBackGraphicURL" #define UNO_NAME_PARA_GRAPHIC "ParaBackGraphic" #define UNO_NAME_PARA_GRAPHIC_FILTER "ParaBackGraphicFilter" -#define UNO_NAME_HEADER_GRAPHIC_URL "HeaderBackGraphicURL" #define UNO_NAME_HEADER_GRAPHIC "HeaderBackGraphic" #define UNO_NAME_HEADER_GRAPHIC_FILTER "HeaderBackGraphicFilter" -#define UNO_NAME_FOOTER_GRAPHIC_URL "FooterBackGraphicURL" #define UNO_NAME_FOOTER_GRAPHIC "FooterBackGraphic" #define UNO_NAME_FOOTER_GRAPHIC_FILTER "FooterBackGraphicFilter" #define UNO_NAME_BACK_GRAPHIC "BackGraphic" |