Kaydet (Commit) f4a68370 authored tarafından Andrzej Hunt's avatar Andrzej Hunt

Clean up remains of URL History List (eHISTORY).

f7feb422 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/9105Tested-by: 's avatarAndrzej Hunt <andrzej.hunt@collabora.com>
Reviewed-by: 's avatarAndrzej Hunt <andrzej.hunt@collabora.com>
üst b8315b1c
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
enum EHistoryType enum EHistoryType
{ {
ePICKLIST = 0, ePICKLIST = 0,
eHISTORY = 1, eHELPBOOKMARKS = 1
eHELPBOOKMARKS = 2
}; };
/*-************************************************************************************************************ /*-************************************************************************************************************
......
...@@ -54,10 +54,8 @@ namespace { ...@@ -54,10 +54,8 @@ namespace {
const char s_sCommonHistory[] = "org.openoffice.Office.Common/History"; const char s_sCommonHistory[] = "org.openoffice.Office.Common/History";
const char s_sHistories[] = "org.openoffice.Office.Histories/Histories"; const char s_sHistories[] = "org.openoffice.Office.Histories/Histories";
const char s_sPickListSize[] = "PickListSize"; const char s_sPickListSize[] = "PickListSize";
const char s_sURLHistorySize[] = "Size";
const char s_sHelpBookmarksSize[] = "HelpBookmarkSize"; const char s_sHelpBookmarksSize[] = "HelpBookmarkSize";
const char s_sPickList[] = "PickList"; const char s_sPickList[] = "PickList";
const char s_sURLHistory[] = "URLHistory";
const char s_sHelpBookmarks[] = "HelpBookmarks"; const char s_sHelpBookmarks[] = "HelpBookmarks";
const char s_sItemList[] = "ItemList"; const char s_sItemList[] = "ItemList";
const char s_sOrderList[] = "OrderList"; const char s_sOrderList[] = "OrderList";
...@@ -147,10 +145,6 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) ...@@ -147,10 +145,6 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
xListAccess->getPropertyValue(OUString(s_sPickListSize)) >>= nSize; xListAccess->getPropertyValue(OUString(s_sPickListSize)) >>= nSize;
break; break;
case eHISTORY:
xListAccess->getPropertyValue(OUString(s_sURLHistorySize)) >>= nSize;
break;
case eHELPBOOKMARKS: case eHELPBOOKMARKS:
xListAccess->getPropertyValue(OUString(s_sHelpBookmarksSize)) >>= nSize; xListAccess->getPropertyValue(OUString(s_sHelpBookmarksSize)) >>= nSize;
break; break;
...@@ -182,10 +176,6 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt ...@@ -182,10 +176,6 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
m_xCfg->getByName(OUString(s_sPickList)) >>= xList; m_xCfg->getByName(OUString(s_sPickList)) >>= xList;
break; break;
case eHISTORY:
m_xCfg->getByName(OUString(s_sURLHistory)) >>= xList;
break;
case eHELPBOOKMARKS: case eHELPBOOKMARKS:
m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xList; m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xList;
break; break;
...@@ -243,12 +233,6 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) ...@@ -243,12 +233,6 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
break; break;
} }
case eHISTORY:
{
m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
break;
}
case eHELPBOOKMARKS: case eHELPBOOKMARKS:
{ {
m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;
...@@ -326,12 +310,6 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT ...@@ -326,12 +310,6 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
break; break;
} }
case eHISTORY:
{
m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
break;
}
case eHELPBOOKMARKS: case eHELPBOOKMARKS:
{ {
m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;
...@@ -415,12 +393,6 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, ...@@ -415,12 +393,6 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
nMaxSize = GetSize(ePICKLIST); nMaxSize = GetSize(ePICKLIST);
} }
break; break;
case eHISTORY:
{
m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess;
nMaxSize = GetSize(eHISTORY);
}
break;
case eHELPBOOKMARKS: case eHELPBOOKMARKS:
{ {
m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment