[Libreoffice-commits] core.git: accessibility/inc chart2/source compilerplugins/clang configmgr/source connectivity/source cui/source dbaccess/source desktop/source editeng/inc extensions/source filter/source forms/source hwpfilter/source idl/inc include/basegfx include/basic include/connectivity include/editeng include/formula include/oox include/registry include/sfx2 include/svtools include/svx include/vbahelper include/vcl l10ntools/inc lotuswordpro/inc lotuswordpro/source oox/inc oox/source scripting/source sc/source sdext/source sd/source sfx2/source svx/inc sw/inc sw/source ucb/source unoxml/inc writerfilter/source xmloff/source xmlsecurity/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Feb 27 06:35:18 UTC 2019
accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 2
accessibility/inc/standard/vclxaccessibletextcomponent.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx | 2
chart2/source/controller/main/CommandDispatch.hxx | 3
compilerplugins/clang/unusedfields.py | 28 ++++++++
configmgr/source/node.hxx | 2
connectivity/source/drivers/firebird/Catalog.hxx | 1
connectivity/source/drivers/firebird/Statement.hxx | 3
connectivity/source/drivers/firebird/Users.hxx | 2
connectivity/source/inc/file/fcode.hxx | 4 -
connectivity/source/inc/hsqldb/HUser.hxx | 2
connectivity/source/inc/mysql/YUser.hxx | 2
connectivity/source/inc/odbc/OBoundParam.hxx | 2
cui/source/factory/dlgfact.hxx | 33 ----------
cui/source/inc/cuigrfflt.hxx | 2
cui/source/inc/cuitbxform.hxx | 1
cui/source/options/personalization.hxx | 4 -
dbaccess/source/core/api/RowSet.hxx | 1
dbaccess/source/core/api/datacolumn.hxx | 3
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 2
dbaccess/source/core/inc/preparedstatement.hxx | 1
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 1
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 24 +++----
dbaccess/source/ui/dlg/detailpages.hxx | 5 -
dbaccess/source/ui/inc/GeneralUndo.hxx | 1
desktop/source/deployment/manager/dp_commandenvironments.hxx | 3
editeng/inc/editattr.hxx | 1
extensions/source/dbpilots/commonpagesdbp.hxx | 1
extensions/source/dbpilots/controlwizard.hxx | 1
extensions/source/propctrlr/inspectormodelbase.hxx | 1
filter/source/graphicfilter/icgm/bundles.hxx | 3
filter/source/graphicfilter/idxf/dxfblkrd.hxx | 4 -
filter/source/graphicfilter/idxf/dxfentrd.hxx | 8 +-
filter/source/graphicfilter/idxf/dxftblrd.hxx | 4 -
forms/source/component/Columns.hxx | 1
forms/source/inc/FormComponent.hxx | 1
forms/source/xforms/NameContainer.hxx | 2
forms/source/xforms/datatypes.hxx | 2
forms/source/xforms/xformsevent.hxx | 2
hwpfilter/source/hwpreader.hxx | 2
idl/inc/basobj.hxx | 3
include/basegfx/raster/bzpixelraster.hxx | 2
include/basic/sbx.hxx | 2
include/connectivity/sdbcx/VIndexColumn.hxx | 2
include/connectivity/sdbcx/VKeyColumn.hxx | 2
include/editeng/unotext.hxx | 2
include/formula/token.hxx | 8 --
include/oox/dump/dumperbase.hxx | 1
include/oox/vml/vmlshapecontext.hxx | 4 -
include/registry/registry.hxx | 4 -
include/sfx2/basedlgs.hxx | 3
include/svtools/editbrowsebox.hxx | 1
include/svtools/printoptions.hxx | 3
include/svx/nbdtmg.hxx | 3
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 2
include/svx/sdr/contact/viewcontactofe3d.hxx | 2
include/svx/sdrundomanager.hxx | 2
include/svx/svdobj.hxx | 2
include/svx/svdoutl.hxx | 1
include/svx/svdpage.hxx | 8 --
include/svx/svdpoev.hxx | 1
include/svx/svdundo.hxx | 2
include/svx/svdview.hxx | 1
include/svx/textchain.hxx | 3
include/svx/view3d.hxx | 2
include/vbahelper/vbacollectionimpl.hxx | 2
include/vbahelper/vbaglobalbase.hxx | 3
include/vcl/BitmapConvolutionMatrixFilter.hxx | 2
l10ntools/inc/export.hxx | 3
lotuswordpro/inc/xfilter/xfrect.hxx | 2
lotuswordpro/inc/xfilter/xfsaxstream.hxx | 2
lotuswordpro/source/filter/explode.hxx | 3
lotuswordpro/source/filter/lwpcontent.hxx | 2
lotuswordpro/source/filter/lwpdlvlist.hxx | 21 ++----
lotuswordpro/source/filter/lwpholder.hxx | 2
lotuswordpro/source/filter/lwprowlayout.hxx | 1
lotuswordpro/source/filter/lwpsection.hxx | 2
lotuswordpro/source/filter/lwptable.hxx | 1
lotuswordpro/source/filter/lwptablelayout.hxx | 2
lotuswordpro/source/filter/lwptabrack.hxx | 2
oox/inc/drawingml/misccontexts.hxx | 2
oox/inc/drawingml/textliststyle.hxx | 2
oox/source/drawingml/diagram/diagram.hxx | 2
sc/source/filter/inc/xeescher.hxx | 1
sc/source/ui/attrdlg/scdlgfact.hxx | 10 ---
sc/source/ui/vba/vbatitle.hxx | 1
scripting/source/inc/bcholder.hxx | 1
sd/source/filter/eppt/pptexanimations.hxx | 10 +--
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/dlg/sddlgfact.hxx | 4 -
sd/source/ui/inc/DrawController.hxx | 3
sd/source/ui/inc/OutlineViewShell.hxx | 3
sd/source/ui/inc/fuconstr.hxx | 2
sd/source/ui/inc/smarttag.hxx | 2
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sdext/source/pdfimport/tree/drawtreevisiting.hxx | 5 -
sfx2/source/inc/preview.hxx | 1
svx/inc/AccessibleTableShape.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 3
sw/inc/fmtcol.hxx | 4 -
sw/inc/fmtmeta.hxx | 3
sw/inc/hints.hxx | 2
sw/inc/viewopt.hxx | 1
sw/source/core/access/accpara.hxx | 5 -
sw/source/ui/dialog/swdlgfact.hxx | 28 --------
sw/source/uibase/inc/fldwrap.hxx | 4 -
ucb/source/cacher/contentresultsetwrapper.hxx | 1
unoxml/inc/uievent.hxx | 1
writerfilter/source/dmapper/GraphicHelpers.hxx | 6 -
xmloff/source/draw/ximp3dobject.hxx | 1
xmloff/source/forms/elementimport.hxx | 1
xmloff/source/forms/eventimport.hxx | 1
xmlsecurity/inc/xsecctl.hxx | 1
113 files changed, 156 insertions(+), 246 deletions(-)
New commits:
commit 19240f625f8bd7b772481abc8e678d7b0fadd921
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 25 10:24:55 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 27 07:34:52 2019 +0100
loplugin:unusedfields look for classes where we can make all the..
fields private
Change-Id: Id3c6b123f06ab5dcf87628de4c347626110d2d27
Reviewed-on: https://gerrit.libreoffice.org/68302
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
index 9a6c74a6177c..ce1eb7eed24c 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
@@ -31,8 +31,8 @@ typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible >
class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent
{
-public:
VclPtr<HeaderBar> m_pHeadBar;
+public:
virtual ~VCLXAccessibleHeaderBar() override;
VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 312bdf0b2309..ab62332ad1fe 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -34,9 +34,9 @@ class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
public ::comphelper::OCommonAccessibleText,
public VCLXAccessibleTextComponent_BASE
{
-protected:
OUString m_sText;
+protected:
void SetText( const OUString& sText );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
index eb4d46621815..2c3eff9da827 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
@@ -37,7 +37,7 @@ public:
virtual OUString getInnerName() const override;
-protected:
+private:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
OUString m_aInnerAreaTypeName;
OUString m_aInnerLineTypeName;
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index 761ade94b3fc..2265bdbb94dd 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -117,11 +117,10 @@ protected:
virtual void SAL_CALL disposing(
const css::lang::EventObject& Source ) override;
-protected:
+private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
-private:
typedef std::map< OUString, ::comphelper::OInterfaceContainerHelper2* >
tListenerMap;
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index 5ec0388bc0d2..dd7a4d65c8de 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -211,6 +211,29 @@ for d in protectedAndPublicDefinitionSet:
canBePrivateSet.add((clazz + " " + definitionToTypeMap[d], srcLoc))
+
+# --------------------------------------------------------------------------------------------
+# "all fields in class can be made private" analysis
+# --------------------------------------------------------------------------------------------
+
+potentialClasses = set()
+excludedClasses = set()
+potentialClassesSourceLocationMap = dict()
+matchClassName = re.compile(r"(\w+)::")
+for d in protectedAndPublicDefinitionSet:
+ clazz = d[0]
+ if d in touchedFromOutsideSet:
+ excludedClasses.add(clazz)
+ else:
+ potentialClasses.add(clazz)
+ potentialClassesSourceLocationMap[clazz] = definitionToSourceLocationMap[d]
+allFieldsCanBePrivateSet = set()
+for d in (potentialClasses - excludedClasses):
+ sourceLoc = potentialClassesSourceLocationMap[d]
+ # when the class is inside a compile unit, assume that the compiler can figure this out for itself, much less interesting to me
+ if not ".cxx" in sourceLoc:
+ allFieldsCanBePrivateSet.add((d, sourceLoc))
+
# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
return [int(text) if text.isdigit() else text.lower()
@@ -222,6 +245,7 @@ tmp2list = sorted(writeonlySet, key=lambda v: natural_sort_key(v[1]))
tmp3list = sorted(canBePrivateSet, key=lambda v: natural_sort_key(v[1]))
tmp4list = sorted(readonlySet, key=lambda v: natural_sort_key(v[1]))
tmp5list = sorted(onlyUsedInConstructorSet, key=lambda v: natural_sort_key(v[1]))
+tmp6list = sorted(allFieldsCanBePrivateSet, key=lambda v: natural_sort_key(v[1]))
# print out the results
with open("compilerplugins/clang/unusedfields.untouched.results", "wt") as f:
@@ -245,5 +269,9 @@ with open("compilerplugins/clang/unusedfields.only-used-in-constructor.results",
for t in tmp5list:
f.write( t[1] + "\n" )
f.write( " " + t[0] + "\n" )
+with open("compilerplugins/clang/unusedfields.report-all-can-be-private", "wt") as f:
+ for t in tmp6list:
+ f.write( t[1] + "\n" )
+ f.write( " " + t[0] + "\n" )
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index b745f668a92c..022c42a110f1 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -58,7 +58,7 @@ protected:
explicit Node(const Node & other);
virtual ~Node() override;
-
+private:
int layer_;
int finalized_;
};
diff --git a/connectivity/source/drivers/firebird/Catalog.hxx b/connectivity/source/drivers/firebird/Catalog.hxx
index 351069c80a72..a8ee9c69b466 100644
--- a/connectivity/source/drivers/firebird/Catalog.hxx
+++ b/connectivity/source/drivers/firebird/Catalog.hxx
@@ -18,7 +18,6 @@ namespace connectivity
{
class Catalog: public ::connectivity::sdbcx::OCatalog
{
- protected:
css::uno::Reference< css::sdbc::XConnection >
m_xConnection;
diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx
index 56b1ae7edde5..83add5821100 100644
--- a/connectivity/source/drivers/firebird/Statement.hxx
+++ b/connectivity/source/drivers/firebird/Statement.hxx
@@ -37,11 +37,10 @@ namespace connectivity
public css::sdbc::XBatchExecution,
public css::lang::XServiceInfo
{
+ XSQLDA* m_pSqlda;
protected:
virtual ~OStatement() override {}
- XSQLDA* m_pSqlda;
-
public:
// a constructor, which is required for returning objects:
explicit OStatement( Connection* _pConnection)
diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx
index 69cf571154cb..9112d12a7c75 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -24,9 +24,9 @@ namespace connectivity
*/
class Users: public ::connectivity::sdbcx::OCollection
{
- protected:
css::uno::Reference< css::sdbc::XDatabaseMetaData >
m_xMetaData;
+ protected:
// OCollection
virtual void impl_refresh() override;
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index da0670f4e1da..77bc2a199ee1 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -76,9 +76,9 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand
{
sal_uInt16 m_nRowPos;
- protected:
OValueRefRow m_pRow;
+ protected:
OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType);
public:
virtual const ORowSetValue& getValue() const override;
@@ -230,8 +230,6 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator
{
- public:
- protected:
const sal_Unicode cEscape;
public:
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index 4e1e98c92290..6b93707ee06b 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -59,8 +59,8 @@ namespace connectivity
class OUserExtend : public OHSQLUser,
public OUserExtend_PROP
{
- protected:
OUString m_Password;
+ protected:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
// OPropertySetHelper
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 58589f414c64..d05fb8ea6053 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -59,8 +59,8 @@ namespace connectivity
class OUserExtend : public OMySQLUser,
public OUserExtend_PROP
{
- protected:
OUString m_Password;
+ protected:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
// OPropertySetHelper
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 5eeeda4ae947..41ddf5076ae4 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -102,7 +102,7 @@ namespace connectivity
}
- protected:
+ private:
// Data attributes
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index b7fe341fd084..0099a726f30c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -87,7 +87,6 @@ class CuiVclAbstractDialog_Impl : public VclAbstractDialog
class CuiAbstractController_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<weld::DialogController> m_xDlg;
public:
explicit CuiAbstractController_Impl(std::unique_ptr<weld::DialogController> p)
@@ -108,7 +107,6 @@ class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
class CuiAbstractSingleTabController_Impl : public SfxAbstractDialog
{
-protected:
std::unique_ptr<SfxSingleTabDialogController> m_xDlg;
public:
explicit CuiAbstractSingleTabController_Impl(std::unique_ptr<SfxSingleTabDialogController> p)
@@ -135,7 +133,6 @@ class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
class CuiAbstractTabController_Impl : public SfxAbstractTabDialog
{
-protected:
std::shared_ptr<SfxTabDialogController> m_xDlg;
public:
explicit CuiAbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
@@ -155,7 +152,6 @@ public:
class SvxDistributeDialog;
class AbstractSvxDistributeDialog_Impl: public AbstractSvxDistributeDialog
{
-protected:
std::unique_ptr<SvxDistributeDialog> m_xDlg;
public:
explicit AbstractSvxDistributeDialog_Impl(std::unique_ptr<SvxDistributeDialog> p)
@@ -214,7 +210,6 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog
class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
{
-protected:
std::unique_ptr<SvxHyphenWordDialog> m_xDlg;
public:
explicit AbstractHyphenWordDialog_Impl(std::unique_ptr<SvxHyphenWordDialog> p)
@@ -227,7 +222,6 @@ public:
class FmShowColsDialog;
class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog
{
-protected:
std::unique_ptr<FmShowColsDialog> m_xDlg;
public:
explicit AbstractFmShowColsDialog_Impl(std::unique_ptr<FmShowColsDialog> p)
@@ -241,7 +235,6 @@ public:
class SvxZoomDialog;
class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog
{
-protected:
std::unique_ptr<SvxZoomDialog> m_xDlg;
public:
explicit AbstractSvxZoomDialog_Impl(std::unique_ptr<SvxZoomDialog> p)
@@ -282,7 +275,6 @@ public:
class SvxScriptSelectorDialog;
class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog
{
-protected:
std::unique_ptr<SvxScriptSelectorDialog> m_xDlg;
public:
explicit AbstractScriptSelectorDialog_Impl(std::unique_ptr<SvxScriptSelectorDialog> p)
@@ -322,7 +314,6 @@ class AbstractURLDlg_Impl :public AbstractURLDlg
class SvxSearchSimilarityDialog;
class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
{
-protected:
std::unique_ptr<SvxSearchSimilarityDialog> m_xDlg;
public:
explicit AbstractSvxSearchSimilarityDialog_Impl(std::unique_ptr<SvxSearchSimilarityDialog> p)
@@ -339,7 +330,6 @@ public:
class SvxJSearchOptionsDialog;
class AbstractSvxJSearchOptionsDialog_Impl : public AbstractSvxJSearchOptionsDialog
{
-protected:
std::unique_ptr<SvxJSearchOptionsDialog> m_xDlg;
public:
explicit AbstractSvxJSearchOptionsDialog_Impl(std::unique_ptr<SvxJSearchOptionsDialog> p)
@@ -352,7 +342,6 @@ public:
class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
-protected:
std::shared_ptr<SvxTransformTabDialog> m_xDlg;
public:
explicit AbstractSvxTransformTabDialog_Impl(SvxTransformTabDialog* p)
@@ -371,7 +360,6 @@ public:
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
-protected:
std::shared_ptr<SvxCaptionTabDialog> m_xDlg;
public:
explicit AbstractSvxCaptionDialog_Impl(std::unique_ptr<SvxCaptionTabDialog> p)
@@ -391,7 +379,6 @@ public:
class FmInputRecordNoDialog;
class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog
{
-protected:
std::unique_ptr<FmInputRecordNoDialog> m_xDlg;
public:
explicit AbstractFmInputRecordNoDialog_Impl(std::unique_ptr<FmInputRecordNoDialog> p)
@@ -406,7 +393,6 @@ public:
class SvxNewDictionaryDialog;
class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog
{
-protected:
std::unique_ptr<SvxNewDictionaryDialog> m_xDlg;
public:
explicit AbstractSvxNewDictionaryDialog_Impl(std::unique_ptr<SvxNewDictionaryDialog> p)
@@ -420,8 +406,6 @@ public:
class SvxNameDialog;
class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
{
-protected:
- std::unique_ptr<SvxNameDialog> m_xDlg;
public:
explicit AbstractSvxNameDialog_Impl(std::unique_ptr<SvxNameDialog> p)
: m_xDlg(std::move(p))
@@ -435,6 +419,7 @@ public:
virtual void SetHelpId( const OString& ) override ;
virtual void SetText( const OUString& rStr ) override ;
private:
+ std::unique_ptr<SvxNameDialog> m_xDlg;
Link<AbstractSvxNameDialog&,bool> aCheckNameHdl;
DECL_LINK(CheckNameHdl, SvxNameDialog&, bool);
};
@@ -444,8 +429,6 @@ class SvxObjectTitleDescDialog;
class AbstractSvxObjectNameDialog_Impl : public AbstractSvxObjectNameDialog
{
-protected:
- std::unique_ptr<SvxObjectNameDialog> m_xDlg;
public:
explicit AbstractSvxObjectNameDialog_Impl(std::unique_ptr<SvxObjectNameDialog> p)
: m_xDlg(std::move(p))
@@ -456,13 +439,13 @@ public:
virtual void SetCheckNameHdl(const Link<AbstractSvxObjectNameDialog&,bool>& rLink) override;
private:
+ std::unique_ptr<SvxObjectNameDialog> m_xDlg;
Link<AbstractSvxObjectNameDialog&,bool> aCheckNameHdl;
DECL_LINK(CheckNameHdl, SvxObjectNameDialog&, bool);
};
class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog
{
-protected:
std::unique_ptr<SvxObjectTitleDescDialog> m_xDlg;
public:
explicit AbstractSvxObjectTitleDescDialog_Impl(std::unique_ptr<SvxObjectTitleDescDialog> p)
@@ -476,7 +459,6 @@ public:
class AbstractSvxMultiPathDialog_Impl : public AbstractSvxMultiPathDialog
{
-protected:
std::unique_ptr<SvxMultiPathDialog> m_xDlg;
public:
explicit AbstractSvxMultiPathDialog_Impl(std::unique_ptr<SvxMultiPathDialog> p)
@@ -517,7 +499,6 @@ class FmSearchDialog;
struct FmFoundRecordInformation;
class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
{
-protected:
std::unique_ptr<FmSearchDialog> m_xDlg;
public:
explicit AbstractFmSearchDialog_Impl(std::unique_ptr<FmSearchDialog> p)
@@ -532,7 +513,6 @@ public:
class AbstractGraphicFilterDialog_Impl : public AbstractGraphicFilterDialog
{
-protected:
std::unique_ptr<GraphicFilterDialog> m_xDlg;
public:
explicit AbstractGraphicFilterDialog_Impl(std::unique_ptr<GraphicFilterDialog> p)
@@ -546,7 +526,6 @@ public:
class SvxAreaTabDialog;
class AbstractSvxAreaTabDialog_Impl : public AbstractSvxAreaTabDialog
{
-protected:
std::shared_ptr<SvxAreaTabDialog> m_xDlg;
public:
explicit AbstractSvxAreaTabDialog_Impl(std::unique_ptr<SvxAreaTabDialog> p)
@@ -564,7 +543,6 @@ public:
class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
{
-protected:
std::unique_ptr<InsertObjectDialog_Impl> m_xDlg;
public:
explicit AbstractInsertObjectDialog_Impl(std::unique_ptr<InsertObjectDialog_Impl> p)
@@ -579,7 +557,6 @@ public:
class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
{
-protected:
std::unique_ptr<SvPasteObjectDialog> m_xDlg;
public:
explicit AbstractPasteDialog_Impl(std::unique_ptr<SvPasteObjectDialog> p)
@@ -608,8 +585,6 @@ public:
class SvxPostItDialog;
class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
{
-private:
- std::unique_ptr<SvxPostItDialog> m_xDlg;
public:
AbstractSvxPostItDialog_Impl(std::unique_ptr<SvxPostItDialog> pDlg)
: m_xDlg(std::move(pDlg))
@@ -628,6 +603,7 @@ public:
virtual void HideAuthor() override;
virtual std::shared_ptr<weld::Dialog> GetDialog() override;
private:
+ std::unique_ptr<SvxPostItDialog> m_xDlg;
Link<AbstractSvxPostItDialog&,void> aNextHdl;
Link<AbstractSvxPostItDialog&,void> aPrevHdl;
DECL_LINK(NextHdl, SvxPostItDialog&, void);
@@ -637,7 +613,6 @@ private:
class PasswordToOpenModifyDialog;
class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog
{
-protected:
std::unique_ptr<PasswordToOpenModifyDialog> m_xDlg;
public:
explicit AbstractPasswordToOpenModifyDialog_Impl(std::unique_ptr<PasswordToOpenModifyDialog> p)
@@ -653,7 +628,6 @@ public:
class SvxCharacterMap;
class AbstractSvxCharacterMapDialog_Impl : public SfxAbstractDialog
{
-protected:
std::unique_ptr<SvxCharacterMap> m_xDlg;
public:
explicit AbstractSvxCharacterMapDialog_Impl(std::unique_ptr<SvxCharacterMap> p)
@@ -674,7 +648,6 @@ class AbstractScreenshotAnnotationDlg_Impl : public AbstractScreenshotAnnotation
class SignatureLineDialog;
class AbstractSignatureLineDialog_Impl : public AbstractSignatureLineDialog
{
-protected:
std::unique_ptr<SignatureLineDialog> m_xDlg;
public:
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 9355419bd996..396cfeb82ecd 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -74,10 +74,10 @@ private:
DECL_LINK( ImplPreviewTimeoutHdl, Timer *, void );
DECL_LINK( ImplModifyHdl, LinkParamNone*, void);
-protected:
CuiGraphicPreviewWindow maPreview;
std::unique_ptr<weld::CustomWeld> mxPreview;
+protected:
const Link<LinkParamNone*,void>& GetModifyHdl() const { return maModifyHdl; }
const Size& GetGraphicSizePixel() const { return maPreview.GetGraphicSizePixel(); }
diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index 96d41c09002b..f6e52b094633 100644
--- a/cui/source/inc/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
@@ -23,7 +23,6 @@
class FmInputRecordNoDialog : public weld::GenericDialogController
{
-public:
std::unique_ptr<weld::SpinButton> m_xRecordNo;
public:
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 1e0638024cff..d54a8edb2499 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -108,12 +108,12 @@ private:
std::unique_ptr<weld::Button> m_xOkButton; ///< The OK button
std::unique_ptr<weld::Button> m_xCancelButton; ///< The Cancel button
std::unique_ptr<weld::Button> m_vResultList[MAX_RESULTS]; ///< List of buttons to show search results
+ ::rtl::Reference< SearchAndParseThread > m_pSearchThread;
+ ::rtl::Reference< GetPersonaThread > m_pGetPersonaThread;
public:
explicit SelectPersonaDialog(weld::Window *pParent);
virtual ~SelectPersonaDialog() override;
- ::rtl::Reference< SearchAndParseThread > m_pSearchThread;
- ::rtl::Reference< GetPersonaThread > m_pGetPersonaThread;
OUString GetSelectedPersona() const;
void SetProgress( const OUString& );
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 6c66c159fc13..3f88d98c15e6 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -455,7 +455,6 @@ namespace dbaccess
,public ORowSetBase
,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >
{
- protected:
ORowSet* m_pParent;
sal_Int32 m_nFetchDirection;
sal_Int32 m_nFetchSize;
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index 1d5dd9966f90..fa40e0765cc1 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -35,10 +35,9 @@ namespace dbaccess
public css::sdb::XColumn,
public css::sdb::XColumnUpdate
{
- protected:
css::uno::Reference < css::sdbc::XRow > m_xRow;
css::uno::Reference < css::sdbc::XRowUpdate > m_xRowUpdate;
-
+ protected:
virtual ~ODataColumn() override;
public:
ODataColumn (const css::uno::Reference < css::sdbc::XResultSetMetaData >& _xMetaData,
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 58f78745a4bc..d43ae556ec17 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -84,11 +84,11 @@ class OComponentDefinition :public OContentHelper
,public OComponentDefinition_BASE
,public ::comphelper::OPropertyArrayUsageHelper< OComponentDefinition >
{
-protected:
rtl::Reference< OColumns > m_xColumns;
rtl::Reference<OColumnPropertyListener> m_xColumnPropertyListener;
bool m_bTable;
+protected:
virtual ~OComponentDefinition() override;
virtual void SAL_CALL disposing() override;
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index eb5b6a5f5dc5..d8e0f5b6a7b5 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.hxx
@@ -39,7 +39,6 @@ namespace dbaccess
public css::sdbcx::XColumnsSupplier,
public css::lang::XServiceInfo
{
- protected:
std::unique_ptr<OColumns> m_pColumns;
css::uno::Reference< css::sdbc::XParameters > m_xAggregateAsParameters;
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index c66ba64f3259..a21364cc45a6 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -37,7 +37,6 @@ namespace dbaui
class OConnectionTabPageSetup : public OConnectionHelper
{
friend class VclPtr<OConnectionTabPageSetup>;
- protected:
std::unique_ptr<weld::Label> m_xHelpText;
std::unique_ptr<weld::Label> m_xHeaderText;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index fdc36ff6db16..b5fbbb8e5a9b 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -55,9 +55,6 @@ namespace dbaui
class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- std::unique_ptr<weld::Widget> m_xSubContainer;
- std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
-
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
static VclPtr<OGenericAdministrationPage> CreateTextTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet );
OTextConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
@@ -69,9 +66,10 @@ namespace dbaui
virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
bool checkTestConnection() override;
-
private:
DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*, void);
+ std::unique_ptr<weld::Widget> m_xSubContainer;
+ std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
};
// OLDAPConnectionPageSetup
@@ -255,15 +253,6 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet);
- VclPtr<FixedText> m_pFTFinalHeader;
- VclPtr<FixedText> m_pFTFinalHelpText;
- VclPtr<RadioButton> m_pRBRegisterDataSource;
- VclPtr<RadioButton> m_pRBDontregisterDataSource;
- VclPtr<FixedText> m_pFTAdditionalSettings;
- VclPtr<CheckBox> m_pCBOpenAfterwards;
- VclPtr<CheckBox> m_pCBStartTableWizard;
- VclPtr<FixedText> m_pFTFinalText;
-
OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
virtual ~OFinalDBPageSetup() override;
virtual void dispose() override;
@@ -277,6 +266,15 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
+ private:
+ VclPtr<FixedText> m_pFTFinalHeader;
+ VclPtr<FixedText> m_pFTFinalHelpText;
+ VclPtr<RadioButton> m_pRBRegisterDataSource;
+ VclPtr<RadioButton> m_pRBDontregisterDataSource;
+ VclPtr<FixedText> m_pFTAdditionalSettings;
+ VclPtr<CheckBox> m_pCBOpenAfterwards;
+ VclPtr<CheckBox> m_pCBStartTableWizard;
+ VclPtr<FixedText> m_pFTFinalText;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 47ba2089850a..8de9f2f3e757 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -51,8 +51,6 @@ namespace dbaui
*/
class OCommonBehaviourTabPage : public OGenericAdministrationPage
{
- protected:
-
OCommonBehaviourTabPageFlags m_nControlFlags;
std::unique_ptr<weld::Label> m_xOptionsLabel;
@@ -244,8 +242,6 @@ namespace dbaui
OTextDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
- std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
-
protected:
virtual ~OTextDetailsPage() override;
virtual void dispose() override;
@@ -256,6 +252,7 @@ namespace dbaui
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private:
+ std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index c869babc7651..3a7365c1da9c 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -29,7 +29,6 @@ namespace dbaui
class OCommentUndoAction : public SfxUndoAction
{
- protected:
OUString m_strComment; // undo, redo comment
public:
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 3f7798bc1fe7..71759bc43337 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -34,9 +34,8 @@ class BaseCommandEnv
css::task::XInteractionHandler,
css::ucb::XProgressHandler >
{
-protected:
css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
-
+protected:
void handle_(bool approve,
css::uno::Reference< css::task::XInteractionRequest> const & xRequest );
public:
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index 7e96f3dd7a28..e00feb41d75b 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -67,7 +67,6 @@ class SfxGrabBagItem;
// bEdge: Attribute will not expand, if you want to expand just on the edge
class EditCharAttrib
{
-protected:
const SfxPoolItem* pItem;
sal_Int32 nStart;
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 24a9de37317e..fa0b7619cb11 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -65,7 +65,6 @@ namespace dbp
class OMaybeListSelectionPage : public OControlWizardPage
{
- protected:
VclPtr<RadioButton> m_pYes;
VclPtr<RadioButton> m_pNo;
VclPtr<ListBox> m_pList;
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index af85462450ab..ed1729bf07cb 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -49,7 +49,6 @@ namespace dbp
typedef ::svt::OWizardPage OControlWizardPage_Base;
class OControlWizardPage : public OControlWizardPage_Base
{
- protected:
VclPtr<FixedText> m_pFormDatasourceLabel;
VclPtr<FixedText> m_pFormDatasource;
VclPtr<FixedText> m_pFormContentTypeLabel;
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 654f69135f83..5156e1c68dc0 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -53,7 +53,6 @@ namespace pcr
,public ImplInspectorModel_Base
,public ImplInspectorModel_PBase
{
- protected:
std::unique_ptr< InspectorModelProperties > m_pProperties;
protected:
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index bf98963358cd..80910adda578 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -160,13 +160,14 @@ class CGMFList
sal_uInt32 nCharSetCount;
::std::vector< std::unique_ptr<FontEntry> >
aFontEntryList;
+ sal_uInt32 nFontsAvailable;
+
void ImplDeleteList();
public:
CGMFList();
~CGMFList();
- sal_uInt32 nFontsAvailable;
FontEntry* GetFontEntry( sal_uInt32 );
void InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize );
void InsertCharSet( CharSetType, sal_uInt8 const * pSource, sal_uInt32 nSize );
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
index b406ac53f82c..5b8da4355678 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
@@ -54,11 +54,11 @@ public:
class DXFBlocks {
-public:
-
DXFBlock * pFirst;
// list of blocks, READ ONLY!
+public:
+
DXFBlocks();
~DXFBlocks();
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index f2aa8d3c90aa..3f6c4e46fa2e 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -207,8 +207,6 @@ protected:
class DXFShapeEntity : public DXFBasicEntity {
-public:
-
DXFVector aP0; // 10,20,30
double fSize; // 40
OString m_sName; // 2
@@ -216,6 +214,8 @@ public:
double fXScale; // 41
double fOblAngle; // 51
+public:
+
DXFShapeEntity();
protected:
@@ -248,8 +248,6 @@ protected:
class DXFAttDefEntity : public DXFBasicEntity {
-public:
-
DXFVector aP0; // 10,20,30
double fHeight; // 40
OString m_sDefVal; // 1
@@ -266,6 +264,8 @@ public:
long nVertJust; // 74
DXFVector aAlign; // 11,21,31
+public:
+
DXFAttDefEntity();
protected:
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx
index 0b1b099eb1c6..a2dfb1a6c0f0 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx
@@ -142,13 +142,13 @@ public:
class DXFTables {
-public:
-
DXFLType * pLTypes; // list of line types
DXFLayer * pLayers; // list of layers
DXFStyle * pStyles; // list of styles
DXFVPort * pVPorts; // list of viewports
+public:
+
DXFTables();
~DXFTables();
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index e3b4111da6cb..d98fdbd02e0e 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -49,7 +49,6 @@ class OGridColumn :public ::cppu::BaseMutex
,public OPropertySetAggregationHelper
,public OCloneableAggregation
{
-protected:
// [properties]
css::uno::Any m_aWidth; // column width
css::uno::Any m_aAlign; // column alignment
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 38ed4a08f3a7..fa19c000e6fb 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -260,7 +260,6 @@ typedef ::cppu::ImplHelper1 < css::form::XBoundControl
class OBoundControl :public OControl
,public OBoundControl_BASE
{
-protected:
bool m_bLocked : 1;
public:
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index 07656745f006..8a7a89e445c1 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -40,10 +40,10 @@ typedef cppu::WeakImplHelper<
template<class T>
class NameContainer : public NameContainer_t
{
-protected:
typedef std::map<OUString,T> map_t;
map_t maItems;
+protected:
typename map_t::const_iterator findItem( const OUString& rName )
{
return maItems.find( rName );
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index fe1db2618442..894b8dc5bd0b 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -257,7 +257,6 @@ namespace xforms
typedef ODerivedDataType< OStringType > OStringType_Base;
class OStringType :public OStringType_Base
{
- protected:
// <properties>
css::uno::Any m_aLength;
css::uno::Any m_aMinLength;
@@ -282,7 +281,6 @@ namespace xforms
typedef ODerivedDataType< ODecimalType, OValueLimitedType< double > > ODecimalType_Base;
class ODecimalType : public ODecimalType_Base
{
- protected:
css::uno::Any m_aTotalDigits;
css::uno::Any m_aFractionDigits;
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index d9d03d385a8a..df4f5bcd20da 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -60,7 +60,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > {
sal_Bool canBubbleArg,
sal_Bool cancelableArg) override;
- protected:
+ private:
OUString m_eventType;
bool m_bubbles;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 3c2997590ed3..60f61c2b1ebb 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -178,7 +178,7 @@ public:
//XExtendedFilterDetection
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override;
-public:
+private:
Reference< XFilter > rFilter;
Reference< XImporter > rImporter;
};
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index d3ea84fdc7a9..12def9b70942 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -83,9 +83,9 @@ public:
class SvMetaObject : public SvRefBase
{
-protected:
OString aName;
+protected:
bool ReadNameSvIdl( SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -106,7 +106,6 @@ public:
class SvMetaReference : public SvMetaObject
{
-protected:
tools::SvRef<SvMetaReference> aRef;
public:
SvMetaReference();
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index 6c370fe61459..fc6511c2160a 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -32,7 +32,7 @@ namespace basegfx
private:
BZPixelRaster(const BZPixelRaster&) = delete;
BZPixelRaster& operator=(const BZPixelRaster&) = delete;
- protected:
+
sal_uInt32 mnWidth;
sal_uInt32 mnHeight;
sal_uInt32 mnCount;
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 73f233e6b6b7..97014fc6fdef 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -112,9 +112,9 @@ class BASIC_DLLPUBLIC SbxArray : public SbxBase
BASIC_DLLPRIVATE void PutDirect( SbxVariable* pVar, sal_uInt32 nIdx );
std::vector<SbxVarEntry> mVarEntries; // The variables
+ SbxDataType eType; // Data type of the array
protected:
- SbxDataType eType; // Data type of the array
virtual ~SbxArray() override;
virtual bool LoadData( SvStream&, sal_uInt16 ) override;
virtual bool StoreData( SvStream& ) const override;
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index 0611e7ccc54d..89f7007065a3 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -33,8 +33,8 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OIndexColumn :
public OColumn, public OIndexColumn_PROP
{
- protected:
bool m_IsAscending;
+ protected:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
public:
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index 20d326e40666..6eecf9459e22 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -33,8 +33,8 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OKeyColumn :
public OColumn, public OKeyColumn_PROP
{
- protected:
OUString m_ReferencedColumn;
+ protected:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
public:
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 0b4a2bf445f9..c078ad6392e4 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -420,9 +420,9 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase,
public css::text::XTextRangeMover,
public css::lang::XTypeProvider
{
-protected:
css::uno::Reference< css::text::XText > xParentText;
+protected:
SvxUnoTextBase(const SvxItemPropertySet* _pSet);
SvxUnoTextBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, css::uno::Reference < css::text::XText > const & xParent);
SvxUnoTextBase(const SvxUnoTextBase& rText);
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index bd33935cbf26..26643fc08fcd 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -123,12 +123,10 @@ inline std::string StackVarEnumToString(StackVar const e)
class FORMULA_DLLPUBLIC FormulaToken
{
OpCode eOp;
- FormulaToken& operator=( const FormulaToken& ) = delete;
-protected:
-
- const StackVar eType; // type of data
- mutable oslInterlockedCount mnRefCnt; // reference count
+ const StackVar eType; // type of data
+ mutable oslInterlockedCount mnRefCnt; // reference count
+ FormulaToken& operator=( const FormulaToken& ) = delete;
public:
FormulaToken( StackVar eTypeP,OpCode e = ocPush );
FormulaToken( const FormulaToken& r );
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 7367bfd6cec7..5445be3761cf 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -1602,7 +1602,6 @@ protected:
private:
void constructTextStrmObj( rtl_TextEncoding eTextEnc );
-protected:
std::shared_ptr< TextInputStream > mxTextStrm;
};
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 84694e655865..7251c1656f68 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -141,10 +141,8 @@ private:
/** Processes the 'path' attribute. */
void setVmlPath( const OUString& rPath );
-protected:
- ShapeBase& mrShape;
-
private:
+ ShapeBase& mrShape;
ShapeModel& mrShapeModel;
};
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 0cd7d576f644..e678a118f369 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -217,7 +217,7 @@ protected:
@param length specifies the length of the array specified by phKeys.
*/
inline void setKeyHandles(Registry const & registry, RegKeyHandle* phKeys, sal_uInt32 length);
-
+private:
/// stores the number of open subkeys, the number of elements.
sal_uInt32 m_length;
/// stores an array of open subkeys.
@@ -255,7 +255,7 @@ protected:
@param length specifies the length of the array specified by pKeyNames.
*/
inline void setKeyNames(Registry const & registry, rtl_uString** pKeyNames, sal_uInt32 length);
-
+private:
/// stores the number of key names, the number of elements.
sal_uInt32 m_length;
/// stores an array of key names.
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 74b93408d5c3..45120686ca96 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -213,14 +213,13 @@ public:
OKButton* GetOKButton() const { return pOKBtn; }
-protected:
+private:
VclPtr<OKButton> pOKBtn;
VclPtr<CancelButton> pCancelBtn;
VclPtr<HelpButton> pHelpBtn;
DECL_DLLPRIVATE_LINK(OKHdl_Impl, Button*, void);
-private:
std::unique_ptr<SingleTabDlgImpl> pImpl;
};
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index b3f4483f9450..01f1298f0ff3 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -82,7 +82,6 @@ namespace svt
friend class EditBrowseBox;
Link<LinkParamNone*, void> maModifyHdl;
- protected:
VclPtr<Control> pWindow;
bool bSuspended; // <true> if the window is hidden and disabled
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index 2cb5315b02f3..cdc3acf586c8 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -32,10 +32,11 @@ class PrinterOptions;
class SVT_DLLPUBLIC SvtBasePrintOptions: public utl::detail::Options
{
-protected:
SvtPrintOptions_Impl* m_pDataContainer;
+protected:
+
void SetDataContainer( SvtPrintOptions_Impl* pDataContainer ) { m_pDataContainer = pDataContainer; }
public:
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index f6d085902db5..0131b7d68ecc 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -115,6 +115,8 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
// store the attributes passed from pSet
OUString aBulletCharFmtName;
OUString aNumCharFmtName;
+ bool bIsLoading;
+
NBOTypeMgrBase(const NBOTypeMgrBase&) = delete;
public:
@@ -138,7 +140,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
const OUString& GetNumCharFmtName() { return aNumCharFmtName;}
MapUnit GetMapUnit() { return eCoreUnit;}
protected:
- bool bIsLoading;
void ImplLoad(const OUString& filename);
void ImplStore(const OUString& filename);
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index d9d0ffbf795b..e7c39c061f99 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -82,13 +82,13 @@ public:
class ObjectContactOfPagePainter : public ObjectContactPainter
{
-protected:
// the original ObjectContact this painter is working on
ObjectContact& mrOriginalObjectContact;
// Set StartPoint for next run, also given in constructor
tools::WeakReference<SdrPage> mxStartPage;
+protected:
// Hierarchy access methods
virtual sal_uInt32 GetPaintObjectCount() const override;
virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
index a6a633eb698d..8dc25997f4f4 100644
--- a/include/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3d.hxx
@@ -62,13 +62,13 @@ public:
// primitive stuff
-protected:
// Primitive3DContainer of the ViewContact. This contains all necessary information
// for the graphical visualisation and needs to be supported by all 3D VCs which
// can be visualized. It does NOT contain the object transformation to be able to
// buffer for all possible usages
drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer;
+protected:
// This method is responsible for creating the graphical visualisation data which is
// stored in mxViewIndependentPrimitive3DContainer, but without object transformation
virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const = 0;
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index df9ac0845827..f932c91eac1c 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -36,8 +36,8 @@ private:
SfxUndoAction* mpLastUndoActionBeforeTextEdit;
bool mbEndTextEditTriggeredFromUndo;
-protected:
SfxObjectShell* m_pDocSh;
+protected:
// call to check for TextEdit active
bool isTextEditActive() const;
virtual void EmptyActionsChanged() override;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 0d39a3843aae..c84965d4e984 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -198,11 +198,9 @@ public:
*/
class SVX_DLLPUBLIC SdrObjUserData
{
-protected:
SdrInventor const nInventor;
sal_uInt16 const nIdentifier;
-private:
void operator=(const SdrObjUserData& rData) = delete;
bool operator==(const SdrObjUserData& rData) const = delete;
bool operator!=(const SdrObjUserData& rData) const = delete;
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index ad4b02c60ab1..8fa51167a113 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -30,7 +30,6 @@ class SdrPage;
class SVX_DLLPUBLIC SdrOutliner : public Outliner
{
tools::WeakReference<SdrTextObj> mpTextObj;
-protected:
const SdrPage* mpVisualizedPage;
public:
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 815aa160b4b2..b7e5ed43b1d7 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -62,17 +62,15 @@ class SvxUnoDrawPagesAccess;
// class SdrObjList
class SVX_DLLPUBLIC SdrObjList
{
+friend class SdrObjListIter;
+friend class SdrEditView;
+
private:
SdrObjList(const SdrObjList& rSrcList) = delete;
SdrObjList &operator=(const SdrObjList& rSrcList) = delete;
-private:
::std::vector<SdrObject*> maList;
-protected:
-friend class SdrObjListIter;
-friend class SdrEditView;
-
tools::Rectangle maSdrObjListOutRect;
tools::Rectangle maSdrObjListSnapRect;
bool mbObjOrdNumsDirty;
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 187eadd4ca12..4d418a33d2e5 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -29,7 +29,6 @@ class SVX_DLLPUBLIC SdrPolyEditView : public SdrEditView, public IPolyPolygonEdi
{
friend class SdrEditView;
-protected:
bool bSetMarkedPointsSmoothPossible : 1;
bool bSetMarkedSegmentsKindPossible : 1;
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index f046700050c3..0e30f39c4661 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -206,7 +206,6 @@ public:
class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
{
-protected:
std::unique_ptr<SdrObjGeoData> pUndoGeo;
std::unique_ptr<SdrObjGeoData> pRedoGeo;
// If we have a group object:
@@ -333,7 +332,6 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
bool bOldOwner;
bool bNewOwner;
-protected:
SdrObjList* pObjList;
sal_uInt32 nOrdNum;
SdrObject* pNewObj;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 5e800e37adb4..c0d3b21a8f42 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -154,7 +154,6 @@ class SVX_DLLPUBLIC SdrView : public SdrCreateView, public virtual tools::WeakBa
bool bNoExtendedKeyDispatcher : 1;
bool mbMasterPagePaintCaching : 1;
-protected:
SvtAccessibilityOptions maAccessibilityOptions;
public:
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index f270754c2df5..2a0cc42f6b02 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -142,9 +142,10 @@ public:
protected:
TextChain();
- std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
private:
+ std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
+
friend class SdrModel;
//SdrTextObj *impGetNextLink(const SdrTextObj *) const;
//SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 83f25353c7b6..64c13412152f 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -41,13 +41,13 @@ class Impl3DMirrorConstructOverlay;
class SVX_DLLPUBLIC E3dView : public SdrView
{
-protected:
E3dDefaultAttributes a3DDefaultAttr;
MouseEvent aMouseEvent; // The parameters of the last Events (Mouse, Keyboard)
// Migrate selections
std::unique_ptr<Impl3DMirrorConstructOverlay> mpMirrorOverlay;
+protected:
void InitView();
void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix const & rLatheMat);
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index f2adf5b302e8..9234f4ad2119 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -121,7 +121,7 @@ public:
the passed container element. */
virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) = 0;
-protected:
+private:
css::uno::Reference< css::container::XEnumeration > mxEnumeration;
};
diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx
index ed1f2114fcfb..517784d64773 100644
--- a/include/vbahelper/vbaglobalbase.hxx
+++ b/include/vbahelper/vbaglobalbase.hxx
@@ -46,9 +46,8 @@ namespace ooo { namespace vba {
typedef InheritedHelperInterfaceWeakImpl< ov::XGlobalsBase > Globals_BASE;
class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
{
-protected:
const OUString msDocCtxName;
-
+protected:
bool hasServiceName( const OUString& serviceName );
void init( const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs );
diff --git a/include/vcl/BitmapConvolutionMatrixFilter.hxx b/include/vcl/BitmapConvolutionMatrixFilter.hxx
index 928eaa9f0aa2..185d14012d49 100644
--- a/include/vcl/BitmapConvolutionMatrixFilter.hxx
+++ b/include/vcl/BitmapConvolutionMatrixFilter.hxx
@@ -27,7 +27,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
-protected:
+private:
const long (&mrMatrix)[9];
};
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ed23eaf472c6..658faaf0450e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -176,10 +176,9 @@ class MergeData
{
friend class MergeDataHashMap;
-public:
std::unique_ptr<MergeEntrys> pMergeEntrys;
-private:
MergeDataHashMap::iterator m_aNextData;
+
public:
MergeData();
~MergeData();
diff --git a/lotuswordpro/inc/xfilter/xfrect.hxx b/lotuswordpro/inc/xfilter/xfrect.hxx
index 406e2cf158f3..ed450cfe4292 100644
--- a/lotuswordpro/inc/xfilter/xfrect.hxx
+++ b/lotuswordpro/inc/xfilter/xfrect.hxx
@@ -128,7 +128,7 @@ public:
m_fHeight = height;
}
-public:
+private:
XFPoint m_aPoint;
double m_fWidth;
double m_fHeight;
diff --git a/lotuswordpro/inc/xfilter/xfsaxstream.hxx b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
index 36be72a3823f..758c97a2903d 100644
--- a/lotuswordpro/inc/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
@@ -115,7 +115,7 @@ public:
*/
virtual IXFAttrList* GetAttrList() override;
-public:
+private:
css::uno::Reference<css::xml::sax::XDocumentHandler> m_aHandler;
std::unique_ptr<XFSaxAttrList> m_pAttrList;
};
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index 01e5ec97b8de..a313c55dd2bd 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -63,11 +63,10 @@ class SvStream;
class HuffmanTreeNode
{
-public:
std::unique_ptr<HuffmanTreeNode> left;
std::unique_ptr<HuffmanTreeNode> right;
sal_uInt32 value;
-
+public:
explicit HuffmanTreeNode(sal_uInt32 value = 0xffffffff) ;
~HuffmanTreeNode() ;
HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const sal_Char * pInCode);
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index a9e15f05a89e..c29bb6e99029 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -74,7 +74,7 @@ class LwpContent : public LwpDLNFVList
{
public:
LwpContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
-protected:
+private:
LwpAssociatedLayouts m_LayoutsWithMe;
sal_uInt16 m_nFlags;
LwpAtomHolder m_ClassName;
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index f84e74a7c64b..19f8ff7a5253 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -72,16 +72,14 @@ class LwpDLVList : public LwpObject
{
public:
LwpDLVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
+ LwpObjectID& GetNext() { return m_ListNext; }
+ LwpObjectID& GetPrevious() { return m_ListPrevious; }
protected:
virtual ~LwpDLVList() override {}
-
+ void Read() override;
+private:
LwpObjectID m_ListPrevious;
LwpObjectID m_ListNext;
-protected:
- void Read() override;
-public:
- LwpObjectID& GetNext() { return m_ListNext; }
- LwpObjectID& GetPrevious() { return m_ListPrevious; }
};
/**
@@ -118,14 +116,13 @@ class LwpDLNFPVList : public LwpDLNFVList
public:
LwpDLNFPVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
virtual ~LwpDLNFPVList() override;
-protected:
- bool m_bHasProperties;
- std::unique_ptr<LwpPropList> m_pPropList;
+ LwpPropList* GetPropList() { return m_pPropList.get(); }
protected:
void Read() override;
void ReadPropertyList(LwpObjectStream* pObjStrm);
-public:
- LwpPropList* GetPropList() { return m_pPropList.get(); }
+private:
+ bool m_bHasProperties;
+ std::unique_ptr<LwpPropList> m_pPropList;
};
/**
@@ -153,7 +150,7 @@ public:
LwpDLVListHead(){}
void Read(LwpObjectStream* pObjStrm);
LwpObjectID& GetFirst() { return m_objHead; }
-protected:
+private:
LwpObjectID m_objHead;//LwpDLVList
};
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index 1c84bc185d1c..2b5bbc2acb01 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -106,7 +106,7 @@ public:
LwpObjectID& GetObject() { return m_Object; }
protected:
virtual ~LwpObjectHolder() override {}
-
+private:
LwpObjectID m_Object;
};
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 6b6aadbe8351..e393c6908779 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -122,6 +122,7 @@ public:
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_HEADING_LAYOUT;}
protected:
void Read() override;
+private:
LwpObjectID cRowLayout;
};
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index 73de821fab72..7ba45ceba32e 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -74,7 +74,7 @@ public:
void Read() override;
LwpObjectID& GetPosition(){ return m_Para;}
LwpObjectID& GetListList(){ return m_ListList;}
-protected:
+private:
LwpObjectID m_ListList;//lwplistlist object,
LwpObjectID m_Para;
};
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 435e9e559bba..9a6ffb39b372 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -167,6 +167,7 @@ public:
virtual ~LwpParallelColumns() override;
protected:
void Read() override;
+private:
LwpObjectID cDefaultLeftColumnStyle;
LwpObjectID cDefaultRightColumnStyle;
};
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 700c16647472..29d462359be8 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -203,6 +203,7 @@ public:
bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);}
protected:
void Read() override;
+private:
sal_uInt8 ccolid;
sal_Int32 cwidth;
@@ -220,6 +221,7 @@ public:
void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow);
protected:
void Read() override;
+private:
sal_uInt16 cStartRow;
sal_uInt16 cEndRow;
};
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index dbe058bbc747..0e837547a585 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -100,7 +100,7 @@ public:
inline LeaderType GetLeaderType();
inline sal_uInt16 GetAlignChar();
-protected:
+private:
sal_uInt32 m_nX;
sal_uInt8 m_nType;
sal_uInt8 m_nLeader;
diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx
index 1646cc6072bd..3aabbd15b54e 100644
--- a/oox/inc/drawingml/misccontexts.hxx
+++ b/oox/inc/drawingml/misccontexts.hxx
@@ -215,7 +215,7 @@ public:
const ::oox::AttributeList& rAttribs,
FillProperties& rFillProps );
-protected:
+private:
FillProperties& mrFillProps;
};
diff --git a/oox/inc/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx
index d4cc4556eabd..94b6b10dc569 100644
--- a/oox/inc/drawingml/textliststyle.hxx
+++ b/oox/inc/drawingml/textliststyle.hxx
@@ -49,7 +49,7 @@ public:
void dump() const;
#endif
-protected:
+private:
TextParagraphPropertiesVector maListStyle;
TextParagraphPropertiesVector maAggregationListStyle;
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index a0955b124230..91cb0f39fd2c 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -155,7 +155,6 @@ typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > Diag
class DiagramData
{
public:
- ::std::vector<OUString> maExtDrawings;
typedef std::map< OUString, dgm::Point* > PointNameMap;
typedef std::map< OUString,
std::vector<dgm::Point*> > PointsNameMap;
@@ -193,6 +192,7 @@ public:
{ mnMaxDepth = nDepth; }
void dump() const;
private:
+ ::std::vector<OUString> maExtDrawings;
FillPropertiesPtr mpFillProperties;
dgm::Connections maConnections;
dgm::Points maPoints;
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 3a5a467419e9..6d30de9b553e 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -194,7 +194,6 @@ private:
class XclMacroHelper : public XclExpControlHelper
{
-protected:
XclTokenArrayRef mxMacroLink; /// Token array containing a link to an attached macro.
public:
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 1c277e484ecc..6577714f44a4 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -414,7 +414,6 @@ public:
class AbstractScDPNumGroupDlg_Impl : public AbstractScDPNumGroupDlg
{
-protected:
std::unique_ptr<ScDPNumGroupDlg> m_xDlg;
public:
explicit AbstractScDPNumGroupDlg_Impl(ScDPNumGroupDlg* p)
@@ -427,7 +426,6 @@ public:
class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg
{
-protected:
std::unique_ptr<ScDPDateGroupDlg> m_xDlg;
public:
explicit AbstractScDPDateGroupDlg_Impl(ScDPDateGroupDlg* p)
@@ -441,7 +439,6 @@ public:
class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg
{
-protected:
std::shared_ptr<ScDPShowDetailDlg> m_xDlg;
public:
explicit AbstractScDPShowDetailDlg_Impl(ScDPShowDetailDlg* p)
@@ -471,7 +468,6 @@ public:
class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
{
-protected:
std::shared_ptr<ScShowTabDlg> m_xDlg;
public:
explicit AbstractScShowTabDlg_Impl(ScShowTabDlg* p)
@@ -488,7 +484,6 @@ public:
class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg
{
-protected:
std::unique_ptr<ScSortWarningDlg> m_xDlg;
public:
explicit AbstractScSortWarningDlg_Impl(std::unique_ptr<ScSortWarningDlg> p)
@@ -500,7 +495,6 @@ public:
class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg
{
-protected:
std::unique_ptr<ScStringInputDlg> m_xDlg;
public:
explicit AbstractScStringInputDlg_Impl(std::unique_ptr<ScStringInputDlg> p)
@@ -513,7 +507,6 @@ public:
class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg
{
-protected:
std::unique_ptr<ScTabBgColorDlg> m_xDlg;
public:
explicit AbstractScTabBgColorDlg_Impl(std::unique_ptr<ScTabBgColorDlg> p)
@@ -526,7 +519,6 @@ public:
class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg
{
-protected:
std::unique_ptr<ScImportOptionsDlg> m_xDlg;
public:
explicit AbstractScImportOptionsDlg_Impl(std::unique_ptr<ScImportOptionsDlg> p)
@@ -540,7 +532,6 @@ public:
class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDlg
{
-protected:
std::unique_ptr<ScTextImportOptionsDlg> m_xDlg;
public:
explicit AbstractScTextImportOptionsDlg_Impl(std::unique_ptr<ScTextImportOptionsDlg> p)
@@ -565,7 +556,6 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
class ScAbstractTabController_Impl : public SfxAbstractTabDialog
{
-protected:
std::shared_ptr<SfxTabDialogController> m_xDlg;
public:
explicit ScAbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index b672a10cb15d..9b40f2a452d9 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -34,7 +34,6 @@ class TitleImpl : public InheritedHelperInterfaceImpl< Ifc... >
{
typedef InheritedHelperInterfaceImpl< Ifc... > BaseClass;
-protected:
css::uno::Reference< css::drawing::XShape > xTitleShape;
css::uno::Reference< css::beans::XPropertySet > xShapePropertySet;
std::unique_ptr<ov::ShapeHelper> oShapeHelper;
diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx
index 380584dce24b..67c139dc072b 100644
--- a/scripting/source/inc/bcholder.hxx
+++ b/scripting/source/inc/bcholder.hxx
@@ -43,7 +43,6 @@ namespace scripting_helper
class OBroadcastHelperHolder
{
- protected:
::cppu::OBroadcastHelper m_aBHelper;
public:
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 2b6da5830816..6bdd0eeb0bc9 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -70,6 +70,10 @@ const int AFTEREFFECT_SET = 2;
class AnimationExporter
{
css::uno::Any aTarget;
+ const EscherSolverContainer& mrSolverContainer;
+ ppt::ExSoundCollection& mrExSoundCollection;
+ std::vector< AfterEffectNodePtr > maAfterEffectNodes;
+ sal_Int32 mnCurrentGroup;
static void writeZString( SvStream& rStrm, const OUString& rVal );
static bool getColorAny( const css::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC );
@@ -101,8 +105,6 @@ class AnimationExporter
void exportAnimateColor( SvStream& rStrm, const css::uno::Reference< css::animations::XAnimationNode >& xNode, int nAfterEffectType );
void exportIterate( SvStream& rStrm, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
- const EscherSolverContainer& mrSolverContainer;
- ppt::ExSoundCollection& mrExSoundCollection;
void processAfterEffectNodes( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
bool isAfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const;
@@ -111,15 +113,11 @@ class AnimationExporter
static css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNodeClone( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
- std::vector< AfterEffectNodePtr > maAfterEffectNodes;
-
public:
AnimationExporter( const EscherSolverContainer& rSolverContainer, ppt::ExSoundCollection& rExSoundCollection );
void doexport( const css::uno::Reference< css::drawing::XDrawPage >& xPage, SvStream& rStrm );
- sal_Int32 mnCurrentGroup;
-
// helper methods also used in ooxml export
static css::uno::Any convertAnimateValue( const css::uno::Any& rSource, const OUString& rAttributeName );
static bool GetNodeType( const css::uno::Reference< css::animations::XAnimationNode >& xNode, sal_Int16& nType );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 9b674de7862b..d8b4096b7399 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -109,7 +109,7 @@ public:
sal_Int32 getControlType() const { return mnType; }
-protected:
+private:
sal_Int32 const mnType;
};
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 619e8cb4a319..269795b4c690 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -70,7 +70,6 @@ class SdVclAbstractDialog_Impl : public VclAbstractDialog
class SdAbstractGenericDialog_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<weld::GenericDialogController> m_xDlg;
public:
explicit SdAbstractGenericDialog_Impl(std::unique_ptr<weld::GenericDialogController> p)
@@ -128,7 +127,6 @@ public:
class SdAbstractTabController_Impl : public SfxAbstractTabDialog
{
-protected:
std::shared_ptr<SfxTabDialogController> m_xDlg;
public:
explicit SdAbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
@@ -147,7 +145,6 @@ public:
class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
{
-protected:
std::shared_ptr<SfxTabDialogController> m_xDlg;
public:
explicit AbstractBulletDialog_Impl(std::unique_ptr<SfxTabDialogController> p)
@@ -167,7 +164,6 @@ public:
class SdPresLayoutTemplateDlg;
class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
{
-protected:
std::shared_ptr<SdPresLayoutTemplateDlg> m_xDlg;
public:
explicit SdPresLayoutTemplateDlg_Impl(std::unique_ptr<SdPresLayoutTemplateDlg> p)
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 835460f643e0..d77df9057d6d 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -141,7 +141,6 @@ public:
// change the parameter to int
//void fireSwitchCurrentPage( String pageName) throw();
void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
- css::uno::Reference< css::drawing::XLayer>* mpCurrentLayer;
bool IsDisposing() const { return mbDisposing; }
/** Return a pointer to the ViewShellBase object that the DrawController
@@ -278,6 +277,8 @@ private:
using cppu::OPropertySetHelper::disposing;
using cppu::OPropertySetHelper::getFastPropertyValue;
+ css::uno::Reference< css::drawing::XLayer>* mpCurrentLayer;
+
const css::uno::Type m_aSelectionTypeIdentifier;
/** This pointer to the ViewShellBase can be NULL (after a call to
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index bfc5e7f73e63..f7d05f5721b9 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -130,8 +130,6 @@ public:
virtual css::uno::Reference<css::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow) override;
- OUString m_StrOldPageName;
-
/** Update the preview to show the specified page.
*/
virtual void UpdatePreview (SdPage* pPage, bool bInit = false) override;
@@ -150,6 +148,7 @@ public:
void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara );
private:
+ OUString m_StrOldPageName;
std::unique_ptr<OutlineView> pOlView;
SdPage* pLastPage; // For efficient processing of the preview
rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr;
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 6f40e6150ca0..3f9178ca2dd7 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -56,7 +56,7 @@ protected:
::sd::View* pView,
SdDrawDocument* pDoc,
SfxRequest& rReq);
-
+private:
bool bSelectionChanged;
};
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index d65e04c35dfd..2130246128a8 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -169,7 +169,7 @@ public:
const SmartTagReference& getTag() const { return mxSmartTag; }
virtual bool isMarkable() const;
-protected:
+private:
SmartTagReference const mxSmartTag;
};
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index d40c7c4211eb..4686a879fecb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -118,8 +118,8 @@ public:
// css::presentation::XShapeEventListener:
virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) override;
+private:
::comphelper::OInterfaceContainerHelper2 maListeners;
-
rtl::Reference< SlideshowImpl > mxController;
css::uno::Reference< css::presentation::XSlideShow > mxSlideShow;
};
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index c0482b1c4111..81bfd927354b 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -35,11 +35,12 @@ namespace pdfi
{
private:
PDFIProcessor& m_rProcessor;
+ css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
+
void optimizeTextElements(Element& rParent);
public:
- css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
- const css::uno::Reference< css::i18n::XBreakIterator >& GetBreakIterator();
+ const css::uno::Reference< css::i18n::XBreakIterator >& GetBreakIterator();
explicit DrawXmlOptimizer(PDFIProcessor& rProcessor) :
m_rProcessor(rProcessor)
{}
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index 328fc005330d..a1fe23583b13 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -29,7 +29,6 @@ class SfxPreviewWin_Impl : public weld::CustomWidgetController
{
private:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
-protected:
std::shared_ptr<GDIMetaFile> xMetaFile;
public:
SfxPreviewWin_Impl();
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 7f119bcb27a8..238687940dd1 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -49,6 +49,7 @@ namespace accessibility
> AccessibleTableShape_Base;
class AccessibleTableShape final : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
{
+ sal_Int32 mnPreviousSelectionCount;
public:
AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo );
virtual ~AccessibleTableShape( ) override;
@@ -113,7 +114,6 @@ public:
disposing (const css::lang::EventObject& Source) override;
virtual void SAL_CALL
selectionChanged (const css::lang::EventObject& rEvent) override;
- sal_Int32 mnPreviousSelectionCount;
using AccessibleShape::disposing;
friend class AccessibleTableHeaderShape;
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index 3fee4f3fce0a..6fa87cfd59b6 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -31,7 +31,6 @@ class ViewContactOfSdrPage;
class ViewContactOfPageSubObject : public ViewContact
{
-protected:
ViewContactOfSdrPage& mrParentViewContactOfSdrPage;
public:
@@ -159,7 +158,6 @@ public:
class ViewContactOfSdrPage : public ViewContact
{
-protected:
// the owner of this ViewContact. Set from constructor and not
// to be changed in any way.
SdrPage& mrPage;
@@ -177,6 +175,7 @@ protected:
ViewContactOfGrid maViewContactOfGridFront;
ViewContactOfHelplines maViewContactOfHelplinesFront;
+protected:
// Create a Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something. Default is to create
// a standard ViewObjectContact containing the given ObjectContact and *this
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 8a5d64108ced..d389e87544a3 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -61,12 +61,12 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
bool mbStayAssignedToListLevelOfOutlineStyle;
-protected:
-
bool mbAssignedToOutlineStyle;
SwTextFormatColl *mpNextTextFormatColl;
+protected:
+
SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
SwTextFormatColl* pDerFrom = nullptr,
sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index bcc93b107e77..2fe348cffce0 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -129,7 +129,6 @@ class Meta
, public SwModify
, public sw::BroadcasterMixin
{
-protected:
friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode
friend class ::SwXMeta; ///< GetTextNode, GetTextAttr, Get/SetXMeta
@@ -139,6 +138,8 @@ protected:
SwFormatMeta * m_pFormat;
SwTextNode * m_pTextNode;
+protected:
+
SwTextMeta * GetTextAttr() const;
SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo)
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 984747dcf368..ca5f211e28cb 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -168,8 +168,8 @@ public:
For this we need the current outputdevice */
class SwRefMarkFieldUpdate : public SwMsgPoolItem
{
-public:
VclPtr<OutputDevice> pOut; ///< pointer to the current output device
+public:
/** Is sent if reference marks should be updated.
To get the page/chapter number, the frame has to be asked. For that we need
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index d2bec092e54b..05f70f2d2aa6 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -142,7 +142,6 @@ class SW_DLLPUBLIC SwViewOption
static Color s_aHeaderFooterMarkColor;
static ViewOptFlags s_nAppearanceFlags;
-protected:
static sal_uInt16 s_nPixelTwips;// 1 Pixel == ? Twips
OUString m_sSymbolFont; // Symbolfont.
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 5fd4766002c1..35848003758e 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -88,6 +88,9 @@ class SwAccessibleParagraph :
std::unique_ptr<SwParaChangeTrackingInfo> mpParaChangeTrackInfo; // #i108125#
+ // XAccessibleComponent
+ bool m_bLastHasSelection;
+
/// get the (accessible) text string (requires frame; check before)
OUString const & GetString();
@@ -368,8 +371,6 @@ public:
// XAccessibleExtendedAttributes
virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
sal_Int32 GetRealHeadingLevel();
- // XAccessibleComponent
- bool m_bLastHasSelection;
// #i89175#
// XAccessibleMultiLineText
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 76516edbc40b..9888b1632dc4 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -53,7 +53,7 @@ class DropDownFormFieldDialog;
}
#define DECL_ABSTDLG_BASE(Class,DialogClass) \
-protected: \
+private: \
ScopedVclPtr<DialogClass> pDlg; \
public: \
explicit Class( DialogClass* p) \
@@ -75,7 +75,6 @@ bool Class::StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) \
class SwWordCountFloatDlg;
class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg
{
-protected:
std::shared_ptr<SwWordCountFloatDlg> m_xDlg;
public:
explicit AbstractSwWordCountFloatDlg_Impl(std::unique_ptr<SwWordCountFloatDlg> p)
@@ -104,7 +103,6 @@ class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
class SwAbstractSfxController_Impl : public SfxAbstractDialog
{
-protected:
std::unique_ptr<SfxSingleTabDialogController> m_xDlg;
public:
explicit SwAbstractSfxController_Impl(std::unique_ptr<SfxSingleTabDialogController> p)
@@ -118,7 +116,6 @@ public:
class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
{
-protected:
std::unique_ptr<SwAsciiFilterDlg> m_xDlg;
public:
explicit AbstractSwAsciiFilterDlg_Impl(std::unique_ptr<SwAsciiFilterDlg> p)
@@ -136,7 +133,6 @@ class VclAbstractDialog_Impl : public VclAbstractDialog
class AbstractGenericDialog_Impl : public VclAbstractDialog
{
-protected:
std::shared_ptr<weld::GenericDialogController> m_xDlg;
public:
explicit AbstractGenericDialog_Impl(std::unique_ptr<weld::GenericDialogController> p)
@@ -149,7 +145,6 @@ public:
class AbstractSwSortDlg_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<SwSortDlg> m_xDlg;
public:
explicit AbstractSwSortDlg_Impl(std::unique_ptr<SwSortDlg> p)
@@ -161,7 +156,6 @@ public:
class AbstractMultiTOXMarkDlg_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<SwMultiTOXMarkDlg> m_xDlg;
public:
explicit AbstractMultiTOXMarkDlg_Impl(std::unique_ptr<SwMultiTOXMarkDlg> p)
@@ -173,7 +167,6 @@ public:
class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
{
-protected:
std::unique_ptr<SwBreakDlg> m_xDlg;
public:
explicit AbstractSwBreakDlg_Impl(std::unique_ptr<SwBreakDlg> p)
@@ -188,7 +181,6 @@ public:
class AbstractSwTableWidthDlg_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<SwTableWidthDlg> m_xDlg;
public:
explicit AbstractSwTableWidthDlg_Impl(std::unique_ptr<SwTableWidthDlg> p)
@@ -200,7 +192,6 @@ public:
class AbstractSwTableHeightDlg_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<SwTableHeightDlg> m_xDlg;
public:
explicit AbstractSwTableHeightDlg_Impl(std::unique_ptr<SwTableHeightDlg> p)
@@ -212,7 +203,6 @@ public:
class AbstractSwMergeTableDlg_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<SwMergeTableDlg> m_xDlg;
public:
explicit AbstractSwMergeTableDlg_Impl(std::unique_ptr<SwMergeTableDlg> p)
@@ -224,7 +214,6 @@ public:
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
{
-protected:
std::unique_ptr<SwSplitTableDlg> m_xDlg;
public:
explicit AbstractSplitTableDialog_Impl(std::unique_ptr<SwSplitTableDlg> p)
@@ -269,7 +258,6 @@ private:
class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
{
-protected:
std::unique_ptr<SwConvertTableDlg> m_xDlg;
public:
explicit AbstractSwConvertTableDlg_Impl(std::unique_ptr<SwConvertTableDlg> p)
@@ -292,7 +280,6 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
{
-protected:
std::unique_ptr<sw::DropDownFieldDialog> m_xDlg;
public:
explicit AbstractDropDownFieldDialog_Impl(std::unique_ptr<sw::DropDownFieldDialog> p)
@@ -306,7 +293,6 @@ public:
class AbstractDropDownFormFieldDialog_Impl : public VclAbstractDialog
{
-protected:
std::unique_ptr<sw::DropDownFormFieldDialog> m_xDlg;
public:
explicit AbstractDropDownFormFieldDialog_Impl(std::unique_ptr<sw::DropDownFormFieldDialog> p)
@@ -318,7 +304,6 @@ public:
class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
-protected:
std::unique_ptr<SwLabDlg> m_xDlg;
public:
explicit AbstractSwLabDlg_Impl(std::unique_ptr<SwLabDlg> p)
@@ -338,7 +323,6 @@ public:
class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
{
-protected:
std::unique_ptr<SwSelGlossaryDlg> m_xDlg;
public:
explicit AbstractSwSelGlossaryDlg_Impl(std::unique_ptr<SwSelGlossaryDlg> p)
@@ -353,7 +337,6 @@ public:
class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
{
-protected:
std::unique_ptr<SwAutoFormatDlg, o3tl::default_delete<SwAutoFormatDlg>> m_xDlg;
public:
explicit AbstractSwAutoFormatDlg_Impl(std::unique_ptr<SwAutoFormatDlg, o3tl::default_delete<SwAutoFormatDlg>> p)
@@ -383,7 +366,6 @@ class AbstractSwFieldDlg_Impl : public AbstractSwFieldDlg
class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
{
-protected:
std::unique_ptr<SwRenameXNamedDlg> m_xDlg;
public:
explicit AbstractSwRenameXNamedDlg_Impl(std::unique_ptr<SwRenameXNamedDlg> p)
@@ -414,7 +396,6 @@ class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
class SwFieldInputDlg;
class AbstractFieldInputDlg_Impl : public AbstractFieldInputDlg
{
-protected:
std::unique_ptr<SwFieldInputDlg> m_xDlg;
public:
explicit AbstractFieldInputDlg_Impl(std::unique_ptr<SwFieldInputDlg> p)
@@ -430,7 +411,6 @@ public:
class SwInsFootNoteDlg;
class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
{
-protected:
std::unique_ptr<SwInsFootNoteDlg> m_xDlg;
public:
explicit AbstractInsFootNoteDlg_Impl(std::unique_ptr<SwInsFootNoteDlg> p)
@@ -449,7 +429,6 @@ public:
class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
{
-protected:
std::unique_ptr<SwInsTableDlg> m_xDlg;
public:
explicit AbstractInsTableDlg_Impl(std::unique_ptr<SwInsTableDlg> p)
@@ -465,7 +444,6 @@ public:
class SwJavaEditDialog;
class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
{
-protected:
std::unique_ptr<SwJavaEditDialog> m_xDlg;
public:
explicit AbstractJavaEditDialog_Impl(std::unique_ptr<SwJavaEditDialog> p)
@@ -497,7 +475,6 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
class SwMailMergeCreateFromDlg;
class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
{
-protected:
std::unique_ptr<SwMailMergeCreateFromDlg> m_xDlg;
public:
explicit AbstractMailMergeCreateFromDlg_Impl(std::unique_ptr<SwMailMergeCreateFromDlg> p)
@@ -511,7 +488,6 @@ public:
class SwMailMergeFieldConnectionsDlg;
class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
{
-protected:
std::unique_ptr<SwMailMergeFieldConnectionsDlg> m_xDlg;
public:
explicit AbstractMailMergeFieldConnectionsDlg_Impl(std::unique_ptr<SwMailMergeFieldConnectionsDlg> p)
@@ -549,7 +525,6 @@ class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialo
class SwIndexMarkFloatDlg;
class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
-protected:
std::shared_ptr<SwIndexMarkFloatDlg> m_xDlg;
public:
explicit AbstractIndexMarkFloatDlg_Impl(std::unique_ptr<SwIndexMarkFloatDlg> p)
@@ -564,7 +539,6 @@ public:
class SwAuthMarkFloatDlg;
class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
-protected:
std::shared_ptr<SwAuthMarkFloatDlg> m_xDlg;
public:
explicit AbstractAuthMarkFloatDlg_Impl(std::unique_ptr<SwAuthMarkFloatDlg> p)
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 0d8b58e7142c..a7706144080c 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -24,8 +24,8 @@ class AbstractSwFieldDlg;
class SwFieldDlgWrapper : public SwChildWinWrapper
{
-public:
ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface;
+public:
SwFieldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
@@ -38,8 +38,8 @@ public:
// field dialog only showing database page to support mail merge
class SwFieldDataOnlyDlgWrapper : public SwChildWinWrapper
{
-public:
ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface;
+public:
SwFieldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 458524566195..88dcf57ee9be 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -344,7 +344,6 @@ class ContentResultSetWrapperListener
, public css::beans::XPropertyChangeListener
, public css::beans::XVetoableChangeListener
{
-protected:
ContentResultSetWrapper* m_pOwner;
public:
diff --git a/unoxml/inc/uievent.hxx b/unoxml/inc/uievent.hxx
index 7f7d4397a218..fc599a2e5428 100644
--- a/unoxml/inc/uievent.hxx
+++ b/unoxml/inc/uievent.hxx
@@ -37,7 +37,6 @@ typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XUIEvent >
class CUIEvent
: public CUIEvent_Base
{
-protected:
sal_Int32 m_detail;
css::uno::Reference< css::xml::dom::views::XAbstractView > m_view;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 7653f54e5b79..0cbf9e607500 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -53,14 +53,14 @@ public:
WrapHandler( );
virtual ~WrapHandler( ) override;
- sal_Int32 m_nType;
- sal_Int32 m_nSide;
-
css::text::WrapTextMode getWrapMode( );
private:
virtual void lcl_attribute( Id aName, Value& rVal ) override;
virtual void lcl_sprm( Sprm& rSprm ) override;
+
+ sal_Int32 m_nType;
+ sal_Int32 m_nSide;
};
/// Keeps track of the next available unique automatic name.
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 4c3db9dd99c5..dbafadbe5615 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -33,7 +33,6 @@
class SdXML3DObjectContext : public SdXMLShapeContext
{
-protected:
// the shape group this object should be created inside
css::drawing::HomogenMatrix mxHomMat;
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index e6fc367ca29f..ebccb725fae5 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -596,7 +596,6 @@ namespace xmloff
template <class BASE>
class OColumnImport : public BASE
{
- protected:
css::uno::Reference< css::form::XGridColumnFactory >
m_xColumnFactory;
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index 3cb8012058b2..f696e81a924a 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -49,7 +49,6 @@ namespace xmloff
//= ODefaultEventAttacherManager
class ODefaultEventAttacherManager : public IEventAttacherManager
{
- protected:
typedef std::map<
css::uno::Reference< css::beans::XPropertySet >,
css::uno::Sequence< css::script::ScriptEventDescriptor >,
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 2620bc6cbea9..d5570a525b67 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -221,7 +221,6 @@ private:
*/
bool m_bVerifyCurrentSignature;
-public:
/*
* An xUriBinding is provided to map Uris to XInputStream interfaces.
*/
More information about the Libreoffice-commits
mailing list