diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-24 11:26:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-24 15:36:24 +0200 |
| commit | 5ae7908ecec19d2d7f5464bf89fcd26a4aef3ace (patch) | |
| tree | 7930e61dfdefb2321546956365c56beb5b6aa333 /framework | |
| parent | 4bd1b38633d6cb288eb559afc0ac6b961538ae60 (diff) | |
loplugin:unusedfields
Change-Id: I80ed513cf690f94bf4320b040b36d7f904c63482
Reviewed-on: https://gerrit.libreoffice.org/76233
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 5 | ||||
| -rw-r--r-- | framework/source/xml/imagesdocumenthandler.cxx | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 2df23a205cd3..c6d0917840cc 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -96,10 +96,6 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax: bool m_bImageContainerStartFound; bool m_bImageContainerEndFound; bool m_bImagesStartFound; - bool m_bExternalImagesStartFound; - bool m_bExternalImageStartFound; - sal_Int32 m_nHashMaskModeBitmap; - sal_Int32 m_nHashMaskModeColor; ImageHashMap m_aImageMap; ImageItemDescriptorList& m_rImageList; css::uno::Reference< css::xml::sax::XLocator > m_xLocator; @@ -130,7 +126,6 @@ class OWriteImagesDocumentHandler final const ImageItemDescriptorList& m_rImageItemList; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; css::uno::Reference< css::xml::sax::XAttributeList > m_xEmptyList; - OUString m_aXMLXlinkNS; OUString m_aXMLImageNS; OUString m_aAttributeType; OUString m_aAttributeXlinkType; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index dd95ddbf22e7..381b0f1aec2a 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -54,9 +54,6 @@ using namespace ::com::sun::star::xml::sax; #define ATTRIBUTE_HIGHCONTRASTMASKURL "highcontrastmaskurl" #define ATTRIBUTE_TYPE_CDATA "CDATA" -#define ATTRIBUTE_MASKMODE_BITMAP "maskbitmap" -#define ATTRIBUTE_MASKMODE_COLOR "maskcolor" - #define ATTRIBUTE_XMLNS_IMAGE "xmlns:image" #define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" @@ -66,7 +63,6 @@ using namespace ::com::sun::star::xml::sax; #define XMLNS_IMAGE "http://openoffice.org/2001/image" #define XMLNS_XLINK "http://www.w3.org/1999/xlink" #define XMLNS_IMAGE_PREFIX "image:" -#define XMLNS_XLINK_PREFIX "xlink:" #define XMLNS_FILTER_SEPARATOR "^" @@ -101,9 +97,6 @@ ImageXMLEntryProperty const ImagesEntries[OReadImagesDocumentHandler::IMG_XML_EN OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageItemDescriptorList& rItems ) : m_rImageList( rItems ) { - m_nHashMaskModeBitmap = OUString( ATTRIBUTE_MASKMODE_BITMAP ).hashCode(); - m_nHashMaskModeColor = OUString( ATTRIBUTE_MASKMODE_COLOR ).hashCode(); - // create hash map to speed up lookup for ( int i = 0; i < int(IMG_XML_ENTRY_COUNT); i++ ) { @@ -123,8 +116,6 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageItemDescriptorList& m_bImageContainerStartFound = false; m_bImageContainerEndFound = false; m_bImagesStartFound = false; - m_bExternalImagesStartFound = false; - m_bExternalImageStartFound = false; } OReadImagesDocumentHandler::~OReadImagesDocumentHandler() @@ -315,7 +306,6 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( m_xEmptyList.set( static_cast<XAttributeList *>(pList), UNO_QUERY ); m_aAttributeType = ATTRIBUTE_TYPE_CDATA; m_aXMLImageNS = XMLNS_IMAGE_PREFIX; - m_aXMLXlinkNS = XMLNS_XLINK_PREFIX; m_aAttributeXlinkType = ATTRIBUTE_XLINK_TYPE; m_aAttributeValueSimple = ATTRIBUTE_XLINK_TYPE_VALUE; } |