[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 24 13:37:34 UTC 2019
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 30 +++---
compilerplugins/clang/unusedfields.readonly.results | 26 ++---
compilerplugins/clang/unusedfields.untouched.results | 14 +-
compilerplugins/clang/unusedfields.writeonly.results | 50 +++++-----
framework/inc/xml/imagesdocumenthandler.hxx | 5 -
framework/source/xml/imagesdocumenthandler.cxx | 10 --
6 files changed, 63 insertions(+), 72 deletions(-)
New commits:
commit 5ae7908ecec19d2d7f5464bf89fcd26a4aef3ace
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jul 24 11:26:48 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jul 24 15:36:24 2019 +0200
loplugin:unusedfields
Change-Id: I80ed513cf690f94bf4320b040b36d7f904c63482
Reviewed-on: https://gerrit.libreoffice.org/76233
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 8d2d4d9bb5d5..283d724286d2 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -76,9 +76,9 @@ connectivity/source/inc/flat/EResultSet.hxx:42
connectivity::flat::OFlatResultSet m_bBookmarkable _Bool
connectivity/source/inc/java/lang/Object.hxx:45
connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard
-cppcanvas/source/mtfrenderer/textaction.cxx:809
+cppcanvas/source/mtfrenderer/textaction.cxx:811
cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo
-cppcanvas/source/mtfrenderer/textaction.cxx:1638
+cppcanvas/source/mtfrenderer/textaction.cxx:1644
cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo
cppu/source/threadpool/threadpool.cxx:354
_uno_ThreadPool dummy sal_Int32
@@ -186,6 +186,16 @@ filter/source/graphicfilter/icgm/chart.hxx:46
DataNode nBoxX2 sal_Int16
filter/source/graphicfilter/icgm/chart.hxx:47
DataNode nBoxY2 sal_Int16
+framework/inc/xml/imagesdocumenthandler.hxx:99
+ framework::OReadImagesDocumentHandler m_bExternalImagesStartFound _Bool
+framework/inc/xml/imagesdocumenthandler.hxx:100
+ framework::OReadImagesDocumentHandler m_bExternalImageStartFound _Bool
+framework/inc/xml/imagesdocumenthandler.hxx:101
+ framework::OReadImagesDocumentHandler m_nHashMaskModeBitmap sal_Int32
+framework/inc/xml/imagesdocumenthandler.hxx:102
+ framework::OReadImagesDocumentHandler m_nHashMaskModeColor sal_Int32
+framework/inc/xml/imagesdocumenthandler.hxx:133
+ framework::OWriteImagesDocumentHandler m_aXMLXlinkNS class rtl::OUString
helpcompiler/inc/HelpCompiler.hxx:197
HelpCompiler lang const std::string
include/basic/basmgr.hxx:56
@@ -736,9 +746,9 @@ sw/inc/unosett.hxx:145
SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
sw/qa/core/test_ToxTextGenerator.cxx:139
ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/layout/layout.cxx:2608
- class SvtSysLocaleOptions &
-sw/qa/extras/uiwriter/uiwriter.cxx:4068
+sw/qa/extras/uiwriter/uiwriter2.cxx:65
+ class SwUiWriterTest2 *
+sw/qa/extras/uiwriter/uiwriter.cxx:4065
IdleTask maIdle class Idle
sw/source/core/crsr/crbm.cxx:66
(anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
@@ -750,10 +760,6 @@ sw/source/core/text/inftxt.hxx:679
SwTextSlot aText class rtl::OUString
sw/source/core/text/porfld.cxx:143
SwFieldSlot aText class rtl::OUString
-sw/source/filter/inc/fltshell.hxx:214
- SwFltRedline aStampPrev const class DateTime
-sw/source/filter/inc/fltshell.hxx:216
- SwFltRedline eTypePrev const enum RedlineType
sw/source/uibase/docvw/romenu.hxx:35
SwReadOnlyPopup m_aBuilder class VclBuilder
sw/source/uibase/inc/condedit.hxx:43
@@ -832,9 +838,9 @@ vcl/source/app/salvtables.cxx:2568
SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
vcl/source/app/salvtables.cxx:5012
SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/gdi/jobset.cxx:36
+vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:37
+vcl/source/gdi/jobset.cxx:36
ImplOldJobSetupData cPortName char [32]
vcl/source/gdi/pdfbuildin_fonts.hxx:34
vcl::pdf::BuildinFont m_nAscent const int
@@ -842,7 +848,7 @@ vcl/source/gdi/pdfbuildin_fonts.hxx:35
vcl::pdf::BuildinFont m_nDescent const int
vcl/source/gdi/pdfbuildin_fonts.hxx:42
vcl::pdf::BuildinFont m_aWidths const int [256]
-vcl/unx/gtk3/gtk3gtkinst.cxx:3593
+vcl/unx/gtk3/gtk3gtkinst.cxx:3597
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
HyperLink atk_hyper_link const AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 97a7ce2ed75c..5b2e69a009c2 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -98,9 +98,7 @@ connectivity/source/inc/TConnection.hxx:56
connectivity::OMetaConnection m_aResources class connectivity::SharedResources
connectivity/source/inc/writer/WTable.hxx:65
connectivity::writer::OWriterTable m_nStartCol sal_Int32
-cppcanvas/source/mtfrenderer/textaction.cxx:816
- cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextFillColor const ::Color
-cppcanvas/source/mtfrenderer/textaction.cxx:1646
+cppcanvas/source/mtfrenderer/textaction.cxx:1652
cppcanvas::internal::(anonymous namespace)::OutlineAction maTextFillColor const ::Color
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:34
Mapping m_from uno::Environment
@@ -436,7 +434,7 @@ registry/source/reflwrit.cxx:140
writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
registry/source/reflwrit.cxx:141
writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b2 sal_uInt32
-registry/source/reflwrit.cxx:181
+registry/source/reflwrit.cxx:180
CPInfo::(anonymous) aUik struct RTUik *
reportdesign/source/ui/inc/ColorListener.hxx:35
rptui::OColorListener m_aColorConfig const svtools::ColorConfig
@@ -562,7 +560,7 @@ slideshow/source/engine/slideshowimpl.cxx:156
(anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
sot/source/sdstor/ucbstorage.cxx:399
UCBStorageStream_Impl m_aKey const class rtl::OString
-starmath/source/view.cxx:865
+starmath/source/view.cxx:866
SmViewShell_Impl aOpts const class SvtMiscOptions
store/source/storbios.cxx:57
OStoreSuperBlock m_aMarked OStoreSuperBlock::L
@@ -910,15 +908,15 @@ vcl/inc/WidgetThemeLibrary.hxx:137
vcl::WidgetThemeLibrary_t updateSettings _Bool (*)(struct vcl::WidgetDrawStyle &)
vcl/source/control/tabctrl.cxx:79
ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
-vcl/source/filter/jpeg/Exif.hxx:55
+vcl/source/filter/jpeg/Exif.hxx:51
Exif::ExifIFD tag sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:56
+vcl/source/filter/jpeg/Exif.hxx:52
Exif::ExifIFD type sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:57
+vcl/source/filter/jpeg/Exif.hxx:53
Exif::ExifIFD count sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:58
+vcl/source/filter/jpeg/Exif.hxx:54
Exif::ExifIFD offset sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:62
+vcl/source/filter/jpeg/Exif.hxx:58
Exif::TiffHeader byteOrder const sal_uInt16
vcl/source/filter/jpeg/transupp.h:132
(anonymous) slow_hflip boolean
@@ -930,11 +928,11 @@ vcl/source/filter/jpeg/transupp.h:148
(anonymous) crop_xoffset_set JCROP_CODE
vcl/source/filter/jpeg/transupp.h:150
(anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1055
+vcl/source/fontsubset/sft.cxx:1060
vcl::subHeader2 firstCode const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1056
+vcl/source/fontsubset/sft.cxx:1061
vcl::subHeader2 entryCount const sal_uInt16
-vcl/source/fontsubset/sft.cxx:1057
+vcl/source/fontsubset/sft.cxx:1062
vcl::subHeader2 idDelta const sal_uInt16
vcl/source/gdi/dibtools.cxx:52
(anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
@@ -970,7 +968,7 @@ vcl/source/gdi/dibtools.cxx:118
(anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
vcl/source/gdi/dibtools.cxx:119
(anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/gdi/pdfwriter_impl.hxx:280
+vcl/source/gdi/pdfwriter_impl.hxx:279
vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
vcl/source/treelist/headbar.cxx:41
ImplHeadItem maHelpId const class rtl::OString
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index d44c4d68109d..9de3830016c3 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -646,18 +646,14 @@ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:154
textconversiondlgs::ChineseDictionaryDialog m_xFT_Mapping std::unique_ptr<weld::Label>
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:157
textconversiondlgs::ChineseDictionaryDialog m_xFT_Property std::unique_ptr<weld::Label>
-sw/qa/extras/layout/layout.cxx:2608
- class SvtSysLocaleOptions &
+sw/qa/extras/uiwriter/uiwriter2.cxx:65
+ class SwUiWriterTest2 *
sw/source/core/crsr/crbm.cxx:66
(anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
sw/source/core/frmedt/fetab.cxx:78
TableWait m_pWait const std::unique_ptr<SwWait>
sw/source/core/layout/dbg_lay.cxx:172
SwImplEnterLeave nAction const enum DbgAction
-sw/source/filter/inc/fltshell.hxx:214
- SwFltRedline aStampPrev const class DateTime
-sw/source/filter/inc/fltshell.hxx:216
- SwFltRedline eTypePrev const enum RedlineType
sw/source/ui/config/mailconfigpage.cxx:54
SwTestAccountSettingsDialog m_xEstablish std::unique_ptr<weld::Label>
sw/source/ui/config/mailconfigpage.cxx:55
@@ -768,9 +764,9 @@ vcl/inc/WidgetThemeLibrary.hxx:106
vcl::WidgetThemeLibrary_t nSize uint32_t
vcl/source/app/salvtables.cxx:958
SalInstanceContainer m_xContainer VclPtr<vcl::Window>
-vcl/source/gdi/jobset.cxx:36
+vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:37
+vcl/source/gdi/jobset.cxx:36
ImplOldJobSetupData cPortName char [32]
vcl/source/gdi/pdfbuildin_fonts.hxx:34
vcl::pdf::BuildinFont m_nAscent const int
@@ -784,7 +780,7 @@ vcl/unx/generic/print/prtsetup.hxx:73
RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
vcl/unx/generic/print/prtsetup.hxx:108
RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/gtk3/gtk3gtkinst.cxx:3593
+vcl/unx/gtk3/gtk3gtkinst.cxx:3597
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
HyperLink atk_hyper_link const AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 23979bbf147a..7d41f0b84f7a 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -301,9 +301,9 @@ desktop/source/deployment/manager/dp_managerfac.cxx:48
desktop/unx/source/splashx.c:370
functions unsigned long
desktop/unx/source/splashx.c:370
- decorations unsigned long
-desktop/unx/source/splashx.c:370
flags unsigned long
+desktop/unx/source/splashx.c:370
+ decorations unsigned long
desktop/unx/source/splashx.c:371
input_mode long
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:47
@@ -346,6 +346,16 @@ framework/inc/uielement/langselectionmenucontroller.hxx:83
framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
framework/inc/uielement/langselectionmenucontroller.hxx:85
framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
+framework/inc/xml/imagesdocumenthandler.hxx:99
+ framework::OReadImagesDocumentHandler m_bExternalImagesStartFound _Bool
+framework/inc/xml/imagesdocumenthandler.hxx:100
+ framework::OReadImagesDocumentHandler m_bExternalImageStartFound _Bool
+framework/inc/xml/imagesdocumenthandler.hxx:101
+ framework::OReadImagesDocumentHandler m_nHashMaskModeBitmap sal_Int32
+framework/inc/xml/imagesdocumenthandler.hxx:102
+ framework::OReadImagesDocumentHandler m_nHashMaskModeColor sal_Int32
+framework/inc/xml/imagesdocumenthandler.hxx:133
+ framework::OWriteImagesDocumentHandler m_aXMLXlinkNS class rtl::OUString
framework/source/layoutmanager/toolbarlayoutmanager.hxx:280
framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
framework/source/layoutmanager/toolbarlayoutmanager.hxx:284
@@ -491,9 +501,9 @@ include/xmloff/shapeimport.hxx:181
include/xmloff/shapeimport.hxx:182
SdXML3DSceneAttributesHelper mbVUPUsed _Bool
io/source/stm/odata.cxx:240
- io_stm::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
-io/source/stm/odata.cxx:240
io_stm::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
+io/source/stm/odata.cxx:240
+ io_stm::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
jvmfwk/inc/vendorbase.hxx:174
jfw_plugin::VendorBase m_sArch class rtl::OUString
l10ntools/inc/common.hxx:31
@@ -560,7 +570,7 @@ sc/inc/pivot.hxx:78
ScDPLabelData mbIsValue _Bool
sc/inc/scmatrix.hxx:118
ScMatrix mbCloneIfConst _Bool
-sc/inc/scmod.hxx:102
+sc/inc/scmod.hxx:103
ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
sc/inc/tabopparams.hxx:38
ScInterpreterTableOpParams bValid _Bool
@@ -618,12 +628,8 @@ sc/source/filter/xml/xmldpimp.hxx:248
ScXMLDataPilotFieldContext mbHasHiddenMember _Bool
sc/source/filter/xml/xmldrani.hxx:72
ScXMLDatabaseRangeContext bIsSelection _Bool
-sc/source/filter/xml/xmlexprt.hxx:78
- ScXMLExport xCurrentTableCellRange css::uno::Reference<css::table::XCellRange>
sc/source/filter/xml/xmlexternaltabi.hxx:113
ScXMLExternalRefCellContext mnCellType sal_Int16
-sc/source/filter/xml/xmlsubti.hxx:58
- ScMyTables xCurrentCellRange css::uno::Reference<css::table::XCellRange>
sc/source/ui/inc/AccessibleText.hxx:194
ScAccessiblePreviewHeaderCellTextData mbRowHeader const _Bool
sc/source/ui/inc/datastream.hxx:105
@@ -726,7 +732,7 @@ soltools/cpp/cpp.h:143
macroValidator pMacro Nlist *
starmath/inc/view.hxx:156
SmCmdBoxWindow aController class SmEditController
-stoc/source/servicemanager/servicemanager.cxx:401
+stoc/source/servicemanager/servicemanager.cxx:392
(anonymous namespace)::OServiceManager m_SetLoadedFactories (anonymous namespace)::HashSet_Ref
store/source/storbios.cxx:56
OStoreSuperBlock m_nMarked sal_uInt32
@@ -814,9 +820,9 @@ svx/source/tbxctrls/tbcontrl.cxx:197
SvxFontNameBox_Impl m_aOwnFontList ::std::unique_ptr<FontList>
sw/inc/accmap.hxx:96
SwAccessibleMap mvShapes SwShapeList_Impl
-sw/inc/swmodule.hxx:95
+sw/inc/swmodule.hxx:96
SwModule m_pErrorHandler std::unique_ptr<SfxErrorHandler>
-sw/inc/swmodule.hxx:108
+sw/inc/swmodule.hxx:109
SwModule m_xLinguServiceEventListener css::uno::Reference<css::linguistic2::XLinguServiceEventListener>
sw/inc/swwait.hxx:45
SwWait mpLockedDispatchers std::unordered_set<SfxDispatcher *>
@@ -962,12 +968,12 @@ vcl/inc/qt5/Qt5Instance.hxx:61
Qt5Instance m_pFakeArgv std::unique_ptr<char *[]>
vcl/inc/qt5/Qt5Instance.hxx:62
Qt5Instance m_pFakeArgc std::unique_ptr<int>
-vcl/inc/salmenu.hxx:34
- SalItemParams nBits enum MenuItemBits
-vcl/inc/salmenu.hxx:35
+vcl/inc/salmenu.hxx:33
SalItemParams pMenu VclPtr<class Menu>
-vcl/inc/salmenu.hxx:36
+vcl/inc/salmenu.hxx:34
SalItemParams aText class rtl::OUString
+vcl/inc/salmenu.hxx:37
+ SalItemParams nBits enum MenuItemBits
vcl/inc/salmenu.hxx:42
SalMenuButtonItem mnId sal_uInt16
vcl/inc/salmenu.hxx:43
@@ -1014,21 +1020,21 @@ vcl/inc/WidgetThemeLibrary.hxx:93
vcl::ControlDrawParameters nValue int64_t
vcl/opengl/salbmp.cxx:446
(anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/source/filter/graphicfilter.cxx:659
+vcl/source/filter/graphicfilter.cxx:653
ImpFilterLibCacheEntry maFiltername const class rtl::OUString
-vcl/source/filter/graphicfilter.cxx:758
+vcl/source/filter/graphicfilter.cxx:752
ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry *
-vcl/source/filter/jpeg/Exif.hxx:55
+vcl/source/filter/jpeg/Exif.hxx:51
Exif::ExifIFD tag sal_uInt8 [2]
-vcl/source/filter/wmf/wmfwr.hxx:96
+vcl/source/filter/wmf/wmfwr.hxx:95
WMFWriter aDstClipRegion vcl::Region
vcl/source/fontsubset/sft.cxx:88
vcl::TTGlyphMetrics lsb sal_Int16
vcl/source/fontsubset/ttcr.cxx:356
vcl::tdata_post ptr void *
-vcl/source/gdi/pdfwriter_impl.hxx:181
+vcl/source/gdi/pdfwriter_impl.hxx:180
vcl::PDFWriterImpl::BitmapID m_nChecksum BitmapChecksum
-vcl/source/gdi/pdfwriter_impl.hxx:182
+vcl/source/gdi/pdfwriter_impl.hxx:181
vcl::PDFWriterImpl::BitmapID m_nMaskChecksum BitmapChecksum
vcl/unx/generic/app/wmadaptor.cxx:1264
_mwmhints flags unsigned long
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;
}
More information about the Libreoffice-commits
mailing list