diff options
| -rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 4 | ||||
| -rw-r--r-- | include/unotools/eventlisteneradapter.hxx | 2 | ||||
| -rw-r--r-- | include/vbahelper/vbadialogbase.hxx | 3 | ||||
| -rw-r--r-- | toolkit/inc/helper/msgbox.hxx | 3 | ||||
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.hxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVSession.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/XTempFile.hxx | 2 |
7 files changed, 5 insertions, 13 deletions
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 677186367a87..bffddf6fd63e 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -437,11 +437,9 @@ public: class SVTXFormattedField : public VCLXSpinField { -protected: rtl::Reference<SvNumberFormatsSupplierObj> m_xCurrentSupplier; bool bIsStandardSupplier; - - sal_Int32 nKeyToSetDelayed; + sal_Int32 nKeyToSetDelayed; public: SVTXFormattedField(); diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 92fbe212c586..f3d9ede9cd45 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -40,11 +40,9 @@ namespace utl { friend class OEventListenerImpl; - private: OEventListenerAdapter( const OEventListenerAdapter& _rSource ) = delete; const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) = delete; - protected: std::unique_ptr<OEventListenerAdapterImpl> m_pImpl; protected: diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index 751429cd4531..e56a27e08282 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -45,9 +45,8 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE; class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE { -protected: sal_Int32 mnIndex; - css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; public: VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel(std::move( xModel )) {} diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx index 9259719ce3a2..7c2b26ee1e89 100644 --- a/toolkit/inc/helper/msgbox.hxx +++ b/toolkit/inc/helper/msgbox.hxx @@ -53,10 +53,9 @@ class MessBox : public ButtonDialog Image maImage; bool mbHelpBtn; MessBoxStyle mnMessBoxStyle; - -protected: OUString maMessText; +protected: void ImplInitButtons(); void ImplPosControls(); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index 8f9c0473f072..c6a363cff796 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -149,7 +149,6 @@ class DynamicResultSetWrapperListener : public cppu::OWeakObject , public css::ucb::XDynamicResultSetListener { -protected: DynamicResultSetWrapper* m_pOwner; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav-curl/DAVSession.hxx b/ucb/source/ucp/webdav-curl/DAVSession.hxx index 6a4b65cdc41c..b73ceb561357 100644 --- a/ucb/source/ucp/webdav-curl/DAVSession.hxx +++ b/ucb/source/ucp/webdav-curl/DAVSession.hxx @@ -177,14 +177,13 @@ public: virtual void abort() = 0; protected: - rtl::Reference< DAVSessionFactory > m_xFactory; - explicit DAVSession( rtl::Reference< DAVSessionFactory > xFactory ) : m_xFactory(std::move( xFactory )), m_nRefCount( 0 ) {} virtual ~DAVSession() {} private: + rtl::Reference< DAVSessionFactory > m_xFactory; DAVSessionFactory::Map::iterator m_aContainerIt; oslInterlockedCount m_nRefCount; diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index b439068d99ac..2b0ec33cb42a 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -48,7 +48,6 @@ typedef ::cppu::WeakImplHelper< css::io::XTempFile class OTempFileService : public OTempFileBase { -protected: std::optional<utl::TempFileNamed> mpTempFile; std::mutex maMutex; SvStream* mpStream; @@ -56,6 +55,7 @@ protected: bool mbInClosed; bool mbOutClosed; +protected: void checkError () const; void checkConnected (); |