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

[Andrzej Hunt]

 include/unotools/historyoptions.hxx       |    3 +--
 unotools/source/config/historyoptions.cxx |   28 ----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

New commits:
commit f4a6837025a293312cbc43b9c527851362f11030
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Sat Apr 19 11:46:59 2014 +0100

    Clean up remains of URL History List (eHISTORY).
    
    f7feb4227d83f4f095597a44826277aaae2bc0df killed the adding of
    documents to this list, which however caused fdo#72006 as the
    "Load URL" control still used this list, which has now been
    fixed to use the Picklist, hence we can completely kill the history
    list.
    
    Change-Id: Ib4c6892aff0bf5d6e32985041a3ac7c416d8d726
    Reviewed-on: https://gerrit.libreoffice.org/9105
    Tested-by: Andrzej Hunt <andrzej.hunt at collabora.com>
    Reviewed-by: Andrzej Hunt <andrzej.hunt at collabora.com>

diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 46571bc..5b980b7 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -45,8 +45,7 @@
 enum EHistoryType
 {
     ePICKLIST       = 0,
-    eHISTORY        = 1,
-    eHELPBOOKMARKS  = 2
+    eHELPBOOKMARKS  = 1
 };
 
 /*-************************************************************************************************************
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 272cc31..e6348e9 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -54,10 +54,8 @@ namespace {
     const char s_sCommonHistory[] = "org.openoffice.Office.Common/History";
     const char s_sHistories[] = "org.openoffice.Office.Histories/Histories";
     const char s_sPickListSize[] = "PickListSize";
-    const char s_sURLHistorySize[] = "Size";
     const char s_sHelpBookmarksSize[] = "HelpBookmarkSize";
     const char s_sPickList[] = "PickList";
-    const char s_sURLHistory[] = "URLHistory";
     const char s_sHelpBookmarks[] = "HelpBookmarks";
     const char s_sItemList[] = "ItemList";
     const char s_sOrderList[] = "OrderList";
@@ -147,10 +145,6 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
             xListAccess->getPropertyValue(OUString(s_sPickListSize)) >>= nSize;
             break;
 
-        case eHISTORY:
-            xListAccess->getPropertyValue(OUString(s_sURLHistorySize)) >>= nSize;
-            break;
-
         case eHELPBOOKMARKS:
             xListAccess->getPropertyValue(OUString(s_sHelpBookmarksSize)) >>= nSize;
             break;
@@ -182,10 +176,6 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
             m_xCfg->getByName(OUString(s_sPickList)) >>= xList;
             break;
 
-        case eHISTORY:
-            m_xCfg->getByName(OUString(s_sURLHistory)) >>= xList;
-            break;
-
         case eHELPBOOKMARKS:
             m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xList;
             break;
@@ -243,12 +233,6 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
                 break;
             }
 
-        case eHISTORY:
-            {
-                m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
-                break;
-            }
-
         case eHELPBOOKMARKS:
             {
                 m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;
@@ -326,12 +310,6 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
                 break;
             }
 
-        case eHISTORY:
-            {
-                m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
-                break;
-            }
-
         case eHELPBOOKMARKS:
             {
                 m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;
@@ -415,12 +393,6 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
             nMaxSize = GetSize(ePICKLIST);
         }
         break;
-    case eHISTORY:
-        {
-            m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
-            nMaxSize = GetSize(eHISTORY);
-        }
-        break;
     case eHELPBOOKMARKS:
         {
             m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;