diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-04 13:14:45 +0200 |
|---|---|---|
| committer | root <root@linux-3qg3.site> | 2014-04-04 19:06:11 +0200 |
| commit | f470f3c72efb3fad109e62247c4d0abebc359345 (patch) | |
| tree | f3a7969c13bae5d43ba5bc09935117c78deb5742 /include | |
| parent | 97b20c9deee46195357896197440cc1cc43d3452 (diff) | |
Introduce a new media shape property to handle mime type
Default mime-type for all media objects:
"application/vnd.sun.star.media"
The problem of missing mime-type detection
still exists. For now only glTF model has
a concrete type.
Change-Id: I4dca26c1c47a564579bbed926bffa3aa5eda6c04
Diffstat (limited to 'include')
| -rw-r--r-- | include/avmedia/mediaitem.hxx | 3 | ||||
| -rw-r--r-- | include/svl/solar.hrc | 2 | ||||
| -rw-r--r-- | include/svx/svdomedia.hxx | 2 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 7fec0bd63244..4ccb6feadbc2 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -38,6 +38,7 @@ #define AVMEDIA_SETMASK_VOLUMEDB ((sal_uInt32)(0x00000020)) #define AVMEDIA_SETMASK_ZOOM ((sal_uInt32)(0x00000040)) #define AVMEDIA_SETMASK_URL ((sal_uInt32)(0x00000080)) +#define AVMEDIA_SETMASK_MIME_TYPE ((sal_uInt32)(0x00000100)) #define AVMEDIA_SETMASK_ALL ((sal_uInt32)(0xffffffff)) class SvStream; @@ -111,6 +112,8 @@ public: const OUString& rReferer); const OUString& getURL() const; + void setMimeType( const OUString& rMimeType ); + OUString getMimeType() const; const OUString& getTempURL() const; const OUString& getReferer() const; diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc index c399a1a8a595..8978487dcb93 100644 --- a/include/svl/solar.hrc +++ b/include/svl/solar.hrc @@ -23,7 +23,7 @@ // defines ------------------------------------------------------------------ #define OWN_ATTR_VALUE_START 3900 -#define OWN_ATTR_VALUE_END 3991 +#define OWN_ATTR_VALUE_END 3992 #define RID_SFX_START 260 // RID_SFX_END 9999 diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index b9690e0f1dfc..b8c4c672927e 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -60,7 +60,7 @@ public: public: - void setURL( const OUString& rURL, const OUString& rReferer ); + void setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType = OUString() ); const OUString& getURL() const; void setMediaProperties( const ::avmedia::MediaItem& rState ); diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 665712e1f91c..40b4f64c6b80 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -179,7 +179,8 @@ #define OWN_ATTR_MEDIA_STREAM (OWN_ATTR_VALUE_START+89) #define OWN_ATTR_MEDIA_TEMPFILEURL (OWN_ATTR_VALUE_START+90) #define OWN_ATTR_INTEROPGRABBAG (OWN_ATTR_VALUE_START+91) -// ATTENTION: maximum is OWN_ATTR_VALUE_START+91, see include/svl/solar.hrc +#define OWN_ATTR_MEDIA_MIMETYPE (OWN_ATTR_VALUE_START+92) +// ATTENTION: maximum is OWN_ATTR_VALUE_START+92, see include/svl/solar.hrc // #FontWork# #define FONTWORK_PROPERTIES \ |