[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source include/sfx2 sc/source sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 11 07:40:06 UTC 2018
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 80 ++++------
compilerplugins/clang/unusedfields.readonly.results | 56 ++++---
compilerplugins/clang/unusedfields.untouched.results | 42 ++---
compilerplugins/clang/unusedfields.writeonly.results | 46 +----
dbaccess/source/core/dataaccess/intercept.cxx | 3
dbaccess/source/core/dataaccess/intercept.hxx | 1
include/sfx2/docfile.hxx | 1
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/inc/scuiasciiopt.hxx | 1
sfx2/source/appl/sfxpicklist.cxx | 2
sfx2/source/doc/docfile.cxx | 8 -
sfx2/source/doc/objstor.cxx | 2
sfx2/source/view/frame.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
14 files changed, 107 insertions(+), 141 deletions(-)
New commits:
commit 0e8e5c196bd8eeda37da0db17bb617f5e97f4ddb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 10 16:00:26 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Sep 11 09:39:44 2018 +0200
loplugin:unusedfields
Change-Id: I876183559a7d9f1e6d914fbf37d7ffe91459144e
Reviewed-on: https://gerrit.libreoffice.org/60278
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-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 b90e7a4dffed..b802986376e4 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
avmedia/source/vlc/wrapper/Types.hxx:45
libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
avmedia/source/vlc/wrapper/Types.hxx:46
- libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+ libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7)
avmedia/source/vlc/wrapper/Types.hxx:47
- libvlc_event_t u union (anonymous union at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+ libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5)
avmedia/source/vlc/wrapper/Types.hxx:53
libvlc_track_description_t psz_name char *
basegfx/source/polygon/b2dtrapezoid.cxx:201
@@ -120,13 +120,13 @@ cppu/source/uno/check.cxx:138
(anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
cui/source/dialogs/colorpicker.cxx:719
cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1381
+cui/source/factory/dlgfact.cxx:1387
SvxMacroAssignDialog m_aItems class SfxItemSet
cui/source/inc/cfgutil.hxx:190
SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
-cui/source/inc/cuitabarea.hxx:246
+cui/source/inc/cuitabarea.hxx:236
SvxAreaTabPage maFixed_ChangeType enum ChangeType
-cui/source/inc/cuitabarea.hxx:254
+cui/source/inc/cuitabarea.hxx:244
SvxAreaTabPage m_aXFillAttr class XFillAttrSetItem
dbaccess/source/core/api/RowSet.hxx:111
dbaccess::ORowSet m_aURL class rtl::OUString
@@ -156,9 +156,9 @@ drawinglayer/source/tools/emfphelperdata.hxx:156
emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
editeng/source/editeng/impedit.hxx:462
ImpEditEngine aSelFuncSet class EditSelFunctionSet
-filter/source/flash/swfwriter.hxx:394
+filter/source/flash/swfwriter.hxx:391
swf::Writer maMovieTempFile utl::TempFile
-filter/source/flash/swfwriter.hxx:395
+filter/source/flash/swfwriter.hxx:392
swf::Writer maFontsTempFile utl::TempFile
filter/source/graphicfilter/icgm/chart.hxx:44
DataNode nBoxX1 sal_Int16
@@ -176,11 +176,11 @@ include/drawinglayer/texture/texture3d.hxx:62
drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
include/drawinglayer/texture/texture3d.hxx:64
drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap
-include/filter/msfilter/svdfppt.hxx:882
+include/filter/msfilter/svdfppt.hxx:881
ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:883
+include/filter/msfilter/svdfppt.hxx:882
ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:884
+include/filter/msfilter/svdfppt.hxx:883
ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
include/LibreOfficeKit/LibreOfficeKitGtk.h:33
_LOKDocView aDrawingArea GtkDrawingArea
@@ -204,8 +204,6 @@ include/svx/ClassificationDialog.hxx:63
svx::ClassificationDialog m_nInsertMarkings sal_Int16
include/svx/itemwin.hxx:34
SvxLineBox aDelayTimer class Timer
-include/svx/paraprev.hxx:40
- SvxParaPrevWindow aSize class Size
include/vcl/font/Feature.hxx:102
vcl::font::Feature m_eType enum vcl::font::FeatureType
include/xmloff/shapeimport.hxx:140
@@ -292,57 +290,55 @@ sal/osl/unx/thread.cxx:94
osl_thread_priority_st m_Lowest int
sal/osl/unx/thread.cxx:112
osl_thread_global_st m_priority struct osl_thread_priority_st
-sal/qa/osl/process/osl_process.cxx:159
+sal/qa/osl/process/osl_process.cxx:157
Test_osl_executeProcess env_param_ const class rtl::OUString
sal/textenc/textenc.cxx:406
(anonymous namespace)::FullTextEncodingData module_ osl::Module
sc/inc/column.hxx:128
ScColumn maCellsEvent sc::CellStoreEvent
-sc/inc/compiler.hxx:260
+sc/inc/compiler.hxx:256
ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:261
+sc/inc/compiler.hxx:257
ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:259
ScCompiler::AddInMap pUpper const char *
sc/inc/formulalogger.hxx:42
sc::FormulaLogger maMessages std::vector<OUString>
sc/inc/interpretercontext.hxx:31
ScInterpreterContext mrDoc const class ScDocument &
-sc/inc/token.hxx:412
+sc/inc/token.hxx:406
SingleDoubleRefModifier aDub struct ScComplexRefData
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
-sc/source/core/data/document.cxx:1238
+sc/source/core/data/document.cxx:1244
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1239
+sc/source/core/data/document.cxx:1245
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
sc/source/filter/inc/htmlpars.hxx:614
ScHTMLQueryParser mnUnusedId ScHTMLTableId
sc/source/filter/inc/sheetdatacontext.hxx:61
oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/filter/inc/xetable.hxx:1017
+sc/source/filter/inc/xetable.hxx:1004
XclExpCellTable maArrayBfr class XclExpArrayBuffer
-sc/source/filter/inc/xetable.hxx:1018
+sc/source/filter/inc/xetable.hxx:1005
XclExpCellTable maShrfmlaBfr class XclExpShrfmlaBuffer
-sc/source/filter/inc/xiescher.hxx:1202
+sc/source/filter/inc/xiescher.hxx:1201
XclImpDffPropSet maDummyStrm class SvMemoryStream
sc/source/filter/inc/xihelper.hxx:329
XclImpCachedValue mxTokArr XclImpCachedValue::ScTokenArrayPtr
-sc/source/filter/inc/xistream.hxx:170
+sc/source/filter/inc/xistream.hxx:171
XclImpBiff8StdDecrypter maCodec ::msfilter::MSCodec_Std97
-sc/source/filter/inc/xistream.hxx:192
+sc/source/filter/inc/xistream.hxx:193
XclImpBiff8CryptoAPIDecrypter maCodec ::msfilter::MSCodec_CryptoAPI
-sc/source/filter/oox/worksheethelper.cxx:388
+sc/source/filter/oox/worksheethelper.cxx:387
oox::xls::WorksheetGlobals mxProgressBar oox::ISegmentProgressBarRef
sc/source/filter/xml/xmldrani.hxx:75
ScXMLDatabaseRangeContext bIsSelection _Bool
sc/source/filter/xml/xmlexternaltabi.hxx:112
ScXMLExternalRefCellContext mnCellType sal_Int16
-sc/source/filter/xml/xmltransformationi.hxx:75
- ScXMLColumnSortContext maSortParam struct ScSortParam
-sc/source/filter/xml/xmltransformationi.hxx:123
+sc/source/filter/xml/xmltransformationi.hxx:121
ScXMLColumnNumberContext aType class rtl::OUString
-sc/source/filter/xml/xmltransformationi.hxx:157
+sc/source/filter/xml/xmltransformationi.hxx:155
ScXMLDateTimeContext aType class rtl::OUString
sc/source/ui/inc/acredlin.hxx:58
ScAcceptChgDlg aReOpenIdle class Idle
@@ -370,11 +366,13 @@ sc/source/ui/inc/msgpool.hxx:46
ScMessagePool aCondFormatDlgItem class ScCondFormatDlgItem
sc/source/ui/inc/notemark.hxx:43
ScNoteMarker m_aTimer class Timer
+sc/source/ui/inc/scuiasciiopt.hxx:85
+ ScImportAsciiDlg aColumnUser class rtl::OUString
sccomp/source/solver/DifferentialEvolution.hxx:35
DifferentialEvolutionAlgorithm maRandomDevice std::random_device
sccomp/source/solver/ParticelSwarmOptimization.hxx:56
ParticleSwarmOptimizationAlgorithm maRandomDevice std::random_device
-scripting/source/stringresource/stringresource.cxx:1345
+scripting/source/stringresource/stringresource.cxx:1317
stringresource::BinaryInput m_aData Sequence<sal_Int8>
sd/inc/anminfo.hxx:52
SdAnimationInfo maSecondSoundFile class rtl::OUString
@@ -390,7 +388,7 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:36
sd::ZeroconfService port uint
sd/source/ui/table/TableDesignPane.hxx:106
sd::TableDesignPane aImpl class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1317
+sd/source/ui/view/DocumentRenderer.cxx:1319
sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1216
sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -439,7 +437,7 @@ svl/source/crypto/cryptosign.cxx:282
svtools/source/inc/svimpbox.hxx:125
SvImpLBox aFctSet class ImpLBSelEng
svtools/source/svhtml/htmlkywd.cxx:558
- HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
+ HTML_OptionEntry union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo6/svtools/source/svhtml/htmlkywd.cxx:558:5)
svtools/source/svhtml/htmlkywd.cxx:560
HTML_OptionEntry::(anonymous) sToken const sal_Char *
svtools/source/svhtml/htmlkywd.cxx:561
@@ -468,7 +466,7 @@ svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
(anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::rule<ScannerT>
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
-svx/source/dialog/framelinkarray.cxx:376
+svx/source/dialog/framelinkarray.cxx:378
svx::frame::MergedCellIterator mnFirstRow size_t
svx/source/dialog/imapwnd.hxx:78
IMapWindow maItemInfos struct SfxItemInfo [1]
@@ -488,7 +486,7 @@ sw/inc/unosett.hxx:144
SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
sw/qa/core/test_ToxTextGenerator.cxx:134
ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4005
+sw/qa/extras/uiwriter/uiwriter.cxx:4007
IdleTask maIdle class Idle
sw/source/core/crsr/crbm.cxx:64
(anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
@@ -510,8 +508,6 @@ sw/source/ui/dbui/mmaddressblockpage.hxx:212
SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter
sw/source/uibase/docvw/romenu.hxx:35
SwReadOnlyPopup m_aBuilder class VclBuilder
-sw/source/uibase/docvw/romenu.hxx:62
- SwReadOnlyPopup m_rDocPos const class Point &
sw/source/uibase/inc/chrdlg.hxx:43
SwCharDlg m_nCharUrlId sal_uInt16
sw/source/uibase/inc/chrdlg.hxx:45
@@ -548,7 +544,7 @@ ucb/source/ucp/gio/gio_mount.hxx:52
OOoMountOperationClass _gtk_reserved4 void (*)(void)
unotools/source/config/defaultoptions.cxx:94
SvtDefaultOptions_Impl m_aUserDictionaryPath class rtl::OUString
-vcl/headless/svpgdi.cxx:286
+vcl/headless/svpgdi.cxx:307
(anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
vcl/inc/canvasbitmap.hxx:44
vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
@@ -560,12 +556,6 @@ vcl/inc/opengl/RenderList.hxx:30
Vertex lineData glm::vec4
vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/qt5/Qt5Menu.hxx:74
- Qt5MenuItem mbVisible _Bool
-vcl/inc/qt5/Qt5Object.hxx:34
- Qt5Object m_aSystemData struct SystemEnvData
-vcl/inc/qt5/Qt5Object.hxx:36
- Qt5Object m_pParent class Qt5Frame *
vcl/inc/salmenu.hxx:42
SalMenuButtonItem mnId sal_uInt16
vcl/inc/salmenu.hxx:43
@@ -586,13 +576,13 @@ vcl/inc/unx/i18n_ic.hxx:46
SalI18N_InputContext maSwitchIMCallback XIMCallback
vcl/inc/unx/i18n_ic.hxx:47
SalI18N_InputContext maDestroyCallback XIMCallback
-vcl/source/app/salvtables.cxx:1354
+vcl/source/app/salvtables.cxx:1396
SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter
vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
vcl/source/gdi/jobset.cxx:36
ImplOldJobSetupData cPortName char [32]
-vcl/unx/gtk3/gtk3gtkinst.cxx:2234
+vcl/unx/gtk3/gtk3gtkinst.cxx:2248
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index ea73ac566494..63f634f60965 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -154,7 +154,7 @@ cppu/source/uno/check.cxx:134
(anonymous namespace)::Char3 c3 char
cppu/source/uno/check.cxx:138
(anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/options/optcolor.cxx:254
+cui/source/options/optcolor.cxx:255
ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
cui/source/options/optpath.cxx:79
OptPath_Impl m_aDefOpt class SvtDefaultOptions
@@ -172,6 +172,8 @@ dbaccess/source/core/api/RowSetBase.hxx:96
dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
dbaccess/source/core/dataaccess/documentcontainer.cxx:64
dbaccess::LocalNameApproval m_aErrors ::connectivity::SQLError
+dbaccess/source/core/dataaccess/intercept.hxx:107
+ dbaccess::OInterceptor m_pDisposeEventListeners std::unique_ptr<comphelper::OInterfaceContainerHelper2>
dbaccess/source/core/inc/ContentHelper.hxx:108
dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
dbaccess/source/filter/hsqldb/parseschema.hxx:36
@@ -236,7 +238,7 @@ filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:143
XMLFilterSettingsDialog maModuleOpt class SvtModuleOptions
framework/inc/dispatch/dispatchprovider.hxx:81
framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache
-framework/inc/helper/uiconfigelementwrapperbase.hxx:127
+framework/inc/helper/uiconfigelementwrapperbase.hxx:128
framework::UIConfigElementWrapperBase m_bConfigListening _Bool
framework/inc/xml/menudocumenthandler.hxx:133
framework::OReadMenuBarHandler m_bMenuMode _Bool
@@ -260,23 +262,27 @@ include/basic/sbstar.hxx:57
StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags>
include/connectivity/DriversConfig.hxx:76
connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
+include/connectivity/sdbcx/VCatalog.hxx:67
+ connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
include/connectivity/sdbcx/VDescriptor.hxx:56
connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
+include/connectivity/sdbcx/VGroup.hxx:58
+ connectivity::sdbcx::OGroup m_pUsers rtl::Reference<OUsers>
+include/connectivity/sdbcx/VUser.hxx:56
+ connectivity::sdbcx::OUser m_pGroups rtl::Reference<OGroups>
include/connectivity/sqlparse.hxx:115
connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
include/drawinglayer/processor3d/defaultprocessor3d.hxx:94
drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer
include/editeng/brushitem.hxx:53
SvxBrushItem maSecOptions class SvtSecurityOptions
-include/editeng/charsetcoloritem.hxx:35
- SvxCharSetColorItem eFrom rtl_TextEncoding
-include/filter/msfilter/svdfppt.hxx:711
+include/filter/msfilter/svdfppt.hxx:710
PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [5]
-include/filter/msfilter/svdfppt.hxx:882
+include/filter/msfilter/svdfppt.hxx:881
ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:883
+include/filter/msfilter/svdfppt.hxx:882
ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:884
+include/filter/msfilter/svdfppt.hxx:883
ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
include/oox/core/contexthandler2.hxx:220
oox::core::ContextHandler2Helper mnRootStackSize size_t
@@ -337,7 +343,7 @@ include/test/sheet/xnamedranges.hxx:38
include/test/sheet/xspreadsheets2.hxx:46
apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
include/unoidl/unoidl.hxx:443
- unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
+ unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo6/include/unoidl/unoidl.hxx:443:5)
include/unoidl/unoidl.hxx:444
unoidl::ConstantValue::(anonymous) booleanValue _Bool
include/unoidl/unoidl.hxx:445
@@ -364,7 +370,7 @@ include/vcl/filter/pdfdocument.hxx:200
vcl::filter::PDFNameElement m_nLength sal_uInt64
include/vcl/opengl/OpenGLContext.hxx:57
OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
-include/vcl/opengl/OpenGLContext.hxx:179
+include/vcl/opengl/OpenGLContext.hxx:177
OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
include/vcl/ppdparser.hxx:134
psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
@@ -410,33 +416,33 @@ sal/osl/unx/process.cxx:828
osl_procStat sigcatch char [24]
sal/rtl/alloc_arena.hxx:100
rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64]
-sal/rtl/digest.cxx:181
- DigestContextMD2 m_state sal_uInt32 [16]
sal/rtl/digest.cxx:182
+ DigestContextMD2 m_state sal_uInt32 [16]
+sal/rtl/digest.cxx:183
DigestContextMD2 m_chksum sal_uInt32 [16]
sal/rtl/uuid.cxx:64
UUID clock_seq_low sal_uInt8
sal/rtl/uuid.cxx:65
UUID node sal_uInt8 [6]
-sc/inc/compiler.hxx:128
+sc/inc/compiler.hxx:127
ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
-sc/inc/compiler.hxx:129
- ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:126:9)
-sc/inc/compiler.hxx:134
+sc/inc/compiler.hxx:128
+ ScRawToken::(anonymous) table struct (anonymous struct at /media/noel/disk2/libo6/sc/inc/compiler.hxx:125:9)
+sc/inc/compiler.hxx:133
ScRawToken::(anonymous) pMat class ScMatrix *
sc/inc/formulagroup.hxx:39
sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
sc/inc/reordermap.hxx:21
sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/source/core/inc/adiasync.hxx:41
+sc/source/core/inc/adiasync.hxx:42
ScAddInAsync::(anonymous) pStr class rtl::OUString *
-sc/source/core/inc/interpre.hxx:105
+sc/source/core/inc/interpre.hxx:99
ScTokenStack pPointer const formula::FormulaToken *[512]
sc/source/filter/inc/autofilterbuffer.hxx:178
oox::xls::FilterColumn mxSettings std::shared_ptr<FilterSettingsBase>
sc/source/filter/inc/commentsbuffer.hxx:42
oox::xls::CommentModel maAnchor css::awt::Rectangle
-sc/source/filter/inc/defnamesbuffer.hxx:84
+sc/source/filter/inc/defnamesbuffer.hxx:85
oox::xls::DefinedNameBase maRefAny css::uno::Any
sc/source/filter/inc/htmlpars.hxx:56
ScHTMLStyles maEmpty const class rtl::OUString
@@ -498,11 +504,13 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:101
pdfi::GraphicsContext BlendMode sal_Int8
sdext/source/pdfimport/tree/style.hxx:42
pdfi::StyleContainer::Style Contents class rtl::OUString
-sfx2/source/appl/lnkbase2.cxx:96
+sfx2/source/appl/lnkbase2.cxx:95
sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
+sfx2/source/doc/docfile.cxx:270
+ SfxMedium_Impl pOrigFilter std::shared_ptr<const SfxFilter>
slideshow/source/engine/slideshowimpl.cxx:153
(anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
-sot/source/sdstor/ucbstorage.cxx:408
+sot/source/sdstor/ucbstorage.cxx:407
UCBStorageStream_Impl m_aKey class rtl::OString
starmath/source/view.cxx:856
SmViewShell_Impl aOpts class SvtMiscOptions
@@ -670,6 +678,8 @@ vcl/inc/svdata.hxx:284
ImplSVNWFData mbNoActiveTabTextRaise _Bool
vcl/inc/svdata.hxx:286
ImplSVNWFData mbProgressNeedsErase _Bool
+vcl/inc/svdata.hxx:295
+ ImplSVNWFData mbRolloverMenubar _Bool
vcl/inc/unx/i18n_status.hxx:56
vcl::I18NStatus m_aCurrentIM class rtl::OUString
vcl/inc/unx/saldisp.hxx:288
@@ -726,9 +736,9 @@ vcl/source/gdi/dibtools.cxx:117
(anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
vcl/source/gdi/dibtools.cxx:118
(anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/gdi/pdfwriter_impl.hxx:301
+vcl/source/gdi/pdfwriter_impl.hxx:299
vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
-vcl/source/window/menuitemlist.hxx:55
+vcl/source/window/menuitemlist.hxx:57
MenuItemData aAccessibleName class rtl::OUString
vcl/unx/generic/print/bitmap_gfx.cxx:67
psp::HexEncoder mpFileBuffer sal_Char [16400]
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index c9408f3d0b37..ecb8e9c30536 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
avmedia/source/vlc/wrapper/Types.hxx:45
libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
avmedia/source/vlc/wrapper/Types.hxx:46
- libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+ libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7)
avmedia/source/vlc/wrapper/Types.hxx:47
- libvlc_event_t u union (anonymous union at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+ libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5)
avmedia/source/vlc/wrapper/Types.hxx:53
libvlc_track_description_t psz_name char *
basctl/source/inc/dlged.hxx:122
@@ -40,7 +40,7 @@ cui/source/dialogs/colorpicker.cxx:721
cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld>
cui/source/dialogs/colorpicker.cxx:723
cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cfg.hxx:576
+cui/source/inc/cfg.hxx:575
SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button>
cui/source/inc/cuicharmap.hxx:104
SvxCharacterMap m_xShowChar std::unique_ptr<weld::CustomWeld>
@@ -52,12 +52,12 @@ cui/source/inc/cuicharmap.hxx:108
SvxCharacterMap m_xShowSetArea std::unique_ptr<weld::CustomWeld>
cui/source/inc/cuicharmap.hxx:110
SvxCharacterMap m_xSearchSetArea std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:704
+cui/source/inc/cuitabarea.hxx:718
SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:705
+cui/source/inc/cuitabarea.hxx:719
SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld>
-cui/source/inc/insrc.hxx:31
- SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton>
+cui/source/inc/FontFeaturesDialog.hxx:53
+ cui::FontFeaturesDialog m_xPreviewWindow std::unique_ptr<weld::CustomWeld>
cui/source/inc/page.hxx:105
SvxPageDescPage m_xOrientationFT std::unique_ptr<weld::Label>
cui/source/inc/page.hxx:135
@@ -104,12 +104,14 @@ include/oox/vml/vmlshapecontext.hxx:116
oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
include/registry/registry.hxx:35
Registry_Api acquire void (*)(RegHandle)
+include/sfx2/mgetempl.hxx:63
+ SfxManageStyleSheetPage m_xNameFt std::unique_ptr<weld::Label>
include/sfx2/msg.hxx:117
SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/sfx2/msg.hxx:119
SfxType0 nAttribs sal_uInt16
-include/sfx2/tabdlg.hxx:238
- SfxTabDialogController m_xApplyBtn std::unique_ptr<weld::Button>
+include/svtools/ctrlbox.hxx:364
+ SvtLineListBox m_xLineSetWin std::unique_ptr<weld::CustomWeld>
include/svtools/genericunodialog.hxx:218
svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
include/svtools/PlaceEditDialog.hxx:48
@@ -186,16 +188,12 @@ sc/inc/interpretercontext.hxx:31
ScInterpreterContext mrDoc const class ScDocument &
sc/qa/unit/ucalc_column.cxx:104
aInputs aName const char *
-sc/source/core/data/document.cxx:1238
+sc/source/core/data/document.cxx:1244
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1239
+sc/source/core/data/document.cxx:1245
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
-sc/source/core/data/formulacell.cxx:1811
- (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
sc/source/filter/inc/sheetdatacontext.hxx:61
oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/filter/xml/xmltransformationi.hxx:75
- ScXMLColumnSortContext maSortParam struct ScSortParam
sc/source/ui/inc/crdlg.hxx:33
ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton>
sc/source/ui/inc/delcodlg.hxx:39
@@ -220,7 +218,7 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:61
sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
sd/source/ui/table/TableDesignPane.hxx:106
sd::TableDesignPane aImpl class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1317
+sd/source/ui/view/DocumentRenderer.cxx:1319
sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1216
sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -267,7 +265,7 @@ svl/source/crypto/cryptosign.cxx:281
svl/source/crypto/cryptosign.cxx:282
(anonymous namespace)::(anonymous) failInfo SECItem
svtools/source/svhtml/htmlkywd.cxx:558
- HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
+ HTML_OptionEntry union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo6/svtools/source/svhtml/htmlkywd.cxx:558:5)
svtools/source/svhtml/htmlkywd.cxx:560
HTML_OptionEntry::(anonymous) sToken const sal_Char *
svtools/source/svhtml/htmlkywd.cxx:561
@@ -320,13 +318,9 @@ uui/source/unknownauthdlg.hxx:36
UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton>
vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/qt5/Qt5Menu.hxx:74
- Qt5MenuItem mbVisible _Bool
-vcl/inc/qt5/Qt5Object.hxx:34
- Qt5Object m_aSystemData struct SystemEnvData
vcl/inc/salprn.hxx:44
SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
-vcl/source/app/salvtables.cxx:504
+vcl/source/app/salvtables.cxx:520
SalInstanceContainer m_xContainer VclPtr<vcl::Window>
vcl/source/gdi/jobset.cxx:35
ImplOldJobSetupData cDeviceName char [32]
@@ -338,9 +332,11 @@ 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:2234
+vcl/unx/gtk3/gtk3gtkinst.cxx:2248
CrippledViewport viewport GtkViewport
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link AtkHyperlink
+writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
+ writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
writerperfect/inc/WPFTEncodingDialog.hxx:37
writerperfect::WPFTEncodingDialog m_xBtnOk std::unique_ptr<weld::Button>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 99dea1bb3856..ea9276f77067 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -56,22 +56,18 @@ canvas/source/cairo/cairo_spritehelper.hxx:103
cairocanvas::SpriteHelper mbTextureDirty _Bool
canvas/source/opengl/ogl_spritedevicehelper.hxx:124
oglcanvas::SpriteDeviceHelper mpDevice css::rendering::XGraphicDevice *
-chart2/inc/ChartModel.hxx:471
- chart::ChartModel mnStart sal_Int32
chart2/inc/ChartModel.hxx:472
+ chart::ChartModel mnStart sal_Int32
+chart2/inc/ChartModel.hxx:473
chart::ChartModel mnEnd sal_Int32
chart2/source/controller/main/ElementSelector.hxx:37
chart::ListBoxEntryData nHierarchyDepth sal_Int32
-chart2/source/inc/MediaDescriptorHelper.hxx:75
+chart2/source/inc/MediaDescriptorHelper.hxx:77
apphelper::MediaDescriptorHelper ReadOnly _Bool
chart2/source/view/charttypes/PieChart.hxx:128
chart::PieChart::PieLabelInfo fValue double
codemaker/source/cppumaker/dependencies.hxx:108
codemaker::cppumaker::Dependencies m_voidDependency _Bool
-codemaker/source/cppumaker/dependencies.hxx:117
- codemaker::cppumaker::Dependencies m_floatDependency _Bool
-codemaker/source/cppumaker/dependencies.hxx:118
- codemaker::cppumaker::Dependencies m_doubleDependency _Bool
comphelper/qa/container/comphelper_ifcontainer.cxx:45
ContainerListener m_pStats struct ContainerStats *const
configmgr/source/components.cxx:164
@@ -142,9 +138,9 @@ cppu/source/uno/check.cxx:134
(anonymous namespace)::Char3 c3 char
cppu/source/uno/check.cxx:138
(anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cppuhelper/source/access_control.cxx:80
- cppu::(anonymous namespace)::permission m_str1 rtl_uString *
cppuhelper/source/access_control.cxx:81
+ cppu::(anonymous namespace)::permission m_str1 rtl_uString *
+cppuhelper/source/access_control.cxx:82
cppu::(anonymous namespace)::permission m_str2 rtl_uString *
cui/source/inc/cuihyperdlg.hxx:57
SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
@@ -208,8 +204,6 @@ framework/inc/services/layoutmanager.hxx:258
framework::LayoutManager m_bGlobalSettings _Bool
framework/source/layoutmanager/toolbarlayoutmanager.hxx:285
framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-framework/source/services/frame.cxx:421
- (anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch *
include/basic/basmgr.hxx:52
BasicError nReason enum BasicErrorReason
include/basic/sbxvar.hxx:70
@@ -244,8 +238,6 @@ include/svx/bmpmask.hxx:130
SvxBmpMask aSelItem class SvxBmpMaskSelectItem
include/svx/imapdlg.hxx:118
SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/svx/relfld.hxx:31
- SvxRelativeField bRelative _Bool
include/vcl/opengl/OpenGLContext.hxx:41
GLWindow bMultiSampleSupported _Bool
include/vcl/salnativewidgets.hxx:446
@@ -302,13 +294,13 @@ sal/textenc/tcvtutf7.cxx:396
ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
sal/textenc/tcvtutf7.cxx:397
ImplUTF7FromUCContextData mnBufferBits sal_uInt32
-sc/inc/compiler.hxx:260
+sc/inc/compiler.hxx:256
ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:261
+sc/inc/compiler.hxx:257
ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:259
ScCompiler::AddInMap pUpper const char *
-sc/inc/document.hxx:2527
+sc/inc/document.hxx:2523
ScMutationDisable mpDocument class ScDocument *
sc/inc/pivot.hxx:75
ScDPLabelData mnFlags sal_Int32
@@ -346,13 +338,13 @@ sc/source/filter/excel/xltoolbar.hxx:79
CTBS ictbView sal_uInt16
sc/source/filter/excel/xltools.cxx:104
smD union sal_math_Double
-sc/source/filter/inc/exp_op.hxx:52
+sc/source/filter/inc/exp_op.hxx:47
ExportBiff5 pExcRoot struct RootData *
-sc/source/filter/inc/imp_op.hxx:86
+sc/source/filter/inc/imp_op.hxx:81
ImportExcel::LastFormula mpCell class ScFormulaCell *
-sc/source/filter/inc/orcusinterface.hxx:387
+sc/source/filter/inc/orcusinterface.hxx:450
ScOrcusStyles::xf mnStyleXf size_t
-sc/source/filter/inc/orcusinterface.hxx:407
+sc/source/filter/inc/orcusinterface.hxx:470
ScOrcusStyles::cell_style mnBuiltInId size_t
sc/source/filter/inc/root.hxx:95
LOTUS_ROOT eActType enum Lotus123Typ
@@ -388,7 +380,7 @@ sd/source/ui/remotecontrol/Receiver.hxx:36
sd::Receiver pTransmitter class sd::Transmitter *
sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
-sd/source/ui/sidebar/SlideBackground.hxx:99
+sd/source/ui/sidebar/SlideBackground.hxx:100
sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox>
sfx2/source/view/classificationcontroller.cxx:59
sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener
@@ -471,7 +463,7 @@ sw/source/filter/inc/rtf.hxx:29
sw/source/filter/inc/rtf.hxx:30
RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
sw/source/filter/inc/rtf.hxx:31
- RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
+ RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo6/sw/source/filter/inc/rtf.hxx:27:9)
ucb/source/ucp/gio/gio_mount.hxx:46
OOoMountOperationClass parent_class GMountOperationClass
ucb/source/ucp/gio/gio_mount.hxx:49
@@ -492,10 +484,6 @@ vcl/inc/opengl/RenderList.hxx:29
Vertex color glm::vec4
vcl/inc/opengl/RenderList.hxx:30
Vertex lineData glm::vec4
-vcl/inc/qt5/Qt5Frame.hxx:59
- Qt5Frame m_pSalMenu class Qt5Menu *
-vcl/inc/qt5/Qt5Graphics.hxx:50
- Qt5Graphics m_pFontCollection class PhysicalFontCollection *
vcl/inc/salmenu.hxx:34
SalItemParams nBits enum MenuItemBits
vcl/inc/salmenu.hxx:42
@@ -550,9 +538,5 @@ vcl/unx/gtk/hudawareness.cxx:20
(anonymous) connection GDBusConnection *
vcl/unx/gtk/hudawareness.cxx:23
(anonymous) notify GDestroyNotify
-vcl/unx/kde4/KDEXLib.hxx:49
- KDEXLib::SocketData pending YieldFunc
-vcl/unx/kde4/KDEXLib.hxx:50
- KDEXLib::SocketData queued YieldFunc
writerfilter/source/dmapper/PropertyMap.hxx:197
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 7cec465d5de2..9668c273d0ec 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -59,9 +59,6 @@ void OInterceptor::dispose()
osl::MutexGuard aGuard(m_aMutex);
- if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
- m_pDisposeEventListeners->disposeAndClear( aEvt );
-
if ( m_pStatCL )
m_pStatCL->disposeAndClear( aEvt );
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index bcce278492bb..c7ddd3d217ab 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -104,7 +104,6 @@ private:
css::uno::Sequence< OUString > m_aInterceptedURL;
- std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pDisposeEventListeners;
std::unique_ptr<PropertyChangeListenerContainer> m_pStatCL;
};
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index dd2f1304e015..0abd7ba23c3a 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -121,7 +121,6 @@ public:
*/
void SetFilter(const std::shared_ptr<const SfxFilter>& pFilter);
const std::shared_ptr<const SfxFilter>& GetFilter() const;
- std::shared_ptr<const SfxFilter> const & GetOrigFilter() const;
const OUString& GetOrigURL() const;
SfxItemSet * GetItemSet() const;
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index e6774a9ea464..0679f5853bdc 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -294,7 +294,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
mnRowPosCount(0),
- aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
aTextSepList(SCSTR_TEXTSEP),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
meCall(eCall),
@@ -483,6 +482,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
pLbCustomLang->SelectLanguage(static_cast<LanguageType>(nLanguage));
// *** column type ListBox ***
+ OUString aColumnUser( ScResId( SCSTR_COLUMN_USER ) );
for (sal_Int32 nIdx {0}; nIdx>=0; )
{
pLbType->InsertEntry( aColumnUser.getToken( 0, ';', nIdx ) );
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 223ca7288c9d..25956d0780e4 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -82,7 +82,6 @@ class ScImportAsciiDlg : public ModalDialog
VclPtr<ScCsvTableBox> mpTableBox;
- OUString aColumnUser;
OUString aTextSepList;
OUString maFieldSeparators; // selected field separators
sal_Unicode mcTextSep;
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 451afe95cf8a..b32f14649f96 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -111,7 +111,7 @@ void SfxPickListImpl::AddDocumentToPickList( SfxObjectShell* pDocSh )
OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST);
OUString aFilter;
- std::shared_ptr<const SfxFilter> pFilter = pMed->GetOrigFilter();
+ std::shared_ptr<const SfxFilter> pFilter = pMed->GetFilter();
if ( pFilter )
aFilter = pFilter->GetFilterName();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6d2aa63dc242..bff1b39081f7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -275,7 +275,6 @@ public:
std::unique_ptr<SvStream> m_pInStream;
std::unique_ptr<SvStream> m_pOutStream;
- std::shared_ptr<const SfxFilter> pOrigFilter;
OUString aOrigURL;
DateTime aExpireTime;
SfxFrameWeakRef wLoadTargetFrame;
@@ -2799,13 +2798,6 @@ const std::shared_ptr<const SfxFilter>& SfxMedium::GetFilter() const
return pImpl->m_pFilter;
}
-
-std::shared_ptr<const SfxFilter> const & SfxMedium::GetOrigFilter() const
-{
- return pImpl->pOrigFilter ? pImpl->pOrigFilter : pImpl->m_pFilter;
-}
-
-
sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter )
{
sal_uInt32 nHash = 0;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3eba938736ab..f08529be0ce2 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2090,7 +2090,7 @@ void SfxObjectShell::AddToRecentlyUsedList()
if ( aUrl.GetProtocol() == INetProtocol::File )
{
- std::shared_ptr<const SfxFilter> pOrgFilter = pMedium->GetOrigFilter();
+ std::shared_ptr<const SfxFilter> pOrgFilter = pMedium->GetFilter();
Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::DecodeMechanism::NONE ),
pOrgFilter ? pOrgFilter->GetMimeType() : OUString(),
pOrgFilter ? pOrgFilter->GetServiceName() : OUString() );
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 8ae28d2e291b..a14885f40752 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -326,7 +326,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell const *pDoc )
// Mark FileOpen parameter
SfxItemSet* pItemSet = pMed->GetItemSet();
- std::shared_ptr<const SfxFilter> pFilter = pMed->GetOrigFilter();
+ std::shared_ptr<const SfxFilter> pFilter = pMed->GetFilter();
OUString aFilter;
if ( pFilter )
aFilter = pFilter->GetFilterName();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 2e77d5d189a3..918cc51edc18 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -357,7 +357,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
&& !pSh->IsModifyPasswordEntered() )
{
const OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DecodeMechanism::WithCharset );
- if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetOrigFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) )
+ if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) )
{
// this is a read-only document, if it has "Password to modify"
// the user should enter password before he can edit the document
More information about the Libreoffice-commits
mailing list