summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-04-19 11:42:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-04-30 10:09:39 +0000
commit74b45188b71a9fe22bb8997e3a23cc9a4b43d3c8 (patch)
tree7a8780d7bca0fea56a2e5223a2c5be7a5875ad8e
parent90f3269f1fbbb0ccc65f5ee40ceda671d7061473 (diff)
fdo#72006 Populate "Load URL" dropdown from picklist.
f7feb4227d83f4f095597a44826277aaae2bc0df stopped any newly opened documents from being added to the "History" list (and instead adds them to the picklist), since the history list is not used anywhere else, and since the picklist performs an equivalent function, it makes most sense just to use the picklist to populate the list of URLs. Change-Id: I5a06e7fefe3dc1fbe266f3191de4fbac03601858 Reviewed-on: https://gerrit.libreoffice.org/9104 Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com> Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com> (cherry picked from commit b8315b1c2f43ab44651e5089a63fb63e23a1ea73) Reviewed-on: https://gerrit.libreoffice.org/9172 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/inet/inettbc.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 2f56911d4de5..297b4d20c913 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -219,7 +219,7 @@ void SfxURLToolBoxControl_Impl::StateChanged
SvtURLBox* pURLBox = GetURLBox();
pURLBox->Clear();
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > lList = SvtHistoryOptions().GetList(eHISTORY);
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > lList = SvtHistoryOptions().GetList(ePICKLIST);
for (sal_Int32 i=0; i<lList.getLength(); ++i)
{
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lProps = lList[i];
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4cbe2a68395e..d526e775da5c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -153,7 +153,7 @@ SvtMatchContext_Impl::~SvtMatchContext_Impl()
void SvtMatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList)
{
// Einlesung der Historypickliste
- Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( eHISTORY );
+ Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
sal_uInt32 nCount = seqPicklist.getLength();
for( sal_uInt32 nItem=0; nItem < nCount; nItem++ )
@@ -948,7 +948,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
if ( !bHistoryDisabled )
{
// read history pick list
- Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( eHISTORY );
+ Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
sal_uInt32 nCount = seqPicklist.getLength();
INetURLObject aCurObj;