diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:16:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:18:05 +0200 |
| commit | 9de42b46104c268d1b391017b891e2150e7f47dd (patch) | |
| tree | 60b97c94ffe3b49e2dde7650cc28596243b6cd9e | |
| parent | ca0d0f65c616b3ad56e41812870129e060e8dadc (diff) | |
sw: prefix members of SwXAutoStyles
Change-Id: Ie6c05a9e63c18275eaf01952add9068c2b46d4e7
| -rw-r--r-- | sw/inc/unostyle.hxx | 10 | ||||
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 58d7b64ef7dd..573b9fab3e00 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -326,11 +326,11 @@ class SwXAutoStyles : public cppu::WeakImplHelper< ::com::sun::star::style::XAutoStyles >, public SwUnoCollection { - SwDocShell *pDocShell; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > xAutoCharStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > xAutoRubyStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > xAutoParaStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > xAutoNotxtStyles; + SwDocShell *m_pDocShell; + ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoCharStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoRubyStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoParaStyles; + ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoNotxtStyles; virtual ~SwXAutoStyles(); public: diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index b54054951560..42520586beea 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -4033,7 +4033,7 @@ uno::Reference< container::XNameReplace > SwXFrameStyle::getEvents( ) throw(uno } SwXAutoStyles::SwXAutoStyles(SwDocShell& rDocShell) : - SwUnoCollection(rDocShell.GetDoc()), pDocShell( &rDocShell ) + SwUnoCollection(rDocShell.GetDoc()), m_pDocShell( &rDocShell ) { } @@ -4062,23 +4062,23 @@ uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex) { case IStyleAccess::AUTO_STYLE_CHAR: { - if(!xAutoCharStyles.is()) - xAutoCharStyles = new SwXAutoStyleFamily(pDocShell, nType); - aRef = xAutoCharStyles; + if(!m_xAutoCharStyles.is()) + m_xAutoCharStyles = new SwXAutoStyleFamily(m_pDocShell, nType); + aRef = m_xAutoCharStyles; } break; case IStyleAccess::AUTO_STYLE_RUBY: { - if(!xAutoRubyStyles.is()) - xAutoRubyStyles = new SwXAutoStyleFamily(pDocShell, nType ); - aRef = xAutoRubyStyles; + if(!m_xAutoRubyStyles.is()) + m_xAutoRubyStyles = new SwXAutoStyleFamily(m_pDocShell, nType ); + aRef = m_xAutoRubyStyles; } break; case IStyleAccess::AUTO_STYLE_PARA: { - if(!xAutoParaStyles.is()) - xAutoParaStyles = new SwXAutoStyleFamily(pDocShell, nType ); - aRef = xAutoParaStyles; + if(!m_xAutoParaStyles.is()) + m_xAutoParaStyles = new SwXAutoStyleFamily(m_pDocShell, nType ); + aRef = m_xAutoParaStyles; } break; |