diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-01 08:39:11 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-07 02:37:36 +0100 |
| commit | d72145f9307c732ced4a546ac1e5093ec7c1a982 (patch) | |
| tree | 648cf88d30ba3da260edb22829d8cd8be0c9345e /include | |
| parent | 6b39ed0eaffabb6ffe11496d833053c094c72f7b (diff) | |
Move BackGraphicURL property & friends to BackGraphic + fixes
This moves BackGraphicURL, HeaderGraphicURL, FooterGraphicURL and
ParaBackGraphicURL properties to BackGraphic, HeaderBackGraphic,
FooterBackGraphic and ParaBackGraphic. With this the property type
changes from String to XGraphic.
This change also fixes a bunch of test failures, changes the tests
to use the new properties and the correct type, changes the import
and export filters like xmloff and oox, to make the tests happy.
Change-Id: Ie66097514203c6dc36ab27420faf265322e9279e
Reviewed-on: https://gerrit.libreoffice.org/50760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/memberids.h | 19 | ||||
| -rw-r--r-- | include/oox/helper/modelobjecthelper.hxx | 4 | ||||
| -rw-r--r-- | include/xmloff/xmltypes.hxx | 1 |
3 files changed, 13 insertions, 11 deletions
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h index d7d0a538ee4d..2f13be47a0f2 100644 --- a/include/editeng/memberids.h +++ b/include/editeng/memberids.h @@ -157,16 +157,15 @@ //BrushItem #define MID_BACK_COLOR 0 #define MID_GRAPHIC_POSITION 1 -#define MID_GRAPHIC_LINK 2 -#define MID_GRAPHIC 3 -#define MID_GRAPHIC_TRANSPARENT 4 -#define MID_GRAPHIC_URL 5 -#define MID_GRAPHIC_FILTER 6 -#define MID_GRAPHIC_REPEAT 7 -#define MID_GRAPHIC_TRANSPARENCY 8 -#define MID_BACK_COLOR_R_G_B 9 -#define MID_BACK_COLOR_TRANSPARENCY 10 -#define MID_SHADING_VALUE 11 +#define MID_GRAPHIC 2 +#define MID_GRAPHIC_TRANSPARENT 3 +#define MID_GRAPHIC_URL 4 +#define MID_GRAPHIC_FILTER 5 +#define MID_GRAPHIC_REPEAT 6 +#define MID_GRAPHIC_TRANSPARENCY 7 +#define MID_BACK_COLOR_R_G_B 8 +#define MID_BACK_COLOR_TRANSPARENCY 9 +#define MID_SHADING_VALUE 10 //SvxFormatBreakItem #define MID_BREAK_BEFORE 0 diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 67980b57f6c8..694bdf13ddb7 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -27,7 +27,8 @@ #include <sal/types.h> namespace com { namespace sun { namespace star { - namespace awt { struct Gradient; } + namespace awt { struct Gradient; + class XBitmap; } namespace graphic { class XGraphic; } namespace container { class XNameContainer; } namespace drawing { struct LineDash; } @@ -113,6 +114,7 @@ public: OUString insertFillBitmapXGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic); OUString getFillBitmapUrl( const OUString& rGraphicName ); + css::uno::Reference<css::awt::XBitmap> getFillBitmap(OUString const & rGraphicName); private: ObjectContainer maMarkerContainer; ///< Contains all named line markers (line end polygons). diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx index 8b7fc23981c7..dc2e6558321e 100644 --- a/include/xmloff/xmltypes.hxx +++ b/include/xmloff/xmltypes.hxx @@ -290,6 +290,7 @@ #define XML_SW_TYPE_BITMAPREPOFFSETY (XML_TEXT_TYPES_START + 125) #define XML_TYPE_TEXT_RUBY_IS_ABOVE (XML_TEXT_TYPES_START + 126) +#define XML_TYPE_GRAPHIC (XML_TEXT_TYPES_START + 127) #endif // INCLUDED_XMLOFF_XMLTYPES_HXX |