[Libreoffice-commits] core.git: 2 commits - cui/source unotools/source

[Tor Lillqvist]

 cui/source/inc/cuioptgenrl.hxx         |    4 ++--
 cui/source/options/optgenrl.cxx        |    8 ++++----
 unotools/source/config/useroptions.cxx |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 95212d11fc82bba60f0b51256010725504dd41ce
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 23 14:49:44 2016 +0300

    Rename two functions that had misleading names
    
    GetAddress_Impl() and SetAddress_Impl() handled more than just
    addresses. So somewhat boringly, s/Address/Data.
    
    Change-Id: I56c4e5ff7a4983a7fbb04d056c64333a016164c5

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 41c9c32..0b93ebd 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -52,8 +52,8 @@ private:
 
     DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void );
 
-    bool                GetAddress_Impl();
-    void                SetAddress_Impl();
+    bool                GetData_Impl();
+    void                SetData_Impl();
 
     void InitControls ();
     void SetLinks ();
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c6c59f7..33b7624 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -300,7 +300,7 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
         vFields[i]->pEdit->SetText(comphelper::string::strip(vFields[i]->pEdit->GetText(), ' '));
 
     bool bModified = false;
-    bModified |= GetAddress_Impl();
+    bModified |= GetData_Impl();
     SvtSaveOptions aSaveOpt;
     if ( m_pUseDataCB->IsChecked() != aSaveOpt.IsUseUserData() )
     {
@@ -312,7 +312,7 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
 
 void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
 {
-    SetAddress_Impl();
+    SetData_Impl();
 
     sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS);
 
@@ -369,7 +369,7 @@ IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void )
 }
 
 
-bool SvxGeneralTabPage::GetAddress_Impl()
+bool SvxGeneralTabPage::GetData_Impl()
 {
     // updating
     SvtUserOptions aUserOpt;
@@ -387,7 +387,7 @@ bool SvxGeneralTabPage::GetAddress_Impl()
 }
 
 
-void SvxGeneralTabPage::SetAddress_Impl()
+void SvxGeneralTabPage::SetData_Impl()
 {
     // updating and disabling edit boxes
     SvtUserOptions aUserOpt;
commit af348f508405cf34f3dc3043c2e1bc9bf38800f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 23 14:49:13 2016 +0300

    Update comment now that we use an enum class
    
    Change-Id: I2daefa5a0e63d9a571ee90a9b8be5e58fa2315a1

diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index e860151..292c000 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -47,7 +47,7 @@ using namespace utl;
 using namespace com::sun::star;
 
 // vOptionNames[] -- names of the user option entries
-// The order corresponds to the #define USER_OPT_* list in useroptions.hxx.
+// The order must correspond to the enum class UserOptToken in useroptions.hxx.
 static o3tl::enumarray<UserOptToken, char const *> vOptionNames = {
     "l",                         // UserOptToken::City
     "o",                         // UserOptToken::Company