include/svtools/imageresourceaccess.hxx | 13 +++++--------
svtools/source/misc/imageresourceaccess.cxx | 1 -
2 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit ab9eff78f05e71d4d853fe72c03823287b49c93b
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Mon Mar 12 12:51:23 2018 +0900
remove support of GraphicObject URL from GraphicAccess
Change-Id: I4f14241f8528e025ddb108c73bee2df61f8927de
Reviewed-on: https://gerrit.libreoffice.org/51103
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/svtools/imageresourceaccess.hxx
b/include/svtools/imageresourceaccess.hxx
index 99be3b08ea27..ee30ab0b75dc 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -38,13 +38,10 @@ namespace svt
*/
namespace GraphicAccess
{
- /** determines whether the given URL denotes an image within a resource
- ( or an image specified by a vnd.sun.star.GraphicObject scheme URL )
- */
- SVT_DLLPUBLIC bool isSupportedURL( const OUString& _rURL );
+ /** determines whether the given URL denotes an image within a
resource */
+ SVT_DLLPUBLIC bool isSupportedURL( const OUString& _rURL );
- /** for a given URL of an image within a resource ( or an image
specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
- an SvStream for this image.
+ /** for a given URL of an image within a resource, this method
retrieves an SvStream for this image.
This method works for arbitrary URLs denoting an image, since the
css::graphics::GraphicsProvider service is used
@@ -52,12 +49,12 @@ namespace svt
the image must be copied), so you are strongly encouraged to only
use it
when you know that the image is small enough.
*/
- SVT_DLLPUBLIC SvStream* getImageStream(
+ SVT_DLLPUBLIC SvStream* getImageStream(
const css::uno::Reference< css::uno::XComponentContext >&
_rxContext,
const OUString& _rImageResourceURL
);
- /** for a given URL of an image within a resource ( or an image
specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
+ /** for a given URL of an image within a resource, this method
retrieves
an css::io::XInputStream for this image.
*/
SVT_DLLPUBLIC css::uno::Reference< css::io::XInputStream >
diff --git a/svtools/source/misc/imageresourceaccess.cxx
b/svtools/source/misc/imageresourceaccess.cxx
index 7211bf23670d..5c7ff0ec86ca 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -130,7 +130,6 @@ namespace svt
return _rURL.startsWith( "private:resource/" )
|| _rURL.startsWith( "private:graphicrepository/" )
|| _rURL.startsWith( "private:standardimage/" )
- || _rURL.startsWith( "vnd.sun.star.GraphicObject:" )
|| _rURL.startsWith( "vnd.sun.star.extension://" );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
