summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-04-19 11:42:47 +0100
committerAndras Timar <andras.timar@collabora.com>2014-04-30 14:57:05 +0200
commitdc9ad09707468f4ca2067e4549053e3e4f331dee (patch)
tree4d9a97071a5e9ba3e784245d70c2a83a7ac0d8be /svtools
parentb5f89e04c3fcdd4217f962e8d3644e8235591264 (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>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/inettbc.cxx4
1 files changed, 2 insertions, 2 deletions
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;