summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-03-09 22:24:31 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-03-10 02:11:58 +0100
commitd0b36b780dca966bc5e8682d8dff635072124603 (patch)
treee5705350ad7a566d106a7a6f2e087e3ff104d847 /include
parent1dc39d36806cc9382763bfd0b74e3d28e3fa1365 (diff)
oox: remove unused methods that rely on GraphicObject URL
Change-Id: Ie68ccfa8d802bb284da8bb4af69882f4b66a3dac Reviewed-on: https://gerrit.libreoffice.org/51010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/oox/export/drawingml.hxx13
-rw-r--r--include/oox/helper/graphichelper.hxx20
-rw-r--r--include/svtools/grfmgr.hxx1
3 files changed, 0 insertions, 34 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 115f6d46148c..aa99c95c82e3 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -141,10 +141,6 @@ protected:
const OUString& aName, css::beans::PropertyState& eState );
OUString GetFieldValue( const css::uno::Reference< css::text::XTextRange >& rRun, bool& bIsURLField );
-
- /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
- OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
-
/// Output the media (including copying a video from vnd.sun.star.Package: to the output if necessary).
void WriteMediaNonVisualProperties(const css::uno::Reference<css::drawing::XShape>& xShape);
@@ -186,9 +182,6 @@ public:
void WriteBlipOrNormalFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
const OUString& rURLPropName );
void WriteBlipFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
- const OUString& sBitmapURL, sal_Int32 nXmlNamespace,
- bool bWriteMode, bool bRelPathToMedia = false );
- void WriteBlipFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
const OUString& sURLPropName );
void WriteBlipFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
const OUString& sURLPropName, sal_Int32 nXmlNamespace );
@@ -208,24 +201,18 @@ public:
css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
- void WriteStretch( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& rURL );
void WriteXGraphicStretch(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet,
css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
void WriteLinespacing( const css::style::LineSpacing& rLineSpacing );
- OUString WriteBlip( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
- const OUString& rURL, bool bRelPathToMedia );
-
OUString WriteXGraphicBlip(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet,
css::uno::Reference<css::graphic::XGraphic> const & rxGraphic,
bool bRelPathToMedia);
void WriteImageBrightnessContrastTransparence(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet);
- void WriteBlipMode( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& rURL );
-
void WriteXGraphicBlipMode(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet,
css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 84450c2a61b6..399999471442 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -52,14 +52,6 @@ namespace oox {
/** Provides helper functions for colors, device measurement conversion,
graphics, and graphic objects handling.
-
- All createGraphicObject() and importGraphicObject() functions create
- persistent graphic objects internally and store them in an internal
- container to prevent their early destruction. This makes it possible to use
- the returned URL of the graphic object in any way (e.g. insert it into a
- property map) without needing to store it immediately at an object that
- resolves the graphic object from the passed URL and thus prevents it from
- being destroyed.
*/
class OOX_DLLPUBLIC GraphicHelper
{
@@ -132,17 +124,6 @@ public:
/** Imports graphics from the storage with the passed stream names. */
void importEmbeddedGraphics(const std::vector<OUString>& rStreamNames) const;
- /** Creates a persistent graphic object from the passed graphic.
- @return The URL of the created and internally cached graphic object. */
- OUString createGraphicObject(
- const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
-
- /** Creates a persistent graphic object from the passed input stream.
- @return The URL of the created and internally cached graphic object. */
- OUString importGraphicObject(
- const css::uno::Reference< css::io::XInputStream >& rxInStrm,
- const WmfExternal* pExtHeader ) const;
-
/** calculates the original size of a graphic which is necessary to be able to calculate cropping values
@return The original Graphic size in 100thmm */
css::awt::Size getOriginalSize( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ) const;
@@ -160,7 +141,6 @@ private:
StorageRef mxStorage; ///< Storage containing embedded graphics.
mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive.
mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path.
- const OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects.
double mfPixelPerHmmX; ///< Number of screen pixels per 1/100 mm in X direction.
double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction.
};
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index f4a9d88244b2..c2c70256ceaa 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -465,7 +465,6 @@ public:
void StopAnimation( OutputDevice* pOut = nullptr, long nExtraData = 0 );
static bool isGraphicObjectUniqueIdURL(OUString const & rURL);
- static GraphicObject CreateGraphicObjectFromURL(OUString const & rURL);
// will inspect an object ( e.g. a control ) for any 'ImageURL'
// properties and return these in a vector. Note: this implementation