[Libreoffice-commits] core.git: compilerplugins/clang cui/source dbaccess/source editeng/source extensions/source include/editeng jvmfwk/inc jvmfwk/source reportdesign/source sc/inc sc/source sd/source svx/source sw/source ucb/source uui/source vcl/inc vcl/source vcl/unx xmlhelp/source xmloff/inc xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 9 10:34:20 UTC 2020
compilerplugins/clang/plugin.cxx | 24 +
compilerplugins/clang/test/unusedfields.cxx | 85 ++++-
compilerplugins/clang/unusedfields.cxx | 51 +++
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 170 ++++++++--
compilerplugins/clang/unusedfields.readonly.results | 42 +-
compilerplugins/clang/unusedfields.untouched.results | 38 +-
compilerplugins/clang/unusedfields.writeonly.results | 66 +--
cui/source/inc/textanim.hxx | 1
cui/source/inc/transfrm.hxx | 3
cui/source/tabpages/textanim.cxx | 3
cui/source/tabpages/transfrm.cxx | 6
dbaccess/source/filter/xml/xmlComponent.cxx | 22 -
dbaccess/source/filter/xml/xmlComponent.hxx | 4
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 11
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 1
editeng/source/uno/unotext2.cxx | 22 -
extensions/source/bibliography/datman.cxx | 4
include/editeng/unotext.hxx | 2
jvmfwk/inc/fwkbase.hxx | 1
jvmfwk/source/fwkbase.cxx | 6
reportdesign/source/filter/xml/xmlfilter.hxx | 1
reportdesign/source/ui/dlg/Navigator.cxx | 4
sc/inc/cellsuno.hxx | 1
sc/inc/editutil.hxx | 1
sc/inc/funcdesc.hxx | 1
sc/source/core/data/funcdesc.cxx | 6
sc/source/core/tool/editutil.cxx | 3
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 2
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 1
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 4
sc/source/ui/inc/solveroptions.hxx | 1
sc/source/ui/inc/tbzoomsliderctrl.hxx | 1
sc/source/ui/miscdlgs/solveroptions.cxx | 3
sc/source/ui/unoobj/cellsuno.cxx | 11
sd/source/ui/dlg/dlgpage.cxx | 11
sd/source/ui/dlg/prltempl.cxx | 3
sd/source/ui/dlg/tpaction.cxx | 3
sd/source/ui/inc/GraphicObjectBar.hxx | 1
sd/source/ui/inc/MediaObjectBar.hxx | 1
sd/source/ui/inc/TabControl.hxx | 1
sd/source/ui/inc/dlgpage.hxx | 1
sd/source/ui/inc/prltempl.hxx | 1
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/slideshow/PaneHider.cxx | 5
sd/source/ui/slideshow/PaneHider.hxx | 1
sd/source/ui/view/GraphicObjectBar.cxx | 5
sd/source/ui/view/MediaObjectBar.cxx | 5
sd/source/ui/view/tabcontr.cxx | 2
svx/source/customshapes/EnhancedCustomShape3d.cxx | 3
svx/source/customshapes/EnhancedCustomShape3d.hxx | 2
sw/source/core/edit/acorrect.cxx | 5
sw/source/core/view/viewsh.cxx | 17 -
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/index/cnttab.cxx | 35 --
sw/source/uibase/inc/swuipardlg.hxx | 1
ucb/source/ucp/ftp/ftpintreq.cxx | 3
ucb/source/ucp/ftp/ftpintreq.hxx | 1
uui/source/masterpassworddlg.cxx | 3
uui/source/masterpassworddlg.hxx | 2
uui/source/passworddlg.cxx | 5
uui/source/passworddlg.hxx | 3
vcl/inc/bitmap/Octree.hxx | 1
vcl/inc/unx/saldisp.hxx | 1
vcl/source/bitmap/BitmapFilterStackBlur.cxx | 8
vcl/source/bitmap/Octree.cxx | 18 -
vcl/source/gdi/textlayout.cxx | 7
vcl/unx/generic/app/saldisp.cxx | 14
vcl/unx/gtk3/gtk3gtkinst.cxx | 11
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 17 -
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 5
xmloff/inc/txtvfldi.hxx | 3
xmloff/source/draw/animationimport.cxx | 3
xmloff/source/draw/sdxmlimp_impl.hxx | 2
xmloff/source/draw/ximpbody.cxx | 26 -
xmloff/source/draw/ximpbody.hxx | 3
xmloff/source/text/txtvfldi.cxx | 9
76 files changed, 516 insertions(+), 338 deletions(-)
New commits:
commit abe39f7781f59b96c5a8d3dd5b41c60fdf04ad84
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Mar 6 14:40:40 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 9 11:33:43 2020 +0100
improve loplugin:unusedfields
noticed something that wasn't being picked up, wrote some tests,
and found an unhandled case in Plugin::getParentFunctionDecl
Change-Id: I52b4ea273be6614e197392dfc4d6053bbc1704de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90141
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index c6591d6b4fd5..d2555eb034c2 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -217,9 +217,31 @@ static const Decl* getDeclContext(ASTContext& context, const Stmt* stmt)
return nullptr;
}
+static const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt)
+{
+ auto it = context.getParents(*stmt).begin();
+
+ if (it == context.getParents(*stmt).end())
+ return nullptr;
+
+ const Decl *decl = it->get<Decl>();
+ if (decl)
+ {
+ if (isa<VarDecl>(decl))
+ return dyn_cast<FunctionDecl>(decl->getDeclContext());
+ return decl;
+ }
+
+ stmt = it->get<Stmt>();
+ if (stmt)
+ return getFunctionDeclContext(context, stmt);
+
+ return nullptr;
+}
+
const FunctionDecl* Plugin::getParentFunctionDecl( const Stmt* stmt )
{
- const Decl *decl = getDeclContext(compiler.getASTContext(), stmt);
+ const Decl *decl = getFunctionDeclContext(compiler.getASTContext(), stmt);
if (decl)
return static_cast<const FunctionDecl*>(decl->getNonClosureContext());
diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx
index 6efb17334e21..6b54b4f7acf1 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -6,8 +6,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "config_clang.h"
-#if defined _WIN32 //TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
+// CLANG_VERSION = older versions of clang need something different in getParentFunctionDecl
+// WIN32 = TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
+#if CLANG_VERSION < 110000 || defined _WIN32
// expected-no-diagnostics
#else
@@ -20,6 +23,7 @@
struct Foo
// expected-error at -1 {{read m_foo1 [loplugin:unusedfields]}}
+// expected-error at -2 {{outside m_foo1 [loplugin:unusedfields]}}
{
int m_foo1;
};
@@ -41,6 +45,20 @@ struct Bar
// expected-error at -14 {{write m_bar7 [loplugin:unusedfields]}}
// expected-error at -15 {{write m_bar9 [loplugin:unusedfields]}}
// expected-error at -16 {{write m_bar12 [loplugin:unusedfields]}}
+// expected-error at -17 {{outside-constructor m_bar2 [loplugin:unusedfields]}}
+// expected-error at -18 {{outside-constructor m_bar3 [loplugin:unusedfields]}}
+// expected-error at -19 {{outside-constructor m_bar3b [loplugin:unusedfields]}}
+// expected-error at -20 {{outside-constructor m_bar4 [loplugin:unusedfields]}}
+// expected-error at -21 {{outside-constructor m_bar5 [loplugin:unusedfields]}}
+// expected-error at -22 {{outside-constructor m_bar6 [loplugin:unusedfields]}}
+// expected-error at -23 {{outside-constructor m_bar7 [loplugin:unusedfields]}}
+// expected-error at -24 {{outside-constructor m_bar8 [loplugin:unusedfields]}}
+// expected-error at -25 {{outside-constructor m_bar9 [loplugin:unusedfields]}}
+// expected-error at -26 {{outside-constructor m_bar10 [loplugin:unusedfields]}}
+// expected-error at -27 {{outside-constructor m_bar11 [loplugin:unusedfields]}}
+// expected-error at -28 {{outside-constructor m_bar12 [loplugin:unusedfields]}}
+// expected-error at -29 {{outside-constructor m_barfunctionpointer [loplugin:unusedfields]}}
+// expected-error at -30 {{outside m_barstream [loplugin:unusedfields]}}
{
int m_bar1;
int m_bar2 = 1;
@@ -145,6 +163,11 @@ struct ReadOnlyAnalysis
// expected-error at -7 {{write m_f4 [loplugin:unusedfields]}}
// expected-error at -8 {{write m_f5 [loplugin:unusedfields]}}
// expected-error at -9 {{write m_f6 [loplugin:unusedfields]}}
+// expected-error at -10 {{outside-constructor m_f2 [loplugin:unusedfields]}}
+// expected-error at -11 {{outside-constructor m_f3 [loplugin:unusedfields]}}
+// expected-error at -12 {{outside-constructor m_f4 [loplugin:unusedfields]}}
+// expected-error at -13 {{outside-constructor m_f5 [loplugin:unusedfields]}}
+// expected-error at -14 {{outside-constructor m_f6 [loplugin:unusedfields]}}
{
int m_f1;
int m_f2;
@@ -186,6 +209,7 @@ ReadOnlyAnalysis2 global { 1 };
struct ReadOnlyAnalysis3
// expected-error at -1 {{read m_f1 [loplugin:unusedfields]}}
+// expected-error at -2 {{outside-constructor m_f1 [loplugin:unusedfields]}}
{
int m_f1;
@@ -202,6 +226,9 @@ struct ReadOnlyAnalysis4
// expected-error at -1 {{read m_readonly [loplugin:unusedfields]}}
// expected-error at -2 {{write m_writeonly [loplugin:unusedfields]}}
// expected-error at -3 {{read m_readonlyCss [loplugin:unusedfields]}}
+// expected-error at -4 {{outside-constructor m_readonly [loplugin:unusedfields]}}
+// expected-error at -5 {{outside-constructor m_readonlyCss [loplugin:unusedfields]}}
+// expected-error at -6 {{outside-constructor m_writeonly [loplugin:unusedfields]}}
{
std::vector<int> m_readonly;
std::vector<int> m_writeonly;
@@ -230,6 +257,7 @@ struct VclPtr
// Check calls to operators
struct WriteOnlyAnalysis2
// expected-error at -1 {{write m_vclwriteonly [loplugin:unusedfields]}}
+// expected-error at -2 {{outside-constructor m_vclwriteonly [loplugin:unusedfields]}}
{
VclPtr<int> m_vclwriteonly;
@@ -250,6 +278,7 @@ namespace WriteOnlyAnalysis3
struct Foo1
// expected-error at -1 {{read m_field1 [loplugin:unusedfields]}}
// expected-error at -2 {{write m_field1 [loplugin:unusedfields]}}
+ // expected-error at -3 {{outside-constructor m_field1 [loplugin:unusedfields]}}
{
int m_field1;
Foo1() : m_field1(1) {}
@@ -273,6 +302,9 @@ namespace ReadOnlyAnalysis5
// expected-error at -1 {{read m_field1 [loplugin:unusedfields]}}
// expected-error at -2 {{read m_field2 [loplugin:unusedfields]}}
// expected-error at -3 {{read m_field3xx [loplugin:unusedfields]}}
+ // expected-error at -4 {{outside-constructor m_field1 [loplugin:unusedfields]}}
+ // expected-error at -5 {{outside-constructor m_field2 [loplugin:unusedfields]}}
+ // expected-error at -6 {{outside-constructor m_field3xx [loplugin:unusedfields]}}
{
std::unique_ptr<int> m_field1;
rtl::Reference<RefTarget> m_field2;
@@ -295,6 +327,57 @@ namespace ReadOnlyAnalysis5
};
};
+
+namespace TouchFromOutsideConstructorAnalysis1
+{
+ struct RenderContextGuard
+ // expected-error at -1 {{write m_pRef [loplugin:unusedfields]}}
+ // expected-error at -2 {{read m_pRef [loplugin:unusedfields]}}
+ // expected-error at -3 {{write m_pOriginalValue [loplugin:unusedfields]}}
+ {
+ int& m_pRef;
+ int m_pOriginalValue;
+
+ RenderContextGuard(int& pRef, int pValue)
+ : m_pRef(pRef),
+ m_pOriginalValue(m_pRef)
+ {
+ m_pRef = pValue;
+ }
+ };
+};
+
+namespace TouchFromOutsideAnalysis1
+{
+ struct SwViewShell
+ {
+ int* GetWin();
+ int* Imp();
+ };
+ struct RenderContextGuard
+ // expected-error at -1 {{write m_pShell [loplugin:unusedfields]}}
+ // expected-error at -2 {{read m_pShell [loplugin:unusedfields]}}
+ {
+ SwViewShell* m_pShell;
+
+ RenderContextGuard(SwViewShell* pShell)
+ : m_pShell(pShell)
+ {
+ if (m_pShell->GetWin())
+ {
+ int* pDrawView(m_pShell->Imp());
+
+ if (nullptr != pDrawView)
+ {
+ FindPageWindow(*m_pShell->GetWin());
+ }
+ }
+ }
+
+ void FindPageWindow(int x);
+ };
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index 98c5a30d6a1d..5f5101e85af9 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -222,6 +222,18 @@ void UnusedFields::run()
"write %0",
compat::getBeginLoc(s.parentRecord))
<< s.fieldName;
+ for (const MyFieldInfo & s : touchedFromOutsideConstructorSet)
+ report(
+ DiagnosticsEngine::Warning,
+ "outside-constructor %0",
+ compat::getBeginLoc(s.parentRecord))
+ << s.fieldName;
+ for (const MyFieldInfo & s : touchedFromOutsideSet)
+ report(
+ DiagnosticsEngine::Warning,
+ "outside %0",
+ compat::getBeginLoc(s.parentRecord))
+ << s.fieldName;
}
}
@@ -1132,6 +1144,28 @@ bool UnusedFields::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
return true;
}
+static const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt)
+{
+ auto it = context.getParents(*stmt).begin();
+
+ if (it == context.getParents(*stmt).end())
+ return nullptr;
+
+ const Decl *decl = it->get<Decl>();
+ if (decl)
+ {
+ if (isa<VarDecl>(decl))
+ return dyn_cast<FunctionDecl>(decl->getDeclContext());
+ return decl;
+ }
+
+ stmt = it->get<Stmt>();
+ if (stmt)
+ return getFunctionDeclContext(context, stmt);
+
+ return nullptr;
+}
+
void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Expr* memberExpr) {
const FunctionDecl* memberExprParentFunction = getParentFunctionDecl(memberExpr);
const CXXMethodDecl* methodDecl = dyn_cast_or_null<CXXMethodDecl>(memberExprParentFunction);
@@ -1140,6 +1174,16 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
// it's touched from somewhere outside a class
if (!methodDecl) {
+ if (fieldDecl->getName() == "m_pShell")
+ {
+ if (memberExprParentFunction)
+ memberExprParentFunction->dump();
+ memberExpr->dump();
+ const Decl *decl = getFunctionDeclContext(compiler.getASTContext(), memberExpr);
+ if (decl)
+ decl->dump();
+ std::cout << "site1" << std::endl;
+ }
touchedFromOutsideSet.insert(fieldInfo);
return;
}
@@ -1155,6 +1199,13 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
if (!constructorDecl)
touchedFromOutsideConstructorSet.insert(fieldInfo);
} else {
+ if (fieldDecl->getName() == "m_pShell")
+ {
+ if (memberExprParentFunction)
+ memberExprParentFunction->dump();
+ memberExpr->dump();
+ std::cout << "site2" << std::endl;
+ }
touchedFromOutsideSet.insert(fieldInfo);
}
}
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index b02a68e3ae25..20780329b2c4 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,19 +9,25 @@ 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 /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+ libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
avmedia/source/vlc/wrapper/Types.hxx:47
- libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+ libvlc_event_t u union (anonymous union at /home/noel/libo2/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/b2dpolygontriangulator.cxx:112
+ basegfx::(anonymous namespace)::Triangulator maStartEntries basegfx::(anonymous namespace)::EdgeEntries
basegfx/source/polygon/b2dtrapezoid.cxx:205
basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
+basegfx/source/polygon/b2dtrapezoid.cxx:257
+ basegfx::trapezoidhelper::(anonymous namespace)::TrapezoidSubdivider maPoints std::vector<B2DPoint>
basic/qa/cppunit/basictest.hxx:28
MacroSnippet maDll class BasicDLL
binaryurp/source/unmarshal.hxx:87
binaryurp::Unmarshal buffer_ com::sun::star::uno::Sequence<sal_Int8>
binaryurp/source/writer.hxx:148
binaryurp::Writer state_ struct binaryurp::WriterState
+canvas/source/tools/surfaceproxy.hxx:105
+ canvas::SurfaceProxy mpPageManager canvas::PageManagerSharedPtr
canvas/source/vcl/impltools.hxx:115
vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
chart2/source/controller/accessibility/AccessibleChartShape.hxx:79
@@ -140,36 +146,54 @@ cui/source/inc/tabstpge.hxx:87
SvxTabulatorTabPage m_aCenterWin class TabWin_Impl
cui/source/inc/tabstpge.hxx:88
SvxTabulatorTabPage m_aDezWin class TabWin_Impl
+cui/source/inc/textanim.hxx:40
+ SvxTextAnimationPage rOutAttrs const class SfxItemSet &
+cui/source/inc/transfrm.hxx:167
+ SvxAngleTabPage rOutAttrs const class SfxItemSet &
+cui/source/inc/transfrm.hxx:217
+ SvxSlantTabPage rOutAttrs const class SfxItemSet &
cui/source/options/optcolor.cxx:237
(anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor class Color
-dbaccess/source/core/api/RowSet.hxx:111
+dbaccess/source/core/api/RowSet.hxx:108
dbaccess::ORowSet m_aURL class rtl::OUString
-dbaccess/source/core/api/RowSet.hxx:125
+dbaccess/source/core/api/RowSet.hxx:122
dbaccess::ORowSet m_nMaxFieldSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:127
+dbaccess/source/core/api/RowSet.hxx:124
dbaccess::ORowSet m_nQueryTimeOut sal_Int32
-dbaccess/source/core/api/RowSet.hxx:129
+dbaccess/source/core/api/RowSet.hxx:126
dbaccess::ORowSet m_nTransactionIsolation sal_Int32
-dbaccess/source/core/api/RowSet.hxx:141
+dbaccess/source/core/api/RowSet.hxx:138
dbaccess::ORowSet m_bIsBookmarkable _Bool
-dbaccess/source/core/api/RowSet.hxx:143
+dbaccess/source/core/api/RowSet.hxx:140
dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:459
+dbaccess/source/core/api/RowSet.hxx:456
dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:460
+dbaccess/source/core/api/RowSet.hxx:457
dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:461
+dbaccess/source/core/api/RowSet.hxx:458
dbaccess::ORowSetClone m_bIsBookmarkable _Bool
dbaccess/source/core/dataaccess/connection.hxx:102
dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
-dbaccess/source/core/inc/databasecontext.hxx:95
+dbaccess/source/core/inc/databasecontext.hxx:85
dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+dbaccess/source/filter/xml/xmlComponent.hxx:30
+ dbaxml::OXMLComponent m_sName class rtl::OUString
+dbaccess/source/filter/xml/xmlComponent.hxx:31
+ dbaxml::OXMLComponent m_sHREF class rtl::OUString
+dbaccess/source/filter/xml/xmlComponent.hxx:32
+ dbaxml::OXMLComponent m_bAsTemplate _Bool
+dbaccess/source/filter/xml/xmlHierarchyCollection.hxx:33
+ dbaxml::OXMLHierarchyCollection m_sName class rtl::OUString
drawinglayer/source/tools/emfphelperdata.hxx:198
emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
drawinglayer/source/tools/emfphelperdata.hxx:199
emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
editeng/source/editeng/impedit.hxx:458
ImpEditEngine aSelFuncSet class EditSelFunctionSet
+extensions/source/bibliography/datman.cxx:408
+ (anonymous namespace)::DBChangeDialog_Impl aConfig class DBChangeDialogConfig_Impl
+extensions/source/bibliography/datman.cxx:409
+ (anonymous namespace)::DBChangeDialog_Impl pDatMan class BibDataManager *
filter/source/flash/swfwriter.hxx:391
swf::Writer maMovieTempFile utl::TempFile
filter/source/flash/swfwriter.hxx:392
@@ -192,6 +216,10 @@ 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/editeng/unotext.hxx:589
+ SvxUnoTextContentEnumeration mrText const class SvxUnoTextBase &
+include/editeng/unotext.hxx:607
+ SvxUnoTextRangeEnumeration mnParagraph sal_Int32
include/filter/msfilter/svdfppt.hxx:877
ImplPPTParaPropSet nDontKnow1 sal_uInt32
include/filter/msfilter/svdfppt.hxx:878
@@ -334,6 +362,8 @@ include/sfx2/msg.hxx:147
SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/svl/ondemand.hxx:55
OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
+include/svx/ClassificationDialog.hxx:29
+ svx::ClassificationDialog maInternationalHelper class SfxClassificationHelper
include/svx/ClassificationDialog.hxx:31
svx::ClassificationDialog m_bPerParagraph const _Bool
include/svx/imapdlg.hxx:91
@@ -354,13 +384,17 @@ include/vcl/NotebookBarAddonsMerger.hxx:45
AddonsParams sControlType class rtl::OUString
include/vcl/NotebookBarAddonsMerger.hxx:46
AddonsParams nWidth sal_uInt16
+include/vcl/weld.hxx:2082
+ weld::Builder m_sHelpRoot class rtl::OString
include/xmloff/shapeimport.hxx:140
SdXML3DLightContext mbSpecular _Bool
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:52
+jvmfwk/inc/fwkbase.hxx:36
+ jfw::VendorSettings m_xmlDocVendorSettingsFileUrl class rtl::OUString
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
GtvApplicationWindow parent_instance GtkApplicationWindow
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:56
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
GtvApplicationWindow doctype LibreOfficeKitDocumentType
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:75
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:74
GtvApplicationWindowClass parentClass GtkApplicationWindowClass
libreofficekit/qa/gtktiledviewer/gtv-application.hxx:26
GtvApplication parent GtkApplication
@@ -426,6 +460,8 @@ reportdesign/source/core/api/ReportDefinition.cxx:250
reportdesign::(anonymous namespace)::OStyle m_aSize awt::Size
reportdesign/source/filter/xml/xmlExport.cxx:1241
sal_Int32
+reportdesign/source/ui/dlg/Navigator.cxx:801
+ rptui::ONavigatorImpl m_rController ::rptui::OReportController &
sal/qa/osl/condition/osl_Condition.cxx:72
osl_Condition::ctors bRes1 _Bool
sal/qa/osl/condition/osl_Condition.cxx:202
@@ -456,10 +492,10 @@ sal/qa/osl/module/osl_Module.cxx:342
osl_Module::getFunctionSymbol bRes1 _Bool
sal/qa/osl/pipe/osl_Pipe.cxx:359
osl_Pipe::clear bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:524
- osl_Pipe::getError bRes _Bool
sal/qa/osl/pipe/osl_Pipe.cxx:524
osl_Pipe::getError bRes1 _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:524
+ osl_Pipe::getError bRes _Bool
sal/qa/osl/pipe/osl_Pipe.cxx:562
osl_Pipe::getHandle bRes1 _Bool
sal/qa/osl/pipe/osl_Pipe.cxx:850
@@ -480,6 +516,8 @@ sal/qa/osl/security/osl_Security.cxx:188
osl_Security::getConfigDir bRes1 _Bool
sal/textenc/textenc.cxx:406
(anonymous namespace)::FullTextEncodingData module_ osl::Module
+sc/inc/cellsuno.hxx:1173
+ ScUniqueCellFormatsObj aTotalRange const class ScRange
sc/inc/column.hxx:126
ScColumn maCellsEvent const sc::CellStoreEvent
sc/inc/compiler.hxx:262
@@ -488,6 +526,10 @@ sc/inc/compiler.hxx:263
ScCompiler::AddInMap pEnglish const char *
sc/inc/compiler.hxx:265
ScCompiler::AddInMap pUpper const char *
+sc/inc/editutil.hxx:90
+ ScEditAttrTester pEngine class ScEditEngineDefaulter *
+sc/inc/funcdesc.hxx:390
+ ScFunctionMgr pFuncList class ScFunctionList *
sc/inc/token.hxx:403
SingleDoubleRefModifier aDub struct ScComplexRefData
sc/source/core/data/document.cxx:1241
@@ -502,6 +544,8 @@ sc/source/filter/inc/htmlpars.hxx:614
ScHTMLQueryParser mnUnusedId ScHTMLTableId
sc/source/filter/inc/sheetdatacontext.hxx:52
oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
+sc/source/filter/inc/XclImpChangeTrack.hxx:56
+ XclImpChangeTrack xInStrm tools::SvRef<SotStorageStream>
sc/source/filter/inc/xetable.hxx:1006
XclExpCellTable maArrayBfr class XclExpArrayBuffer
sc/source/filter/inc/xetable.hxx:1007
@@ -520,6 +564,8 @@ sc/source/filter/xml/xmldrani.hxx:72
ScXMLDatabaseRangeContext bIsSelection _Bool
sc/source/filter/xml/xmlexternaltabi.hxx:111
ScXMLExternalRefCellContext mnCellType sal_Int16
+sc/source/filter/xml/XMLTableHeaderFooterContext.hxx:38
+ XMLTableHeaderFooterContext sOn const class rtl::OUString
sc/source/filter/xml/xmltransformationi.hxx:155
ScXMLDateTimeContext aType class rtl::OUString
sc/source/ui/inc/acredlin.hxx:50
@@ -548,6 +594,10 @@ sc/source/ui/inc/notemark.hxx:46
ScNoteMarker m_aTimer class Timer
sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
+sc/source/ui/inc/solveroptions.hxx:61
+ ScSolverOptionsDialog maDescriptions css::uno::Sequence<OUString>
+sc/source/ui/inc/tbzoomsliderctrl.hxx:70
+ ScZoomSliderWnd aLogicalSize const class Size
sc/source/ui/inc/xmlsourcedlg.hxx:62
ScXMLSourceDlg maCustomCompare struct CustomCompare
sccomp/source/solver/DifferentialEvolution.hxx:35
@@ -564,10 +614,24 @@ sd/source/filter/ppt/pptin.hxx:81
SdPPTImport maParam struct PowerPointImportParam
sd/source/ui/inc/AccessibleDocumentViewBase.hxx:263
accessibility::AccessibleDocumentViewBase maViewForwarder class accessibility::AccessibleViewForwarder
+sd/source/ui/inc/dlgpage.hxx:35
+ SdPageDlg mpDocShell const class SfxObjectShell *
+sd/source/ui/inc/GraphicObjectBar.hxx:51
+ sd::GraphicObjectBar mpViewSh class sd::ViewShell *const
+sd/source/ui/inc/MediaObjectBar.hxx:53
+ sd::MediaObjectBar mpViewSh class sd::ViewShell *const
+sd/source/ui/inc/OutlineBulletDlg.hxx:44
+ sd::OutlineBulletDlg m_aInputSet class SfxItemSet
+sd/source/ui/inc/prltempl.hxx:55
+ SdPresLayoutTemplateDlg pOrgSet const class SfxItemSet *
+sd/source/ui/inc/tpaction.hxx:42
+ SdActionDlg rOutAttrs const class SfxItemSet &
sd/source/ui/remotecontrol/Receiver.hxx:35
sd::Receiver pTransmitter class sd::Transmitter *
sd/source/ui/remotecontrol/ZeroconfService.hxx:32
sd::ZeroconfService port const uint
+sd/source/ui/slideshow/PaneHider.hxx:50
+ sd::PaneHider mrViewShell const class sd::ViewShell &
sd/source/ui/view/DocumentRenderer.cxx:1339
sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
sd/source/ui/view/viewshel.cxx:1161
@@ -666,6 +730,8 @@ svl/source/crypto/cryptosign.cxx:285
(anonymous namespace)::PKIStatusInfo failInfo SECItem
svx/inc/GalleryControl.hxx:42
svx::sidebar::GalleryControl mpGallery class Gallery *
+svx/source/customshapes/EnhancedCustomShape3d.hxx:48
+ EnhancedCustomShape3d::Transformation2D pMap const double *
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
@@ -696,26 +762,30 @@ svx/source/dialog/imapwnd.hxx:87
IMapWindow maItemInfos struct SfxItemInfo [1]
svx/source/dialog/weldeditview.cxx:312
(anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/stbctrls/pszctrl.cxx:101
+svx/source/stbctrls/pszctrl.cxx:95
(anonymous namespace)::FunctionPopup_Impl m_aBuilder class VclBuilder
-svx/source/stbctrls/selctrl.cxx:44
+svx/source/stbctrls/selctrl.cxx:42
(anonymous namespace)::SelectionTypePopup m_aBuilder class VclBuilder
-svx/source/stbctrls/zoomctrl.cxx:62
+svx/source/stbctrls/zoomctrl.cxx:59
(anonymous namespace)::ZoomPopup_Impl m_aBuilder class VclBuilder
-svx/source/svdraw/svdcrtv.cxx:53
+svx/source/svdraw/svdcrtv.cxx:48
ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
svx/source/tbxctrls/extrusioncontrols.hxx:66
svx::ExtrusionDirectionWindow maImgDirection class Image [9]
svx/source/xml/xmleohlp.cxx:72
OutputStorageWrapper_Impl aTempFile class utl::TempFile
+svx/source/xml/xmlgrhlp.cxx:89
+ (anonymous namespace)::GraphicInputStream maTempFile utl::TempFile
sw/inc/unosett.hxx:145
SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
sw/qa/core/test_ToxTextGenerator.cxx:145
(anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4184
+sw/qa/extras/uiwriter/uiwriter.cxx:4210
(anonymous namespace)::IdleTask maIdle class Idle
sw/source/core/crsr/crbm.cxx:64
(anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
+sw/source/core/edit/acorrect.cxx:43
+ (anonymous namespace)::PaMIntoCursorShellRing rSh class SwCursorShell &
sw/source/core/inc/swfont.hxx:988
SvStatistics nGetStretchTextSize sal_uInt16
sw/source/core/layout/dbg_lay.cxx:170
@@ -726,20 +796,42 @@ sw/source/core/text/inftxt.hxx:682
SwTextSlot aText class rtl::OUString
sw/source/core/text/porfld.cxx:143
(anonymous namespace)::SwFieldSlot aText class rtl::OUString
+sw/source/ui/index/cnttab.cxx:137
+ (anonymous namespace)::SwEntryBrowseBox m_sSearch class rtl::OUString
+sw/source/ui/index/cnttab.cxx:138
+ (anonymous namespace)::SwEntryBrowseBox m_sAlternative class rtl::OUString
+sw/source/ui/index/cnttab.cxx:139
+ (anonymous namespace)::SwEntryBrowseBox m_sPrimKey class rtl::OUString
+sw/source/ui/index/cnttab.cxx:140
+ (anonymous namespace)::SwEntryBrowseBox m_sSecKey class rtl::OUString
+sw/source/ui/index/cnttab.cxx:141
+ (anonymous namespace)::SwEntryBrowseBox m_sComment class rtl::OUString
+sw/source/ui/index/cnttab.cxx:142
+ (anonymous namespace)::SwEntryBrowseBox m_sCaseSensitive class rtl::OUString
+sw/source/ui/index/cnttab.cxx:143
+ (anonymous namespace)::SwEntryBrowseBox m_sWordOnly class rtl::OUString
sw/source/uibase/docvw/romenu.hxx:34
SwReadOnlyPopup m_aBuilder class VclBuilder
+sw/source/uibase/docvw/romenu.hxx:46
+ SwReadOnlyPopup m_nReadonlyGraphictogallery const sal_uInt16
+sw/source/uibase/docvw/romenu.hxx:50
+ SwReadOnlyPopup m_nReadonlyBackgroundtogallery const sal_uInt16
sw/source/uibase/inc/condedit.hxx:43
ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
sw/source/uibase/inc/olmenu.hxx:78
SwSpellPopup m_aBuilder class VclBuilder
sw/source/uibase/inc/swuicnttab.hxx:239
SwTokenWindow m_aAdjustPositionsIdle class Idle
+sw/source/uibase/inc/swuipardlg.hxx:29
+ SwParaDlg nHtmlMode sal_uInt16
sw/source/uibase/inc/uivwimp.hxx:93
SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
sw/source/uibase/inc/unodispatch.hxx:45
SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard const class SolarMutexGuard
toolkit/source/awt/stylesettings.cxx:94
toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard const class SolarMutexGuard
+ucb/source/ucp/ftp/ftpintreq.hxx:75
+ ftp::XInteractionRequestImpl p2 class ftp::XInteractionDisapproveImpl *const
ucb/source/ucp/gio/gio_mount.hxx:74
OOoMountOperationClass parent_class GMountOperationClass
ucb/source/ucp/gio/gio_mount.hxx:77
@@ -750,8 +842,14 @@ ucb/source/ucp/gio/gio_mount.hxx:79
OOoMountOperationClass _gtk_reserved3 void (*)(void)
ucb/source/ucp/gio/gio_mount.hxx:80
OOoMountOperationClass _gtk_reserved4 void (*)(void)
-vcl/headless/svpgdi.cxx:319
- (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
+uui/source/masterpassworddlg.hxx:29
+ MasterPasswordDialog rResLocale const std::locale &
+uui/source/passworddlg.hxx:47
+ PasswordDialog rResLocale const std::locale &
+vcl/headless/svpgdi.cxx:398
+ (anonymous namespace)::BitmapHelper aTmpBmp class SvpSalBitmap
+vcl/inc/bitmap/Octree.hxx:55
+ Octree mpAccess const class BitmapReadAccess *
vcl/inc/canvasbitmap.hxx:42
vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
vcl/inc/graphic/Manager.hxx:41
@@ -762,7 +860,7 @@ vcl/inc/opengl/RenderList.hxx:30
Vertex lineData glm::vec4
vcl/inc/opengl/zone.hxx:33
OpenGLVCLContextZone aZone const class OpenGLZone
-vcl/inc/qt5/Qt5Graphics.hxx:58
+vcl/inc/qt5/Qt5Graphics.hxx:56
Qt5Graphics m_lastPopupRect class QRect
vcl/inc/salmenu.hxx:42
SalMenuButtonItem mnId sal_uInt16
@@ -792,6 +890,8 @@ vcl/inc/unx/i18n_ic.hxx:45
SalI18N_InputContext maSwitchIMCallback XIMCallback
vcl/inc/unx/i18n_ic.hxx:46
SalI18N_InputContext maDestroyCallback XIMCallback
+vcl/inc/unx/saldisp.hxx:125
+ SalColormap m_nXScreen class SalX11Screen
vcl/inc/WidgetThemeLibrary.hxx:90
vcl::ControlDrawParameters nSize uint32_t
vcl/inc/WidgetThemeLibrary.hxx:91
@@ -802,7 +902,7 @@ vcl/inc/WidgetThemeLibrary.hxx:93
vcl::ControlDrawParameters eState enum ControlState
vcl/inc/WidgetThemeLibrary.hxx:109
vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:5793
+vcl/source/app/salvtables.cxx:5852
(anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
vcl/source/gdi/jobset.cxx:37
(anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -814,6 +914,8 @@ 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/source/gdi/textlayout.cxx:93
+ vcl::ReferenceDeviceTextLayout m_aUnzoomedPointFont const class vcl::Font
vcl/unx/gtk3/a11y/atkwrapper.hxx:47
AtkObjectWrapper aParent const AtkObject
vcl/unx/gtk3/a11y/atkwrapper.hxx:75
@@ -824,12 +926,26 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
(anonymous namespace)::GLOAction parent_instance GObject
vcl/unx/gtk3/gtk3glomenu.cxx:14
GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:5143
+vcl/unx/gtk3/gtk3gtkinst.cxx:4814
+ (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
+vcl/unx/gtk3/gtk3gtkinst.cxx:5165
(anonymous namespace)::CrippledViewport viewport GtkViewport
+vcl/unx/gtk3/gtk3gtkinst.cxx:13349
+ (anonymous namespace)::GtkInstanceBuilder m_sHelpRoot class rtl::OUString
writerfilter/source/dmapper/PropertyMap.hxx:220
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
+xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx:47
+ chelp::ResultSetForQuery m_aURLParameter const class chelp::URLParameter
+xmloff/inc/txtvfldi.hxx:405
+ XMLVariableDeclImportContext aValueHelper class XMLValueImportHelper
+xmloff/inc/txtvfldi.hxx:406
+ XMLVariableDeclImportContext cSeparationChar sal_Unicode
xmloff/source/chart/transporttypes.hxx:149
CustomLabelField sRuns std::vector<OUString>
+xmloff/source/draw/ximpbody.hxx:31
+ SdXMLDrawPageContext maMasterPageName class rtl::OUString
+xmloff/source/draw/ximpbody.hxx:32
+ SdXMLDrawPageContext maHREF class rtl::OUString
xmloff/source/text/XMLTextListBlockContext.hxx:35
XMLTextListBlockContext msListStyleName class rtl::OUString
xmloff/source/text/XMLTextListBlockContext.hxx:41
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 3071b96d5a38..25a153d86200 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -174,17 +174,17 @@ dbaccess/source/core/api/RowSetBase.hxx:96
dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
dbaccess/source/core/dataaccess/documentcontainer.cxx:67
dbaccess::(anonymous namespace)::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:109
+dbaccess/source/core/inc/ContentHelper.hxx:105
dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
-dbaccess/source/filter/hsqldb/parseschema.hxx:36
+dbaccess/source/filter/hsqldb/parseschema.hxx:35
dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
dbaccess/source/ui/control/tabletree.cxx:233
dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
dbaccess/source/ui/inc/charsetlistbox.hxx:44
dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
-dbaccess/source/ui/inc/directsql.hxx:65
+dbaccess/source/ui/inc/directsql.hxx:67
dbaui::DirectSQLDialog m_aColorConfig const svtools::ColorConfig
-dbaccess/source/ui/inc/WCopyTable.hxx:261
+dbaccess/source/ui/inc/WCopyTable.hxx:259
dbaui::OCopyTableWizard m_aLocale css::lang::Locale
drawinglayer/source/processor2d/vclprocessor2d.hxx:82
drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
@@ -341,7 +341,7 @@ include/svx/svdoedge.hxx:160
include/svx/svdpntv.hxx:160
SdrPaintView maDrawinglayerOpt const class SvtOptionsDrawinglayer
include/unoidl/unoidl.hxx:443
- unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/disk2/libo4/include/unoidl/unoidl.hxx:443:5)
+ unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:443:5)
include/unoidl/unoidl.hxx:444
unoidl::ConstantValue::(anonymous) booleanValue _Bool
include/unoidl/unoidl.hxx:445
@@ -372,7 +372,7 @@ io/source/stm/odata.cxx:578
io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
io/source/stm/odata.cxx:578
io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:53
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:46
(anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
libreofficekit/source/gtk/lokdocview.cxx:86
(anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading _Bool
@@ -419,17 +419,13 @@ sc/inc/attarray.hxx:68
sc/inc/compiler.hxx:129
ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
sc/inc/compiler.hxx:130
- ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo4/sc/inc/compiler.hxx:127:9)
+ ScRawToken::(anonymous) table const struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:127:9)
sc/inc/compiler.hxx:135
ScRawToken::(anonymous) pMat class ScMatrix *const
sc/inc/formulagroup.hxx:39
sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **const
sc/inc/reordermap.hxx:21
sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/qa/extras/anchor.cxx:61
- sc_apitest::ScAnchorTest mxComponent uno::Reference<lang::XComponent>
-sc/qa/unit/scshapetest.cxx:43
- sc_apitest::ScShapeTest mxComponent uno::Reference<lang::XComponent>
sc/source/core/inc/adiasync.hxx:42
ScAddInAsync::(anonymous) pStr class rtl::OUString *
sc/source/core/inc/interpre.hxx:102
@@ -598,13 +594,13 @@ sw/source/core/access/accfrmobjmap.hxx:100
SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
sw/source/core/access/acchypertextdata.hxx:40
SwAccessibleHyperTextData maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:106
+sw/source/core/access/accmap.cxx:107
SwAccessibleContextMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:291
+sw/source/core/access/accmap.cxx:290
SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type, SwShapeFunc>
-sw/source/core/access/accmap.cxx:648
+sw/source/core/access/accmap.cxx:647
SwAccessibleEventMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:692
+sw/source/core/access/accmap.cxx:691
SwAccessibleSelectedParas_Impl maMap std::map<key_type, mapped_type, key_compare>
sw/source/core/doc/swstylemanager.cxx:60
(anonymous namespace)::SwStyleManager aAutoCharPool class StylePool
@@ -618,7 +614,7 @@ sw/source/core/text/inftxt.cxx:567
(anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
sw/source/core/text/redlnitr.hxx:76
SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
-sw/source/filter/html/htmltab.cxx:2834
+sw/source/filter/html/htmltab.cxx:2835
CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
sw/source/filter/inc/rtf.hxx:32
RTFSurround::(anonymous) nVal sal_uInt8
@@ -730,7 +726,7 @@ vcl/inc/salwtype.hxx:205
SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong
vcl/inc/salwtype.hxx:211
SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:278
+vcl/inc/svdata.hxx:316
ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
vcl/inc/toolbox.h:108
vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
@@ -898,15 +894,15 @@ vcl/source/control/roadmapwizard.cxx:62
vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
vcl/source/control/tabctrl.cxx:78
ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
-vcl/source/filter/jpeg/Exif.hxx:51
+vcl/source/filter/jpeg/Exif.hxx:53
Exif::ExifIFD tag sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:52
+vcl/source/filter/jpeg/Exif.hxx:54
Exif::ExifIFD type sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:53
+vcl/source/filter/jpeg/Exif.hxx:55
Exif::ExifIFD count sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:54
+vcl/source/filter/jpeg/Exif.hxx:56
Exif::ExifIFD offset sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:58
+vcl/source/filter/jpeg/Exif.hxx:60
Exif::TiffHeader byteOrder const sal_uInt16
vcl/source/filter/jpeg/transupp.h:132
(anonymous) slow_hflip boolean
@@ -998,5 +994,5 @@ xmloff/source/chart/SchXMLChartContext.hxx:56
SeriesDefaultsAndStyles maPercentageErrorDefault const css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:57
SeriesDefaultsAndStyles maErrorMarginDefault const css::uno::Any
-xmloff/source/core/xmlexp.cxx:262
+xmloff/source/core/xmlexp.cxx:264
SvXMLExport_Impl maSaveOptions const class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 2f94798d9bb1..568a83577f26 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 /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+ libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
avmedia/source/vlc/wrapper/Types.hxx:47
- libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+ libvlc_event_t u union (anonymous union at /home/noel/libo2/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
@@ -36,13 +36,13 @@ cppu/source/threadpool/threadpool.cxx:361
_uno_ThreadPool dummy sal_Int32
cppu/source/typelib/typelib.cxx:59
(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
-dbaccess/source/core/inc/databasecontext.hxx:95
+dbaccess/source/core/inc/databasecontext.hxx:85
dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
emfio/source/emfuno/xemfparser.cxx:50
emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
-extensions/source/scanner/scanner.hxx:45
+extensions/source/scanner/scanner.hxx:43
ScannerManager maProtector osl::Mutex
helpcompiler/inc/HelpCompiler.hxx:196
HelpCompiler lang const std::string
@@ -80,20 +80,20 @@ include/sfx2/msg.hxx:133
SfxType2 nAttribs sal_uInt16
include/sfx2/msg.hxx:133
SfxType2 aAttrib struct SfxTypeAttrib [2]
+include/sfx2/msg.hxx:134
+ SfxType3 pType const std::type_info *
include/sfx2/msg.hxx:134
SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
include/sfx2/msg.hxx:134
SfxType3 nAttribs sal_uInt16
include/sfx2/msg.hxx:134
SfxType3 aAttrib struct SfxTypeAttrib [3]
-include/sfx2/msg.hxx:134
- SfxType3 pType const std::type_info *
-include/sfx2/msg.hxx:135
- SfxType4 aAttrib struct SfxTypeAttrib [4]
include/sfx2/msg.hxx:135
SfxType4 nAttribs sal_uInt16
include/sfx2/msg.hxx:135
SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:135
+ SfxType4 aAttrib struct SfxTypeAttrib [4]
include/sfx2/msg.hxx:135
SfxType4 pType const std::type_info *
include/sfx2/msg.hxx:136
@@ -214,11 +214,11 @@ include/vcl/uitest/uiobject.hxx:272
TabPageUIObject mxTabPage VclPtr<class TabPage>
include/xmloff/formlayerexport.hxx:172
xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:52
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
GtvApplicationWindow parent_instance GtkApplicationWindow
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:56
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
GtvApplicationWindow doctype LibreOfficeKitDocumentType
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:75
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:74
GtvApplicationWindowClass parentClass GtkApplicationWindowClass
libreofficekit/qa/gtktiledviewer/gtv-application.hxx:26
GtvApplication parent GtkApplication
@@ -316,10 +316,12 @@ sc/source/filter/html/htmlpars.cxx:3010
(anonymous namespace)::CSSHandler::MemStr mn size_t
sc/source/filter/inc/sheetdatacontext.hxx:52
oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:455
+sc/source/ui/inc/docsh.hxx:459
ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
+sd/source/ui/inc/sdtreelb.hxx:72
+ SdPageObjsTLV m_xDropTargetHelper std::unique_ptr<SdPageObjsTLVDropTarget>
sd/source/ui/remotecontrol/ZeroconfService.hxx:32
sd::ZeroconfService port const uint
sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
@@ -404,11 +406,11 @@ vcl/inc/opengl/zone.hxx:33
OpenGLVCLContextZone aZone const class OpenGLZone
vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
-vcl/inc/qt5/Qt5Graphics.hxx:56
+vcl/inc/qt5/Qt5Graphics.hxx:54
Qt5Graphics m_focusedButton std::unique_ptr<QPushButton>
-vcl/inc/qt5/Qt5Graphics.hxx:57
+vcl/inc/qt5/Qt5Graphics.hxx:55
Qt5Graphics m_image std::unique_ptr<QImage>
-vcl/inc/qt5/Qt5Graphics.hxx:58
+vcl/inc/qt5/Qt5Graphics.hxx:56
Qt5Graphics m_lastPopupRect class QRect
vcl/inc/salprn.hxx:45
SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
@@ -442,9 +444,13 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
(anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
(anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:5143
+vcl/unx/gtk3/gtk3gtkinst.cxx:5165
(anonymous namespace)::CrippledViewport viewport GtkViewport
writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
xmloff/source/chart/transporttypes.hxx:149
CustomLabelField sRuns std::vector<OUString>
+xmloff/source/draw/sdxmlimp_impl.hxx:159
+ SdXMLImport mpDrawPageAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:160
+ SdXMLImport mpDrawPageElemTokenMap std::unique_ptr<SvXMLTokenMap>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 0da880763305..e4627fe73eda 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -90,7 +90,7 @@ chart2/source/controller/dialogs/DialogModel.cxx:173
(anonymous namespace)::lcl_DataSeriesContainerAppend m_rDestCnt (anonymous namespace)::lcl_DataSeriesContainerAppend::tContainerType *
chart2/source/controller/dialogs/DialogModel.cxx:232
(anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt (anonymous namespace)::lcl_RolesWithRangeAppend::tContainerType *
-chart2/source/controller/inc/ChartController.hxx:417
+chart2/source/controller/inc/ChartController.hxx:413
chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper>
chart2/source/controller/inc/dlg_View3D.hxx:51
chart::View3DDialog m_xIllumination std::unique_ptr<ThreeD_SceneIllumination_TabPage>
@@ -170,7 +170,7 @@ connectivity/source/inc/writer/WConnection.hxx:66
connectivity::writer::OWriterConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
cppcanvas/source/inc/implrenderer.hxx:210
cppcanvas::internal::ImplRenderer aBaseTransform struct cppcanvas::internal::XForm
-cppu/source/typelib/typelib.cxx:907
+cppu/source/typelib/typelib.cxx:903
(anonymous namespace)::BaseList set (anonymous namespace)::BaseList::Set
cppu/source/uno/check.cxx:38
(anonymous namespace)::C1 n1 sal_Int16
@@ -230,7 +230,7 @@ cui/source/inc/cuihyperdlg.hxx:77
SvxHpLinkDlg maCtrl class SvxHlinkCtrl
cui/source/inc/screenshotannotationdlg.hxx:30
ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
-dbaccess/source/core/dataaccess/databasedocument.hxx:176
+dbaccess/source/core/dataaccess/databasedocument.hxx:177
dbaccess::ODatabaseDocument m_pEventExecutor ::rtl::Reference<DocumentEventExecutor>
dbaccess/source/core/dataaccess/documentdefinition.cxx:299
dbaccess::(anonymous namespace)::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
@@ -238,7 +238,7 @@ dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:84
dbaccess::OSingleSelectQueryComposer m_aColumnsCollection std::vector<std::unique_ptr<OPrivateColumns> >
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:86
dbaccess::OSingleSelectQueryComposer m_aTablesCollection std::vector<std::unique_ptr<OPrivateTables> >
-dbaccess/source/core/inc/TableDeco.hxx:67
+dbaccess/source/core/inc/TableDeco.hxx:66
dbaccess::ODBTableDecorator m_xColumnMediator css::uno::Reference<css::container::XContainerListener>
dbaccess/source/filter/xml/dbloader2.cxx:233
dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader>
@@ -298,9 +298,9 @@ embeddedobj/source/inc/oleembobj.hxx:189
OleEmbeddedObject m_bFromClipboard _Bool
emfio/inc/mtftools.hxx:511
emfio::MtfTools mrclBounds tools::Rectangle
-extensions/source/propctrlr/genericpropertyhandler.hxx:63
+extensions/source/propctrlr/genericpropertyhandler.hxx:65
pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
-extensions/source/scanner/scanner.hxx:47
+extensions/source/scanner/scanner.hxx:45
ScannerManager mpData void *
framework/inc/services/layoutmanager.hxx:248
framework::LayoutManager m_bGlobalSettings _Bool
@@ -418,8 +418,6 @@ include/test/beans/xpropertyset.hxx:56
apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
include/unotools/fontcfg.hxx:158
utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/accel.hxx:42
- Accelerator maCurKeyCode vcl::KeyCode
include/vcl/menu.hxx:454
MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
include/vcl/NotebookBarAddonsMerger.hxx:54
@@ -444,14 +442,14 @@ include/vcl/sysdata.hxx:69
SystemEnvData pSalFrame void *
include/vcl/textrectinfo.hxx:32
TextRectInfo mnLineCount sal_uInt16
-include/vcl/vclenum.hxx:199
+include/vcl/vclenum.hxx:202
ItalicMatrix yy double
-include/vcl/vclenum.hxx:199
- ItalicMatrix yx double
-include/vcl/vclenum.hxx:199
- ItalicMatrix xy double
-include/vcl/vclenum.hxx:199
+include/vcl/vclenum.hxx:202
ItalicMatrix xx double
+include/vcl/vclenum.hxx:202
+ ItalicMatrix xy double
+include/vcl/vclenum.hxx:202
+ ItalicMatrix yx double
include/xmloff/shapeimport.hxx:180
SdXML3DSceneAttributesHelper mbVRPUsed _Bool
include/xmloff/shapeimport.hxx:181
@@ -466,11 +464,11 @@ jvmfwk/inc/vendorbase.hxx:174
jfw_plugin::VendorBase m_sArch class rtl::OUString
l10ntools/inc/common.hxx:31
common::HandledArgs m_bUTF8BOM _Bool
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:29
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:28
GtvRenderingArgs m_aBackgroundColor std::string
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:63
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:62
GtvApplicationWindow statusbar GtkWidget *
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:39
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:37
(anonymous namespace)::GtvMainToolbarPrivateImpl m_pPartModeSelector GtkWidget *
package/inc/ByteChucker.hxx:38
ByteChucker p2Sequence sal_Int8 *const
@@ -492,7 +490,7 @@ sal/rtl/alloc_arena.hxx:35
rtl_arena_stat_type m_mem_total sal_Size
sal/rtl/alloc_arena.hxx:36
rtl_arena_stat_type m_mem_alloc sal_Size
-sal/rtl/math.cxx:1025
+sal/rtl/math.cxx:952
md union sal_math_Double
sal/textenc/tcvtutf7.cxx:98
(anonymous namespace)::ImplUTF7ToUCContextData mbShifted _Bool
@@ -616,17 +614,17 @@ sc/source/ui/inc/uiitems.hxx:47
ScInputStatusItem aStartPos const class ScAddress
sc/source/ui/inc/uiitems.hxx:48
ScInputStatusItem aEndPos const class ScAddress
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:76
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:78
sc::sidebar::AlignmentPropertyPanel mxHorizontalAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:79
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:81
sc::sidebar::AlignmentPropertyPanel mxVertAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:82
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:84
sc::sidebar::AlignmentPropertyPanel mxWriteDirectionDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:85
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:87
sc::sidebar::AlignmentPropertyPanel mxIndentButtonsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:77
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:75
sc::sidebar::CellAppearancePropertyPanel mxBackColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:81
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:79
sc::sidebar::CellAppearancePropertyPanel mxLineColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:67
sc::sidebar::NumberFormatPropertyPanel mxCatagoryDispatch std::unique_ptr<ToolbarUnoDispatcher>
@@ -644,9 +642,9 @@ sd/source/ui/inc/animobjs.hxx:120
sd::AnimationWindow pControllerItem std::unique_ptr<AnimationControllerItem>
sd/source/ui/inc/fudspord.hxx:51
sd::FuDisplayOrder mpOverlay std::unique_ptr<SdrDropMarkerOverlay>
-sd/source/ui/inc/navigatr.hxx:124
- SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
sd/source/ui/inc/navigatr.hxx:125
+ SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
+sd/source/ui/inc/navigatr.hxx:126
SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
@@ -806,7 +804,7 @@ svx/source/sidebar/possize/PosSizePropertyPanel.hxx:105
svx::sidebar::PosSizePropertyPanel mxArrangeDispatch std::unique_ptr<ToolbarUnoDispatcher>
svx/source/svdraw/svdpdf.hxx:193
ImpSdrPdfImport mdPageWidthPts double
-svx/source/tbxctrls/tbcontrl.cxx:202
+svx/source/tbxctrls/tbcontrl.cxx:204
(anonymous namespace)::SvxFontNameBox_Impl m_aOwnFontList ::std::unique_ptr<FontList>
sw/inc/accmap.hxx:96
SwAccessibleMap mvShapes SwShapeList_Impl
@@ -847,7 +845,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 /media/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9)
+ RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9)
sw/source/uibase/inc/glossary.hxx:63
SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
sw/source/uibase/inc/maildispatcher.hxx:146
@@ -871,9 +869,7 @@ sw/source/uibase/sidebar/TableEditPanel.hxx:61
sw/source/uibase/sidebar/TableEditPanel.hxx:63
sw::sidebar::TableEditPanel m_xMiscDispatch std::unique_ptr<ToolbarUnoDispatcher>
sw/source/uibase/sidebar/WrapPropertyPanel.hxx:70
- sw::sidebar::WrapPropertyPanel mxWrapOptions1Dispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/WrapPropertyPanel.hxx:73
- sw::sidebar::WrapPropertyPanel mxWrapOptions2Dispatch std::unique_ptr<ToolbarUnoDispatcher>
+ sw::sidebar::WrapPropertyPanel mxWrapOptionsDispatch std::unique_ptr<ToolbarUnoDispatcher>
testtools/source/bridgetest/cppobj.cxx:149
bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
ucb/source/ucp/gio/gio_mount.hxx:74
@@ -962,7 +958,7 @@ vcl/inc/pdf/BitmapID.hxx:25
vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
vcl/inc/qt5/Qt5Frame.hxx:97
Qt5Frame m_pSalMenu class Qt5Menu *
-vcl/inc/qt5/Qt5Graphics.hxx:53
+vcl/inc/qt5/Qt5Graphics.hxx:51
Qt5Graphics m_pFontCollection class PhysicalFontCollection *
vcl/inc/qt5/Qt5Instance.hxx:59
Qt5Instance m_pQApplication std::unique_ptr<QApplication>
@@ -1008,7 +1004,7 @@ vcl/inc/scanlinewriter.hxx:36
vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
vcl/inc/sft.hxx:742
vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
-vcl/inc/svdata.hxx:418
+vcl/inc/svdata.hxx:456
ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
vcl/inc/unx/gtk/gtkframe.hxx:80
GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
@@ -1030,7 +1026,7 @@ vcl/source/filter/graphicfilter.cxx:613
(anonymous namespace)::ImpFilterLibCacheEntry maFiltername const class rtl::OUString
vcl/source/filter/graphicfilter.cxx:716
(anonymous namespace)::ImpFilterLibCache mpLast struct (anonymous namespace)::ImpFilterLibCacheEntry *
-vcl/source/filter/jpeg/Exif.hxx:51
+vcl/source/filter/jpeg/Exif.hxx:53
Exif::ExifIFD tag sal_uInt8 [2]
vcl/source/filter/wmf/wmfwr.hxx:95
WMFWriter aDstClipRegion vcl::Region
@@ -1070,7 +1066,7 @@ vcl/unx/gtk3/gtk3hudawareness.cxx:21
(anonymous namespace)::HudAwarenessHandle notify GDestroyNotify
vcl/workben/vcldemo.cxx:1750
(anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
-writerfilter/source/dmapper/DomainMapperTableHandler.cxx:232
+writerfilter/source/dmapper/DomainMapperTableHandler.cxx:233
writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
writerfilter/source/dmapper/PropertyMap.hxx:220
writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 4b22395f7910..3ae2452b0c0f 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -37,7 +37,6 @@ class SvxTextAnimationPage : public SfxTabPage
private:
static const sal_uInt16 pRanges[];
- const SfxItemSet& rOutAttrs;
SdrTextAniKind eAniKind;
FieldUnit eFUnit;
MapUnit eUnit;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 862baafae3c1..2c27a19fb69b 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -164,7 +164,6 @@ class SvxAngleTabPage : public SvxTabPage
static const sal_uInt16 pAngleRanges[];
private:
- const SfxItemSet& rOutAttrs;
const SdrView* pView;
// #i75273#
@@ -214,8 +213,6 @@ class SvxSlantTabPage : public SfxTabPage
static const sal_uInt16 pSlantRanges[];
private:
- const SfxItemSet& rOutAttrs;
-
const SdrView* pView;
MapUnit ePoolUnit;
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 254f87c79b48..6c1742b70b5c 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -85,7 +85,6 @@ void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
\************************************************************************/
SvxTextAnimationPage::SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "cui/ui/textanimtabpage.ui", "TextAnimation", &rInAttrs)
- , rOutAttrs(rInAttrs)
, eAniKind(SdrTextAniKind::NONE)
, m_aUpState(TRISTATE_INDET)
, m_aLeftState(TRISTATE_INDET)
@@ -109,7 +108,7 @@ SvxTextAnimationPage::SvxTextAnimationPage(weld::Container* pPage, weld::DialogC
, m_xMtrFldDelay(m_xBuilder->weld_metric_spin_button("MTR_FLD_DELAY", FieldUnit::MILLISECOND))
{
eFUnit = GetModuleFieldUnit( rInAttrs );
- SfxItemPool* pPool = rOutAttrs.GetPool();
+ SfxItemPool* pPool = rInAttrs.GetPool();
DBG_ASSERT( pPool, "Where is the pool?" );
eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index cdf93c57be0c..612410ac94e6 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -168,7 +168,6 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidat
\************************************************************************/
SvxAngleTabPage::SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SvxTabPage(pPage, pController, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs)
- , rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FieldUnit::NONE)
, m_aCtlRect(this)
@@ -182,7 +181,7 @@ SvxAngleTabPage::SvxAngleTabPage(weld::Container* pPage, weld::DialogController*
, m_xCtlAngleWin(new weld::CustomWeld(*m_xBuilder, "CTL_ANGLE", *m_xCtlAngle))
{
// calculate PoolUnit
- SfxItemPool* pPool = rOutAttrs.GetPool();
+ SfxItemPool* pPool = rInAttrs.GetPool();
DBG_ASSERT( pPool, "no pool (!)" );
ePoolUnit = pPool->GetMetric(SID_ATTR_TRANSFORM_POS_X);
@@ -398,7 +397,6 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eR
\************************************************************************/
SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
- , rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FieldUnit::NONE)
, m_xFlRadius(m_xBuilder->weld_widget("FL_RADIUS"))
@@ -419,7 +417,7 @@ SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController*
SetExchangeSupport();
// evaluate PoolUnit
- SfxItemPool* pPool = rOutAttrs.GetPool();
+ SfxItemPool* pPool = rInAttrs.GetPool();
assert(pPool && "no pool (!)");
ePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X );
}
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index 33bc12f00731..6bab5aa8f9cf 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -43,8 +43,10 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
,const OUString& _sComponentServiceName
) :
SvXMLImportContext( rImport )
- ,m_bAsTemplate(false)
{
+ OUString sName;
+ OUString sHREF;
+ bool bAsTemplate(false);
static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
sax_fastparser::FastAttributeList *pAttribList =
sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList );
@@ -55,38 +57,38 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
switch( aIter.getToken() )
{
case XML_ELEMENT(XLINK, XML_HREF):
- m_sHREF = sValue;
+ sHREF = sValue;
break;
case XML_ELEMENT(DB, XML_NAME):
case XML_ELEMENT(DB_OASIS, XML_NAME):
- m_sName = sValue;
+ sName = sValue;
// sanitize the name. Previously, we allowed to create forms/reports/queries which contain
// a / in their name, which nowadays is forbidden. To not lose such objects if they're contained
// in older files, we replace the slash with something less offending.
- m_sName = m_sName.replace( '/', '_' );
+ sName = sName.replace( '/', '_' );
break;
case XML_ELEMENT(DB, XML_AS_TEMPLATE):
case XML_ELEMENT(DB_OASIS, XML_AS_TEMPLATE):
- m_bAsTemplate = sValue == s_sTRUE;
+ bAsTemplate = sValue == s_sTRUE;
break;
default:
SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << "=" << aIter.toString());
}
}
- if ( !m_sHREF.isEmpty() && !m_sName.isEmpty() && _xParentContainer.is() )
+ if ( !sHREF.isEmpty() && !sName.isEmpty() && _xParentContainer.is() )
{
Sequence<Any> aArguments(comphelper::InitAnyPropertySequence(
{
- {PROPERTY_NAME, Any(m_sName)}, // set as folder
- {PROPERTY_PERSISTENT_NAME, Any(m_sHREF.copy(m_sHREF.lastIndexOf('/')+1))},
- {PROPERTY_AS_TEMPLATE, Any(m_bAsTemplate)},
+ {PROPERTY_NAME, Any(sName)}, // set as folder
+ {PROPERTY_PERSISTENT_NAME, Any(sHREF.copy(sHREF.lastIndexOf('/')+1))},
+ {PROPERTY_AS_TEMPLATE, Any(bAsTemplate)},
}));
try
{
Reference< XMultiServiceFactory > xORB( _xParentContainer, UNO_QUERY_THROW );
Reference< XInterface > xComponent( xORB->createInstanceWithArguments( _sComponentServiceName, aArguments ) );
Reference< XNameContainer > xNameContainer( _xParentContainer, UNO_QUERY_THROW );
- xNameContainer->insertByName( m_sName, makeAny( xComponent ) );
+ xNameContainer->insertByName( sName, makeAny( xComponent ) );
}
catch(Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx
index 5cee3a2c381c..43eae3261f03 100644
--- a/dbaccess/source/filter/xml/xmlComponent.hxx
+++ b/dbaccess/source/filter/xml/xmlComponent.hxx
@@ -27,10 +27,6 @@ namespace dbaxml
class ODBFilter;
class OXMLComponent : public SvXMLImportContext
{
- OUString m_sName;
- OUString m_sHREF;
- bool m_bAsTemplate;
-
public:
OXMLComponent( ODBFilter& rImport
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 1accf38d9528..20d30d70df15 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -50,6 +50,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,m_sCollectionServiceName(_sCollectionServiceName)
,m_sComponentServiceName(_sComponentServiceName)
{
+ OUString sName;
sax_fastparser::FastAttributeList *pAttribList =
sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList );
for (auto &aIter : *pAttribList)
@@ -59,13 +60,13 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
switch( aIter.getToken() & TOKEN_MASK )
{
case XML_NAME:
- m_sName = sValue;
+ sName = sValue;
break;
default:
SAL_WARN("dbaccess", "unknown attribute " << SvXMLImport::getNameFromToken(aIter.getToken()) << " value=" << aIter.toString());
}
}
- if ( !m_sName.isEmpty() && _xParentContainer.is() )
+ if ( !sName.isEmpty() && _xParentContainer.is() )
{
try
{
@@ -74,13 +75,13 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
{
Sequence<Any> aArguments(comphelper::InitAnyPropertySequence(
{
- {"Name", Any(m_sName)}, // set as folder
+ {"Name", Any(sName)}, // set as folder
{"Parent", Any(_xParentContainer)},
}));
m_xContainer.set(xORB->createInstanceWithArguments(_sCollectionServiceName,aArguments),UNO_QUERY);
Reference<XNameContainer> xNameContainer(_xParentContainer,UNO_QUERY);
- if ( xNameContainer.is() && !xNameContainer->hasByName(m_sName) )
- xNameContainer->insertByName(m_sName,makeAny(m_xContainer));
+ if ( xNameContainer.is() && !xNameContainer->hasByName(sName) )
+ xNameContainer->insertByName(sName,makeAny(m_xContainer));
}
}
catch(Exception&)
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
index d1dbe0d3730f..ad7e7d39e848 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
@@ -30,7 +30,6 @@ namespace dbaxml
{
css::uno::Reference< css::container::XNameAccess > m_xContainer;
css::uno::Reference< css::beans::XPropertySet > m_xTable;
- OUString m_sName;
OUString m_sCollectionServiceName;
OUString m_sComponentServiceName;
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 4e1591e60acf..933c95002513 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -40,15 +40,14 @@ using namespace ::com::sun::star;
// SvxUnoTextContentEnumeration
-SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText, const ESelection& rSel ) throw()
-: mrText( _rText )
+SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& rText, const ESelection& rSel ) throw()
{
- mxParentText = const_cast<SvxUnoTextBase*>(&_rText);
- if( mrText.GetEditSource() )
- mpEditSource = mrText.GetEditSource()->Clone();
+ mxParentText = const_cast<SvxUnoTextBase*>(&rText);
+ if( rText.GetEditSource() )
+ mpEditSource = rText.GetEditSource()->Clone();
mnNextParagraph = 0;
- const SvxTextForwarder* pTextForwarder = mrText.GetEditSource()->GetTextForwarder();
+ const SvxTextForwarder* pTextForwarder = rText.GetEditSource()->GetTextForwarder();
const sal_Int32 maxParaIndex = std::min( rSel.nEndPara + 1, pTextForwarder->GetParagraphCount() );
for( sal_Int32 currentPara = rSel.nStartPara; currentPara < maxParaIndex; currentPara++ )
@@ -79,7 +78,7 @@ SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase
}
if( pContent == nullptr )
{
- pContent = new SvxUnoTextContent( mrText, currentPara );
+ pContent = new SvxUnoTextContent( rText, currentPara );
pContent->SetSelection( aCurrentParaSel );
maContents.emplace_back(pContent );
}
@@ -376,18 +375,17 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
-SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rParentText, sal_Int32 nPara, const ESelection& rSel)
+SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rParentText, sal_Int32 nParagraph, const ESelection& rSel)
: mxParentText( const_cast<SvxUnoTextBase*>(&rParentText) ),
- mnParagraph( nPara ),
mnNextPortion( 0 )
{
if (rParentText.GetEditSource())
mpEditSource = rParentText.GetEditSource()->Clone();
- if( mpEditSource && mpEditSource->GetTextForwarder() && (mnParagraph == rSel.nStartPara && mnParagraph == rSel.nEndPara) )
+ if( mpEditSource && mpEditSource->GetTextForwarder() && (nParagraph == rSel.nStartPara && nParagraph == rSel.nEndPara) )
{
std::vector<sal_Int32> aPortions;
- mpEditSource->GetTextForwarder()->GetPortions( nPara, aPortions );
+ mpEditSource->GetTextForwarder()->GetPortions( nParagraph, aPortions );
for( size_t aPortionIndex = 0; aPortionIndex < aPortions.size(); aPortionIndex++ )
{
sal_uInt16 nStartPos = 0;
@@ -401,7 +399,7 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rPa
nStartPos = std::max<int>(nStartPos, rSel.nStartPos);
nEndPos = std::min<sal_uInt16>(nEndPos, rSel.nEndPos);
- ESelection aSel( mnParagraph, nStartPos, mnParagraph, nEndPos );
+ ESelection aSel( nParagraph, nStartPos, nParagraph, nEndPos );
const SvxUnoTextRangeBaseVec& rRanges( mpEditSource->getRanges() );
SvxUnoTextRange* pRange = nullptr;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index c9ccfc133919..06e35ec28d87 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -406,7 +406,6 @@ namespace {
class DBChangeDialog_Impl : public weld::GenericDialogController
{
DBChangeDialogConfig_Impl aConfig;
- BibDataManager* pDatMan;
std::unique_ptr<weld::TreeView> m_xSelectionLB;
@@ -419,9 +418,8 @@ public:
}
-DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan )
+DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pDatMan )
: GenericDialogController(pParent, "modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog")
- , pDatMan(pMan)
, m_xSelectionLB(m_xBuilder->weld_tree_view("treeview"))
{
m_xSelectionLB->set_size_request(-1, m_xSelectionLB->get_height_rows(6));
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index f85c6c657efb..243d6ab51d97 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -586,7 +586,6 @@ private:
css::uno::Reference< css::text::XText > mxParentText;
std::unique_ptr<SvxEditSource> mpEditSource;
sal_Int32 mnNextParagraph;
- const SvxUnoTextBase& mrText;
std::vector< rtl::Reference<SvxUnoTextContent> > maContents;
public:
@@ -604,7 +603,6 @@ class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< css::conta
private:
std::unique_ptr<SvxEditSource> mpEditSource;
css::uno::Reference< css::text::XText > mxParentText;
- sal_Int32 mnParagraph;
std::vector< rtl::Reference<SvxUnoTextRange> > maPortions;
sal_uInt16 mnNextPortion;
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index a729f6ad52e4..6428083e20d0 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -33,7 +33,6 @@ struct VersionInfo;
class VendorSettings
{
- OUString m_xmlDocVendorSettingsFileUrl;
CXmlDocPtr m_xmlDocVendorSettings;
CXPathContextPtr m_xmlPathContextVendorSettings;
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index a064b93f80be..332d84ebb07b 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -82,11 +82,11 @@ OUString getParamFirstUrl(OUString const & name)
}//blind namespace
-VendorSettings::VendorSettings():
- m_xmlDocVendorSettingsFileUrl(BootParams::getVendorSettings())
+VendorSettings::VendorSettings()
{
+ OUString xmlDocVendorSettingsFileUrl(BootParams::getVendorSettings());
//Prepare the xml document and context
- OString sSettingsPath = getVendorSettingsPath(m_xmlDocVendorSettingsFileUrl);
+ OString sSettingsPath = getVendorSettingsPath(xmlDocVendorSettingsFileUrl);
if (sSettingsPath.isEmpty())
{
OString sMsg("[Java framework] A vendor settings file was not specified."
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 447c41a737e6..25202e2fd6c9 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -67,7 +67,6 @@ private:
TGroupFunctionMap m_aFunctions;
- mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocContentElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pCellElemTokenMap;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index c6ddd96b399f..8b68f9adf6e4 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -798,13 +798,11 @@ public:
ONavigatorImpl& operator=(const ONavigatorImpl&) = delete;
uno::Reference< report::XReportDefinition> m_xReport;
- ::rptui::OReportController& m_rController;
std::unique_ptr<NavigatorTree> m_xNavigatorTree;
};
ONavigatorImpl::ONavigatorImpl(OReportController& rController, weld::Builder& rBuilder)
: m_xReport(rController.getReportDefinition())
- , m_rController(rController)
, m_xNavigatorTree(std::make_unique<NavigatorTree>(rBuilder.weld_tree_view("treeview"), rController))
{
reportdesign::OReportVisitor aVisitor(m_xNavigatorTree.get());
@@ -812,7 +810,7 @@ ONavigatorImpl::ONavigatorImpl(OReportController& rController, weld::Builder& rB
std::unique_ptr<weld::TreeIter> xScratch = m_xNavigatorTree->make_iterator();
if (m_xNavigatorTree->find(m_xReport, *xScratch))
m_xNavigatorTree->expand_row(*xScratch);
- lang::EventObject aEvent(m_rController);
+ lang::EventObject aEvent(rController);
m_xNavigatorTree->_selectionChanged(aEvent);
}
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 0fd9bbf991cf..5a937becad14 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1170,7 +1170,6 @@ class ScUniqueCellFormatsObj final : public cppu::WeakImplHelper<
{
private:
ScDocShell* pDocShell;
- ScRange const aTotalRange;
ScMyRangeLists aRangeLists;
public:
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 101d5740ca73..f1da9fe2784b 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -87,7 +87,6 @@ public:
class ScEditAttrTester
{
- ScEditEngineDefaulter* pEngine;
std::unique_ptr<SfxItemSet> pEditAttrs;
bool bNeedsObject;
bool bNeedsCellAttr;
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 4e8d62777258..0150b5a95310 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -387,7 +387,6 @@ public:
virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const override;
private:
- ScFunctionList* pFuncList; /**< list of all calc functions */
std::unique_ptr<std::vector<const ScFuncDesc*>> aCatLists[MAX_FUNCCAT]; /**< array of all categories, 0 is the cumulative ('All') category */
mutable std::map< sal_uInt32, std::shared_ptr<ScFunctionCategory> > m_aCategories; /**< map of category pos to IFunctionCategory */
mutable std::vector<const ScFuncDesc*>::iterator pCurCatListIter; /**< position in current category */
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 2a3f4219eae1..6e94059461b9 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -1034,9 +1034,11 @@ sal_uInt32 ScFunctionCategory::getNumber() const
}
-ScFunctionMgr::ScFunctionMgr() :
- pFuncList( ScGlobal::GetStarCalcFunctionList() )
+ScFunctionMgr::ScFunctionMgr()
{
+ ScFunctionList* pFuncList /**< list of all calc functions */
+ = ScGlobal::GetStarCalcFunctionList();
+
OSL_ENSURE( pFuncList, "Functionlist not found." );
sal_uInt32 catCount[MAX_FUNCCAT] = {0};
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index bf050cb93e35..a16d3b416474 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -371,8 +371,7 @@ tools::Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bF
return tools::Rectangle( aStartPos, Size(nCellX-1,nCellY-1) );
}
-ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
- pEngine( pEng ),
+ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEngine ) :
bNeedsObject( false ),
bNeedsCellAttr( false )
{
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 40d98ce77a7f..d75b7c0cd1e8 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -45,11 +45,11 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
bool bFooter, bool bLeft ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
- sOn( bFooter ? OUString(SC_UNO_PAGE_FTRON) : OUString(SC_UNO_PAGE_HDRON) ),
bContainsLeft(false),
bContainsRight(false),
bContainsCenter(false)
{
+ OUString sOn( bFooter ? OUString(SC_UNO_PAGE_FTRON) : OUString(SC_UNO_PAGE_HDRON) );
OUString sContent( bFooter ? OUString(SC_UNO_PAGE_RIGHTFTRCON) : OUString(SC_UNO_PAGE_RIGHTHDRCON) );
OUString sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) : OUString(SC_UNO_PAGE_LEFTHDRCONT) );
OUString sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) : OUString(SC_UNO_PAGE_HDRSHARED) );
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 209a6054e295..73f791d3ae44 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -35,7 +35,6 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
css::uno::Reference< css::beans::XPropertySet > xPropSet;
css::uno::Reference< css::sheet::XHeaderFooterContent > xHeaderFooterContent;
- const OUString sOn;
OUString sCont;
bool bContainsLeft;
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 7ff3c26035c6..f74b4789dacf 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -207,9 +207,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent,
sal_uInt16 nCurrentZoom ):
InterimItemWindow(pParent, "modules/scalc/ui/zoombox.ui", "ZoomBox"),
mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom)),
- mxWeld(new weld::CustomWeld(*m_xBuilder, "zoom", *mxWidget)),
- aLogicalSize( 115, 40 )
+ mxWeld(new weld::CustomWeld(*m_xBuilder, "zoom", *mxWidget))
{
+ Size aLogicalSize( 115, 40 );
Size aSliderSize = LogicToPixel(aLogicalSize, MapMode(MapUnit::Map10thMM));
Size aPreferredSize(aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight);
mxWidget->GetDrawingArea()->set_size_request(aPreferredSize.Width(), aPreferredSize.Height());
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index 3ad4891d7a02..edce0a56b226 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -58,7 +58,6 @@ class ScSolverValueDialog;
class ScSolverOptionsDialog : public weld::GenericDialogController
{
css::uno::Sequence<OUString> maImplNames;
- css::uno::Sequence<OUString> maDescriptions;
OUString maEngine;
css::uno::Sequence<css::beans::PropertyValue> maProperties;
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index d12de0f29294..fbcc6c339bc4 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -67,7 +67,6 @@ class ScZoomSliderWnd final : public InterimItemWindow
private:
std::unique_ptr<ScZoomSlider> mxWidget;
std::unique_ptr<weld::CustomWeld> mxWeld;
- Size const aLogicalSize;
public:
ScZoomSliderWnd(vcl::Window* pParent, const css::uno::Reference<css::frame::XDispatchProvider>& rDispatchProvider,
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index b336460734b6..2136f4e14ad8 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -60,7 +60,6 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window* pParent,
const uno::Sequence<beans::PropertyValue>& rProperties )
: GenericDialogController(pParent, "modules/scalc/ui/solveroptionsdialog.ui", "SolverOptionsDialog")
, maImplNames(rImplNames)
- , maDescriptions(rDescriptions)
, maEngine(rEngine)
, maProperties(rProperties)
, m_xLbEngine(m_xBuilder->weld_combo_box("engine"))
@@ -86,7 +85,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window* pParent,
for (sal_Int32 nImpl=0; nImpl<nImplCount; ++nImpl)
{
OUString aImplName( maImplNames[nImpl] );
- OUString aDescription( maDescriptions[nImpl] ); // user-visible descriptions in list box
+ OUString aDescription( rDescriptions[nImpl] ); // user-visible descriptions in list box
m_xLbEngine->append_text(aDescription);
if ( aImplName == maEngine )
nSelect = nImpl;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index f8fb4d6fc847..e1ffc7e9cf26 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -9229,20 +9229,19 @@ struct ScUniqueFormatsOrder
}
-ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) :
+ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rTotalRange) :
pDocShell( pDocSh ),
- aTotalRange( rRange ),
aRangeLists()
{
pDocShell->GetDocument().AddUnoObject(*this);
- OSL_ENSURE( aTotalRange.aStart.Tab() == aTotalRange.aEnd.Tab(), "different tables" );
+ OSL_ENSURE( rTotalRange.aStart.Tab() == rTotalRange.aEnd.Tab(), "different tables" );
ScDocument& rDoc = pDocShell->GetDocument();
- SCTAB nTab = aTotalRange.aStart.Tab();
+ SCTAB nTab = rTotalRange.aStart.Tab();
ScAttrRectIterator aIter( &rDoc, nTab,
- aTotalRange.aStart.Col(), aTotalRange.aStart.Row(),
- aTotalRange.aEnd.Col(), aTotalRange.aEnd.Row() );
+ rTotalRange.aStart.Col(), rTotalRange.aStart.Row(),
+ rTotalRange.aEnd.Col(), rTotalRange.aEnd.Row() );
SCCOL nCol1, nCol2;
SCROW nRow1, nRow2;
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index e69d17906016..5cef8e35bec3 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -37,15 +37,14 @@
*/
SdPageDlg::SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage, bool bIsImpressDoc)
: SfxTabDialogController(pParent, "modules/sdraw/ui/drawpagedialog.ui", "DrawPageDialog", pAttr)
- , mpDocShell(pDocSh)
, mbIsImpressDoc(bIsImpressDoc)
{
- SvxColorListItem const * pColorListItem = mpDocShell->GetItem( SID_COLOR_TABLE );
- SvxGradientListItem const * pGradientListItem = mpDocShell->GetItem( SID_GRADIENT_LIST );
- SvxBitmapListItem const * pBitmapListItem = mpDocShell->GetItem( SID_BITMAP_LIST );
- SvxPatternListItem const * pPatternListItem = mpDocShell->GetItem( SID_PATTERN_LIST );
- SvxHatchListItem const * pHatchListItem = mpDocShell->GetItem( SID_HATCH_LIST );
+ SvxColorListItem const * pColorListItem = pDocSh->GetItem( SID_COLOR_TABLE );
+ SvxGradientListItem const * pGradientListItem = pDocSh->GetItem( SID_GRADIENT_LIST );
+ SvxBitmapListItem const * pBitmapListItem = pDocSh->GetItem( SID_BITMAP_LIST );
+ SvxPatternListItem const * pPatternListItem = pDocSh->GetItem( SID_PATTERN_LIST );
+ SvxHatchListItem const * pHatchListItem = pDocSh->GetItem( SID_HATCH_LIST );
mpColorList = pColorListItem->GetColorList();
mpGradientList = pGradientListItem->GetGradientList();
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index e1d8eb0274c9..3e6fb20f3d93 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -52,8 +52,9 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh,
, mpDocShell(pDocSh)
, ePO(_ePO)
, aInputSet(*rStyleBase.GetItemSet().GetPool(), svl::Items<SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL>{})
- , pOrgSet(&rStyleBase.GetItemSet())
{
+ const SfxItemSet* pOrgSet(&rStyleBase.GetItemSet());
+
if( IS_OUTLINE(ePO))
{
// Unfortunately, the Itemsets of our style sheets are not discrete...
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 5d75a1fa93bc..c3ff4a9c7a3b 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -70,9 +70,8 @@ using namespace com::sun::star::lang;
SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView)
: SfxSingleTabDialogController(pParent, pAttr, "modules/simpress/ui/interactiondialog.ui",
"InteractionDialog")
- , rOutAttrs(*pAttr)
{
- std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, rOutAttrs);
+ std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, *pAttr);
// formerly in PageCreated
static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView );
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index 73e753a35209..528dfd7c8c46 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -48,7 +48,6 @@ private:
static void InitInterface_Impl();
::sd::View* mpView;
- ViewShell* const mpViewSh;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 704462fe668c..7c70f340226b 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -50,7 +50,6 @@ private:
static void InitInterface_Impl();
::sd::View* mpView;
- ViewShell* const mpViewSh;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index 4fd3c496343f..45e930869d8e 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -54,7 +54,6 @@ public:
void SendDeactivatePageEvent();
private:
- sal_uInt16 RrePageID;
DrawViewShell* pDrViewSh;
bool bInternalMove;
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 512cd0c5be18..0c377b71a4ce 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -32,7 +32,6 @@ enum class ChangeType;
class SdPageDlg : public SfxTabDialogController
{
private:
- const SfxObjectShell* mpDocShell;
bool mbIsImpressDoc;
XColorListRef mpColorList;
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index e6d17fdf0f1c..ef7913b344db 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -52,7 +52,6 @@ private:
// for mapping with the new SvxNumBulletItem
SfxItemSet aInputSet;
std::unique_ptr<SfxItemSet> pOutSet;
- const SfxItemSet* pOrgSet;
sal_uInt16 GetOutlineLevel() const;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 0a1e4bf7829a..37a43c39f44d 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -38,8 +38,6 @@ class SdDrawDocument;
*/
class SdActionDlg : public SfxSingleTabDialogController
{
-private:
- const SfxItemSet& rOutAttrs;
public:
SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView);
};
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx
index 98b260c8f774..079633271e89 100644
--- a/sd/source/ui/slideshow/PaneHider.cxx
+++ b/sd/source/ui/slideshow/PaneHider.cxx
@@ -39,7 +39,6 @@ using ::com::sun::star::lang::DisposedException;
namespace sd {
PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
- : mrViewShell(rViewShell)
{
// Hide the left and right pane windows when a slideshow exists and is
// not full screen.
@@ -49,7 +48,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
try
{
Reference<XControllerManager> xControllerManager (
- mrViewShell.GetViewShellBase().GetController(), UNO_QUERY_THROW);
+ rViewShell.GetViewShellBase().GetController(), UNO_QUERY_THROW);
mxConfigurationController = xControllerManager->getConfigurationController();
if (mxConfigurationController.is())
{
@@ -72,7 +71,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
}
}
}
- FrameworkHelper::Instance(mrViewShell.GetViewShellBase())->WaitForUpdate();
+ FrameworkHelper::Instance(rViewShell.GetViewShellBase())->WaitForUpdate();
}
catch (RuntimeException&)
{
diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx
index 9063f0e61a8e..44ba3eee7f68 100644
--- a/sd/source/ui/slideshow/PaneHider.hxx
+++ b/sd/source/ui/slideshow/PaneHider.hxx
@@ -47,7 +47,6 @@ public:
~PaneHider();
private:
- const ViewShell& mrViewShell;
/** Remember whether the visibility states of the windows of the panes
has been modified and have to be restored.
*/
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index e64eb67edd1b..0324088fb123 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -51,10 +51,9 @@ GraphicObjectBar::GraphicObjectBar (
ViewShell* pSdViewShell,
::sd::View* pSdView )
: SfxShell (pSdViewShell->GetViewShell()),
- mpView ( pSdView ),
- mpViewSh ( pSdViewShell )
+ mpView ( pSdView )
{
- DrawDocShell* pDocShell = mpViewSh->GetDocSh();
+ DrawDocShell* pDocShell = pSdViewShell->GetDocSh();
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index e891dc7cf662..7d7549885656 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -50,10 +50,9 @@ void MediaObjectBar::InitInterface_Impl()
MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
SfxShell( pSdViewShell->GetViewShell() ),
- mpView( pSdView ),
- mpViewSh( pSdViewShell )
+ mpView( pSdView )
{
- DrawDocShell* pDocShell = mpViewSh->GetDocSh();
+ DrawDocShell* pDocShell = pSdViewShell->GetDocSh();
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index e4502b8eef47..b09a254e9fe7 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -58,7 +58,6 @@ TabControl::TabControl(DrawViewShell* pViewSh, vcl::Window* pParent) :
TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ),
DragSourceHelper( this ),
DropTargetHelper( this ),
- RrePageID(1),
pDrViewSh(pViewSh),
bInternalMove(false)
{
@@ -98,7 +97,6 @@ void TabControl::MouseButtonDown(const MouseEvent& rMEvt)
sal_uInt16 aPageId = GetPageId(aPos);
//initialize
- RrePageID=aPageId;
if (aPageId == 0)
{
SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index b25fe8faac07..c802d0057464 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -173,14 +173,13 @@ drawing::Direction3D GetDirection3D( const SdrCustomShapeGeometryItem& rItem, co
EnhancedCustomShape3d::Transformation2D::Transformation2D(
const SdrObjCustomShape& rSdrObjCustomShape,
- const double *pM)
+ const double *pMap)
: aCenter(rSdrObjCustomShape.GetSnapRect().Center())
, eProjectionMode( drawing::ProjectionMode_PARALLEL )
, fSkewAngle(0.0)
, fSkew(0.0)
, fOriginX(0.0)
, fOriginY(0.0)
- , pMap( pM )
{
const SdrCustomShapeGeometryItem& rGeometryItem(rSdrObjCustomShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
const Any* pAny = rGeometryItem.GetPropertyValueByName( "Extrusion", "ProjectionMode" );
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 43bfc1efd1a5..c666c4353821 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -45,8 +45,6 @@ class EnhancedCustomShape3d final
double fOriginX;
double fOriginY;
- const double* pMap;
-
public:
Transformation2D(
const SdrObjCustomShape& rSdrObjCustomShape,
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index d6232c468411..b5f7716aeeee 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -40,7 +40,6 @@ namespace {
class PaMIntoCursorShellRing
{
- SwCursorShell& rSh;
SwPaM &rDelPam, &rCursor;
SwPaM* pPrevDelPam;
SwPaM* pPrevCursor;
@@ -55,9 +54,9 @@ public:
PaMIntoCursorShellRing::PaMIntoCursorShellRing( SwCursorShell& rCSh,
SwPaM& rShCursor, SwPaM& rPam )
- : rSh( rCSh ), rDelPam( rPam ), rCursor( rShCursor )
+ : rDelPam( rPam ), rCursor( rShCursor )
{
- SwPaM* pShCursor = rSh.GetCursor_();
+ SwPaM* pShCursor = rCSh.GetCursor_();
pPrevDelPam = rDelPam.GetPrev();
pPrevCursor = rCursor.GetPrev();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 555f17436b03..97339e82a6d2 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1714,25 +1714,18 @@ namespace
/// Similar to comphelper::FlagRestorationGuard, but for vcl::RenderContext.
class RenderContextGuard
{
- VclPtr<vcl::RenderContext>& m_pRef;
- VclPtr<vcl::RenderContext> m_pOriginalValue;
- SwViewShell* m_pShell;
std::unique_ptr<SdrPaintWindow> m_TemporaryPaintWindow;
SdrPageWindow* m_pPatchedPageWindow;
public:
RenderContextGuard(VclPtr<vcl::RenderContext>& pRef, vcl::RenderContext* pValue, SwViewShell* pShell)
- : m_pRef(pRef),
- m_pOriginalValue(m_pRef),
- m_pShell(pShell),
- m_TemporaryPaintWindow(),
- m_pPatchedPageWindow(nullptr)
+ : m_pPatchedPageWindow(nullptr)
{
- m_pRef = pValue;
+ pRef = pValue;
- if (pValue != m_pShell->GetWin())
+ if (pValue != pShell->GetWin())
{
- SdrView* pDrawView(m_pShell->Imp()->GetDrawView());
+ SdrView* pDrawView(pShell->Imp()->GetDrawView());
if (nullptr != pDrawView)
{
@@ -1740,7 +1733,7 @@ public:
if (nullptr != pSdrPageView)
{
- m_pPatchedPageWindow = pSdrPageView->FindPageWindow(*m_pShell->GetWin());
+ m_pPatchedPageWindow = pSdrPageView->FindPageWindow(*pShell->GetWin());
if (nullptr != m_pPatchedPageWindow)
{
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 99751fed15c9..80388415f486 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -52,7 +52,7 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
, rView(rVw)
, bDrawParaDlg(bDraw)
{
- nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
+ sal_uInt16 nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
bool bHtmlMode = (nHtmlMode & HTMLMODE_ON) == HTMLMODE_ON;
if(pTitle)
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 60ced0cbbf30..16959698f976 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -134,13 +134,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
VclPtr<Edit> m_aCellEdit;
VclPtr< ::svt::CheckBoxControl> m_aCellCheckBox;
- OUString m_sSearch;
- OUString m_sAlternative;
- OUString m_sPrimKey;
- OUString m_sSecKey;
- OUString m_sComment;
- OUString m_sCaseSensitive;
- OUString m_sWordOnly;
OUString m_sYes;
OUString m_sNo;
@@ -3565,13 +3558,13 @@ SwEntryBrowseBox::SwEntryBrowseBox(const css::uno::Reference<css::awt::XWindow>
, m_nCurrentRow(0)
, m_bModified(false)
{
- m_sSearch = SwResId(STR_AUTOMARK_SEARCHTERM);
- m_sAlternative = SwResId(STR_AUTOMARK_ALTERNATIVE);
- m_sPrimKey = SwResId(STR_AUTOMARK_KEY1);
- m_sSecKey = SwResId(STR_AUTOMARK_KEY2);
- m_sComment = SwResId(STR_AUTOMARK_COMMENT);
- m_sCaseSensitive = SwResId(STR_AUTOMARK_CASESENSITIVE);
- m_sWordOnly = SwResId(STR_AUTOMARK_WORDONLY);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list