diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-26 19:28:35 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-03 13:06:33 +0200 |
| commit | 2bf4d69e0bfa98d641939e62945a7f8915441297 (patch) | |
| tree | 2c64c371f0261bdda2b2adc16abb1b24e5315cb8 /include | |
| parent | f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 (diff) | |
[API CHANGE] revert and deprecate GraphicURL, modify Graphic prop.
Revert the state of GraphicURL property so it supports setting a
external URL, but getting throws and exception.
Modify the Graphic property, so it reflects what was used with
GraphicURL before.
Change-Id: Ia05b8ea37997b5ed8c75215557cce9979630c898
Reviewed-on: https://gerrit.libreoffice.org/53509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/unoprnms.hxx | 1 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index d90be0f6b45d..8ac52ede237f 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -165,6 +165,7 @@ #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL" #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" #define UNO_NAME_GRAPHOBJ_GRAPHIC "Graphic" +#define UNO_NAME_GRAPHOBJ_GRAPHIC_URL "GraphicURL" #define UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE "IsSignatureLine" #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID "SignatureLineId" #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME "SignatureLineSuggestedSignerName" diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 1794f1d9d96d..6341c37f3dc6 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -98,7 +98,7 @@ #define OWN_ATTR_LDNAME (OWN_ATTR_VALUE_START+30) #define OWN_ATTR_LDBITMAP (OWN_ATTR_VALUE_START+31) #define OWN_ATTR_OLESIZE (OWN_ATTR_VALUE_START+32) -//#define free (OWN_ATTR_VALUE_START+33) +#define OWN_ATTR_GRAPHIC_URL (OWN_ATTR_VALUE_START+33) #define OWN_ATTR_OLEMODEL (OWN_ATTR_VALUE_START+34) #define OWN_ATTR_MIRRORED (OWN_ATTR_VALUE_START+35) #define OWN_ATTR_CLSID (OWN_ATTR_VALUE_START+36) @@ -431,6 +431,7 @@ { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , cppu::UnoType<css::awt::XBitmap>::get() , 0, 0}, \ { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0}, \ + { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL), OWN_ATTR_GRAPHIC_URL , cppu::UnoType<OUString>::get(), 0, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE), OWN_ATTR_IS_SIGNATURELINE , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID), OWN_ATTR_SIGNATURELINE_ID , cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME), OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType<OUString>::get(), 0, 0}, \ |