diff options
-rw-r--r-- | include/unotools/accessiblerelationsethelper.hxx | 6 | ||||
-rw-r--r-- | include/unotools/accessiblestatesethelper.hxx | 6 | ||||
-rw-r--r-- | include/vbahelper/vbacollectionimpl.hxx | 1 | ||||
-rw-r--r-- | include/vbahelper/vbahelper.hxx | 1 | ||||
-rw-r--r-- | include/vbahelper/vbashaperange.hxx | 1 | ||||
-rw-r--r-- | include/vbahelper/vbashapes.hxx | 1 | ||||
-rw-r--r-- | unotools/source/misc/desktopterminationobserver.cxx | 3 | ||||
-rw-r--r-- | unoxml/source/dom/attr.hxx | 3 | ||||
-rw-r--r-- | unoxml/source/dom/cdatasection.hxx | 1 | ||||
-rw-r--r-- | unoxml/source/dom/comment.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/documentfragment.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/documenttype.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/entity.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/entityreference.hxx | 1 | ||||
-rw-r--r-- | unoxml/source/dom/notation.hxx | 1 | ||||
-rw-r--r-- | unoxml/source/dom/processinginstruction.hxx | 1 | ||||
-rw-r--r-- | unoxml/source/events/mouseevent.hxx | 1 | ||||
-rw-r--r-- | unoxml/source/events/mutationevent.hxx | 1 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbalineformat.hxx | 1 |
19 files changed, 5 insertions, 32 deletions
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index d49e1dbb5ac7..bbbefcd2b1ff 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -51,7 +51,7 @@ public: //===== internal ======================================================== AccessibleRelationSetHelper (); AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper); -protected: +private: virtual ~AccessibleRelationSetHelper() override; public: @@ -124,11 +124,9 @@ public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; -protected: +private: /// Mutex guarding this object. ::osl::Mutex maMutex; - -private: /// The implementation of this helper interface. std::unique_ptr<AccessibleRelationSetHelperImpl> mpHelperImpl; }; diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index a9cd22b9e282..4091153df059 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -62,7 +62,7 @@ public: AccessibleStateSetHelper ( const sal_Int64 _nInitialStates ); AccessibleStateSetHelper ( const AccessibleStateSetHelper& rHelper ); -protected: +private: virtual ~AccessibleStateSetHelper() override; public: @@ -135,11 +135,9 @@ public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; -protected: +private: /// Mutex guarding this object. ::osl::Mutex maMutex; - -private: /// The implementation of this helper interface. std::unique_ptr<AccessibleStateSetHelperImpl> mpHelperImpl; }; diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 94afa6daee1a..790e68f86907 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -172,7 +172,6 @@ private: } }; -protected: XNamedVec mXNamedVec; typename XNamedVec::iterator cachePos; public: diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index c007257e64c3..3643874ef5d5 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -176,7 +176,6 @@ public: class VBAHELPER_DLLPUBLIC ShapeHelper { -protected: css::uno::Reference< css::drawing::XShape > xShape; public: /// @throws css::script::BasicErrorException diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index 9a6a798c4cb0..89cde7643125 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -56,7 +56,6 @@ class VBAHELPER_DLLPUBLIC ScVbaShapeRange : public ScVbaShapeRange_BASE private: css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage; css::uno::Reference< css::drawing::XShapes > m_xShapes; -protected: css::uno::Reference< css::frame::XModel > m_xModel; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index e933cc57da59..3c956c10eb37 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -58,7 +58,6 @@ private: css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage; sal_Int32 m_nNewShapeCount; void initBaseCollection(); -protected: css::uno::Reference< css::frame::XModel > m_xModel; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index b84745951e17..1de3530b917f 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -62,11 +62,10 @@ namespace utl public: static void ensureObservation(); - protected: + private: OObserverImpl(); virtual ~OObserverImpl() override; - private: // XTerminateListener virtual void SAL_CALL queryTermination( const EventObject& Event ) override; virtual void SAL_CALL notifyTermination( const EventObject& Event ) override; diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx index cc0f2d94071b..f2091328da72 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -41,14 +41,11 @@ namespace DOM class CAttr : public CAttr_Base { - private: friend class CDocument; - private: xmlAttrPtr m_aAttrPtr; ::std::unique_ptr< stringpair_t > m_pNamespace; - protected: CAttr(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlAttrPtr const pAttr); diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index fdd0a87b2a54..bd7e60cc2e55 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -36,7 +36,6 @@ namespace DOM { friend class CDocument; - protected: CCDATASection(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNodePtr const pNode); diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index 3ce9362606f4..1841e313ce6e 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -34,10 +34,8 @@ namespace DOM class CComment : public CComment_Base { - private: friend class CDocument; - protected: CComment(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNodePtr const pNode); diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 8ed4481484bc..ba82735d36e7 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -34,10 +34,8 @@ namespace DOM class CDocumentFragment : public CDocumentFragment_Base { - private: friend class CDocument; - protected: CDocumentFragment( CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNodePtr const pNode); diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 1987fb8e110d..964bab03804f 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -43,10 +43,8 @@ namespace DOM private: friend class CDocument; - private: xmlDtdPtr m_aDtdPtr; - protected: CDocumentType(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlDtdPtr const pDtd); diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index 51c10ce00005..bed4820bec9b 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -41,10 +41,8 @@ namespace DOM private: friend class CDocument; - private: xmlEntityPtr m_aEntityPtr; - protected: CEntity(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlEntityPtr const pEntity); diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index 711818d7e948..c22390399192 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -39,7 +39,6 @@ namespace DOM private: friend class CDocument; - protected: CEntityReference( CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNodePtr const pNode); diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index 099905acf3ac..58edd720feb5 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -38,7 +38,6 @@ namespace DOM private: friend class CDocument; - protected: CNotation(CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNotationPtr const pNotation); diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index 0920edec47ba..d3233ea5bcaa 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -39,7 +39,6 @@ namespace DOM private: friend class CDocument; - protected: CProcessingInstruction( CDocument const& rDocument, ::osl::Mutex const& rMutex, xmlNodePtr const pNode); diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 2b274713e75d..87ea75a2bb66 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -35,7 +35,6 @@ typedef ::cppu::ImplInheritanceHelper< CUIEvent, css::xml::dom::events::XMouseEv class CMouseEvent : public CMouseEvent_Base { -protected: sal_Int32 m_screenX; sal_Int32 m_screenY; sal_Int32 m_clientX; diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index 413d062e6f9a..c8dfc3aed1a0 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -40,7 +40,6 @@ typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XMutationE class CMutationEvent : public CMutationEvent_Base { -protected: css::uno::Reference< css::xml::dom::XNode > m_relatedNode; OUString m_prevValue; OUString m_newValue; diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index c23e80faeaa1..858fb3e1e99d 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -33,7 +33,6 @@ private: css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; sal_Int32 m_nLineDashStyle; double m_nLineWeight; -protected: virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; static sal_Int32 convertLineStartEndNameToArrowheadStyle( const OUString& sLineName ); |