diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/resmgr.hxx | 4 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 2 | ||||
| -rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 6d98f4997e3a..5c464ae05c9a 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -73,11 +73,9 @@ struct ImpRCStack RCFlags Flags; ///< resource status void * aResHandle; ///< Resource-Identifier from InternalResMgr const Resource* pResObj; ///< pointer to Resource object - sal_uInt32 nId; ///< ResId used for error message - ResMgr* pResMgr; ///< ResMgr for Resource pResObj void Clear(); - void Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId ); + void Init( const Resource * pObj, sal_uInt32 nId ); }; class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResMgr diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 4b7765dc09d0..b47d150aca29 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -574,7 +574,9 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream private: StreamData* pInstanceData; OUString aFilename; +#if defined(_WIN32) sal_uInt16 nLockCounter; +#endif bool bIsOpen; SvFileStream (const SvFileStream&) = delete; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 07cd1ad629a8..7c2a5f565cad 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -316,7 +316,6 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication : OUString m_aAccount; css::ucb::RememberAuthentication m_eRememberPasswordMode; css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode; - css::ucb::RememberAuthentication m_eRememberAccountMode; css::ucb::RememberAuthentication m_eDefaultRememberAccountMode; bool m_bCanSetRealm : 1; bool m_bCanSetUserName : 1; @@ -481,7 +480,6 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( m_aRememberAccountModes( rRememberAccountModes ), m_eRememberPasswordMode( eDefaultRememberPasswordMode ), m_eDefaultRememberPasswordMode( eDefaultRememberPasswordMode ), - m_eRememberAccountMode( eDefaultRememberAccountMode ), m_eDefaultRememberAccountMode( eDefaultRememberAccountMode ), m_bCanSetRealm( bCanSetRealm ), m_bCanSetUserName( bCanSetUserName ), |