diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-04-19 11:42:47 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-04-26 07:42:37 +0000 |
| commit | b8315b1c2f43ab44651e5089a63fb63e23a1ea73 (patch) | |
| tree | ea48f9c9a394f3a66767267edb14b72a06777f23 | |
| parent | 3dc6808532d86c4b00a6cb81e0adb74878c13fdd (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>
| -rw-r--r-- | sfx2/source/inet/inettbc.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index e98f028dbb14..9e4191ff8feb 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 a8604b330b86..809029bd51ae 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -152,7 +152,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; |