diff options
4 files changed, 15 insertions, 34 deletions
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 433c1a74884a..106e04149590 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -154,8 +154,6 @@ dbaccess/source/core/dataaccess/connection.hxx:101 dbaccess::OConnection m_nInAppend std::atomic<std::size_t> dbaccess/source/core/inc/databasecontext.hxx:84 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL -desktop/qa/desktop_lib/test_desktop_lib.cxx:2902 - class AllSettings & drawinglayer/inc/texture/texture3d.hxx:55 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap drawinglayer/inc/texture/texture3d.hxx:57 @@ -338,10 +336,6 @@ include/vcl/commandevent.hxx:315 CommandGestureData meOrientation const enum PanningOrientation include/vcl/font/Feature.hxx:100 vcl::font::Feature m_eType enum vcl::font::FeatureType -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:36 - NotebookBarAddonsItem aImage class Image -include/vcl/opengl/OpenGLContext.hxx:43 - OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool include/vcl/pdf/PDFAnnotationMarker.hxx:65 vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType include/xmloff/shapeimport.hxx:56 @@ -478,6 +472,8 @@ sc/inc/compiler.hxx:266 ScCompiler::AddInMap pUpper const char * sc/inc/token.hxx:403 SingleDoubleRefModifier aDub struct ScComplexRefData +sc/qa/unit/ucalc_formula.cxx:3134 + class Test * sc/source/core/data/document.cxx:1240 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch sc/source/core/data/document.cxx:1241 diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 7b0d1e514c17..8bc25c00ed1e 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -12,8 +12,6 @@ chart2/source/inc/ModifyListenerCallBack.hxx:53 chart::ModifyListenerCallBack m_xModifyListener css::uno::Reference<css::util::XModifyListener> comphelper/source/container/enumerablemap.cxx:297 comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface> -connectivity/source/drivers/mork/MDatabaseMetaData.hxx:28 - connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper> cppu/source/threadpool/threadpool.cxx:365 _uno_ThreadPool dummy sal_Int32 cppu/source/typelib/typelib.cxx:59 @@ -24,8 +22,6 @@ dbaccess/source/core/inc/databasecontext.hxx:84 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL dbaccess/source/sdbtools/inc/connectiondependent.hxx:115 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard -desktop/qa/desktop_lib/test_desktop_lib.cxx:2902 - class AllSettings & emfio/source/emfuno/xemfparser.cxx:50 emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext> extensions/source/scanner/scanner.hxx:43 @@ -188,10 +184,6 @@ include/vcl/filter/PngImageReader.hxx:31 vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator> include/vcl/font/Feature.hxx:100 vcl::font::Feature m_eType enum vcl::font::FeatureType -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:36 - NotebookBarAddonsItem aImage class Image -include/vcl/opengl/OpenGLContext.hxx:43 - OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool include/vcl/pdf/PDFAnnotationMarker.hxx:65 vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType include/vcl/uitest/uiobject.hxx:283 @@ -288,6 +280,8 @@ sal/qa/osl/security/osl_Security.cxx:154 osl_Security::getUserName bRes1 _Bool sal/qa/osl/security/osl_Security.cxx:188 osl_Security::getConfigDir bRes1 _Bool +sc/qa/unit/ucalc_formula.cxx:3134 + class Test * sc/source/core/data/document.cxx:1240 (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch sc/source/core/data/document.cxx:1241 diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 86d4a5978449..39c06a7d3ccd 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -104,16 +104,12 @@ codemaker/source/javamaker/classfile.cxx:508 floatBytes float codemaker/source/javamaker/classfile.cxx:540 doubleBytes double -comphelper/qa/container/comphelper_ifcontainer.cxx:44 - (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const comphelper/qa/unit/parallelsorttest.cxx:44 ParallelSortTest mnThreads size_t comphelper/source/misc/asyncnotification.cxx:86 comphelper::EventNotifierImpl pKeepThisAlive std::shared_ptr<AsyncEventNotifierAutoJoin> configmgr/source/components.cxx:162 configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> * -connectivity/source/drivers/mork/MorkParser.hxx:132 - MorkParser error_ enum MorkErrors connectivity/source/inc/calc/CConnection.hxx:51 connectivity::calc::OCalcConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto> connectivity/source/inc/odbc/OConnection.hxx:54 @@ -180,6 +176,8 @@ cppu/source/uno/copy.hxx:38 cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32 cppu/source/uno/copy.hxx:39 cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32 +cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:45 + (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats * cppuhelper/source/access_control.cxx:79 cppu::(anonymous namespace)::permission m_str1 rtl_uString * cppuhelper/source/access_control.cxx:80 @@ -210,8 +208,6 @@ dbaccess/source/ui/app/AppDetailView.hxx:107 dbaui::OApplicationDetailView m_aExternalMnemonics class MnemonicGenerator dbaccess/source/ui/browser/dbloader.cxx:59 (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener> -desktop/qa/desktop_lib/test_desktop_lib.cxx:280 - DesktopLOKTest m_bModified _Bool desktop/source/app/app.cxx:1209 desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions> desktop/source/app/app.cxx:1210 @@ -388,13 +384,13 @@ include/unotools/fontcfg.hxx:159 utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash include/vcl/menu.hxx:457 MenuBar::MenuBarButtonCallbackArg bHighlight _Bool -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:45 +include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:44 AddonNotebookBarItem sTarget class rtl::OUString -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:46 +include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:45 AddonNotebookBarItem sContext class rtl::OUString -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:47 +include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:46 AddonNotebookBarItem sControlType class rtl::OUString -include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:48 +include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:47 AddonNotebookBarItem nWidth sal_uInt16 include/vcl/opengl/OpenGLContext.hxx:27 GLWindow bMultiSampleSupported _Bool @@ -1022,11 +1018,11 @@ vcl/inc/scanlinewriter.hxx:35 vcl::ScanlineWriter mpCurrentScanline sal_uInt8 * vcl/inc/svdata.hxx:454 ImplSVEvent mpInstanceRef VclPtr<vcl::Window> -vcl/inc/unx/gtk/gtkframe.hxx:80 +vcl/inc/unx/gtk/gtkframe.hxx:78 GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow * -vcl/inc/unx/gtk/gtkframe.hxx:81 +vcl/inc/unx/gtk/gtkframe.hxx:79 GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8 -vcl/inc/unx/gtk/gtkframe.hxx:82 +vcl/inc/unx/gtk/gtkframe.hxx:80 GtkSalFrame::IMHandler::PreviousKeyPress time guint32 vcl/inc/WidgetThemeLibrary.hxx:20 vcl::WidgetDrawStyle nSize uint32_t @@ -1100,6 +1096,8 @@ xmlhelp/source/cxxhelp/provider/databases.hxx:264 chelp::Databases m_aZipFileTable chelp::Databases::ZipFileTable xmlhelp/source/cxxhelp/provider/databases.hxx:270 chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable +xmloff/source/core/xmltkmap.cxx:45 + SvXMLTokenMap_Impl m_aFastTokenToTokenMap std::unordered_map<sal_Int32, sal_uInt16> xmloff/source/draw/ximpstyl.hxx:216 SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> > xmloff/source/forms/elementexport.hxx:47 diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index 46496762b0e1..8efb26c1131e 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -42,7 +42,6 @@ private: }; std::unordered_map< std::pair<sal_uInt16, OUString>, sal_uInt16, PairHash> m_aPrefixAndNameToTokenMap; - std::unordered_map< sal_Int32, sal_uInt16> m_aFastTokenToTokenMap; public: void insert( const SvXMLTokenMapEntry& rEntry ); @@ -55,12 +54,6 @@ void SvXMLTokenMap_Impl::insert( const SvXMLTokenMapEntry& rEntry ) GetXMLToken( rEntry.eLocalName ) ), rEntry.nToken ) ).second; assert(inserted && "duplicate token"); (void)inserted; - if( rEntry.nFastToken ) - { - bool inserted2 = m_aFastTokenToTokenMap.insert( std::make_pair( rEntry.nFastToken, rEntry.nToken ) ).second; - assert(inserted2 && "duplicate token"); - (void)inserted2; - } } sal_uInt16 SvXMLTokenMap_Impl::get( sal_uInt16 nKeyPrefix, const OUString& rLName ) const |