[Libreoffice-commits] core.git: sw/inc sw/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Jan 15 13:07:39 UTC 2018


 sw/inc/breakit.hxx                |    4 ++--
 sw/inc/docufld.hxx                |    6 +++---
 sw/source/core/bastyp/breakit.cxx |    4 ++--
 sw/source/core/fields/docufld.cxx |   24 ++++++++++++------------
 4 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit d54824438b29e433e6178a822e9207dfe28ef9af
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 15 09:09:35 2018 +0100

    sw: prefix members of SwAuthorField, SwBreakIt and SwCombinedCharField
    
    Change-Id: Ic277b91a75602b0997ff68feb46a9cad9dae4e46
    Reviewed-on: https://gerrit.libreoffice.org/47891
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 4b0017a79a13..2dc5af732927 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwBreakIt
     std::unique_ptr<LanguageTag> m_xLanguageTag;   ///< language tag of the current locale
     std::unique_ptr<css::i18n::ForbiddenCharacters> m_xForbidden;
 
-    LanguageType aForbiddenLang; ///< language of the current forbiddenChar struct
+    LanguageType m_aForbiddenLang; ///< language of the current forbiddenChar struct
 
     void GetLocale_( const LanguageType aLang );
     void GetLocale_( const LanguageTag& rLanguageTag );
@@ -103,7 +103,7 @@ public:
 
     const css::i18n::ForbiddenCharacters& GetForbidden( const LanguageType aLang )
     {
-        if (!m_xForbidden || aForbiddenLang != aLang)
+        if (!m_xForbidden || m_aForbiddenLang != aLang)
             GetForbidden_( aLang );
         return *m_xForbidden;
     }
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 1ab24e66a326..2295ce77fc2a 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -181,7 +181,7 @@ public:
 
 class SwAuthorField : public SwField
 {
-    OUString aContent;
+    OUString m_aContent;
 
 public:
     SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat);
@@ -189,7 +189,7 @@ public:
     virtual OUString    Expand() const override;
     virtual SwField*    Copy() const override;
 
-    void         SetExpansion(const OUString& rStr) { aContent = rStr; }
+    void         SetExpansion(const OUString& rStr) { m_aContent = rStr; }
 
     virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
     virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
@@ -718,7 +718,7 @@ public:
 
 class SW_DLLPUBLIC SwCombinedCharField : public SwField
 {
-    OUString sCharacters;    ///< combine these characters
+    OUString m_sCharacters;    ///< combine these characters
 
 public:
     SwCombinedCharField( SwCombinedCharFieldType*, const OUString& rChars );
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 5287dd3286fd..75e961e22130 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -54,7 +54,7 @@ SwBreakIt * SwBreakIt::Get()
 SwBreakIt::SwBreakIt( const uno::Reference<uno::XComponentContext> & rxContext )
     : m_xContext(rxContext)
     , m_xBreak(i18n::BreakIterator::create(m_xContext))
-    , aForbiddenLang(LANGUAGE_DONTKNOW)
+    , m_aForbiddenLang(LANGUAGE_DONTKNOW)
 {
 }
 
@@ -78,7 +78,7 @@ void SwBreakIt::GetForbidden_( const LanguageType aLang )
 {
     LocaleDataWrapper aWrap(m_xContext, GetLanguageTag(aLang));
 
-    aForbiddenLang = aLang;
+    m_aForbiddenLang = aLang;
     m_xForbidden.reset(new i18n::ForbiddenCharacters(aWrap.getForbiddenCharacters()));
 }
 
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 2b9158b52a6e..47a7463b298e 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -330,23 +330,23 @@ SwFieldType* SwAuthorFieldType::Copy() const
 SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFormat)
     : SwField(pTyp, nFormat)
 {
-    aContent = SwAuthorFieldType::Expand(GetFormat());
+    m_aContent = SwAuthorFieldType::Expand(GetFormat());
 }
 
 OUString SwAuthorField::Expand() const
 {
     if (!IsFixed())
-        const_cast<SwAuthorField*>(this)->aContent =
+        const_cast<SwAuthorField*>(this)->m_aContent =
                     SwAuthorFieldType::Expand(GetFormat());
 
-    return aContent;
+    return m_aContent;
 }
 
 SwField* SwAuthorField::Copy() const
 {
     SwAuthorField *pTmp = new SwAuthorField( static_cast<SwAuthorFieldType*>(GetTyp()),
                                                 GetFormat());
-    pTmp->SetExpansion(aContent);
+    pTmp->SetExpansion(m_aContent);
     return pTmp;
 }
 
@@ -363,7 +363,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
         break;
 
     case FIELD_PROP_PAR1:
-        rAny <<= aContent;
+        rAny <<= m_aContent;
         break;
 
     default:
@@ -388,7 +388,7 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         break;
 
     case FIELD_PROP_PAR1:
-        rAny >>= aContent;
+        rAny >>= m_aContent;
         break;
 
     default:
@@ -2539,29 +2539,29 @@ SwFieldType* SwCombinedCharFieldType::Copy() const
 SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp,
                                             const OUString& rChars )
     : SwField( pFTyp, 0 ),
-    sCharacters( rChars.copy( 0, std::min<sal_Int32>(rChars.getLength(), MAX_COMBINED_CHARACTERS) ))
+    m_sCharacters( rChars.copy( 0, std::min<sal_Int32>(rChars.getLength(), MAX_COMBINED_CHARACTERS) ))
 {
 }
 
 OUString SwCombinedCharField::Expand() const
 {
-    return sCharacters;
+    return m_sCharacters;
 }
 
 SwField* SwCombinedCharField::Copy() const
 {
     return new SwCombinedCharField( static_cast<SwCombinedCharFieldType*>(GetTyp()),
-                                        sCharacters );
+                                        m_sCharacters );
 }
 
 OUString SwCombinedCharField::GetPar1() const
 {
-    return sCharacters;
+    return m_sCharacters;
 }
 
 void SwCombinedCharField::SetPar1(const OUString& rStr)
 {
-    sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS));
+    m_sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS));
 }
 
 bool SwCombinedCharField::QueryValue( uno::Any& rAny,
@@ -2570,7 +2570,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny,
     switch( nWhichId )
     {
     case FIELD_PROP_PAR1:
-        rAny <<= sCharacters;
+        rAny <<= m_sCharacters;
         break;
     default:
         assert(false);


More information about the Libreoffice-commits mailing list