cui/uiconfig/ui/optlanguagespage.ui | 4 ++-- include/vcl/combobox.hxx | 3 ++- sc/source/ui/app/inputhdl.cxx | 4 ++++ vcl/source/control/combobox.cxx | 8 ++++++++ 4 files changed, 16 insertions(+), 3 deletions(-)
New commits: commit a4f32eec653596483088c6e5aa37de031278d74c Author: Eike Rathke <er...@redhat.com> Date: Thu May 15 12:29:11 2014 +0200 resolved fdo#78718 break the indefinite loop when entering =" ... introduced with the refactoring of 5a14766061f75e88791dc3134c9ec56e198144e2 Change-Id: Ic322c58cad749d136966cee08ca5a06be59897b7 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index ec22405..8b8d051 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -948,6 +948,10 @@ void ScInputHandler::ShowArgumentsTip( const OUString& rParagraph, OUString& rSe break; } } + else + { + break; + } } } commit 848ec62b9ec806c18e0ca7ff2d45f39b4b147c0c Author: Eike Rathke <er...@redhat.com> Date: Wed May 14 20:47:07 2014 +0200 userinterface and currencylb are just ListBox, so GtkComboBoxText ... and not the bells and whistles SvxLanguageBox. Change-Id: Icaeaeead0bd58bc05d2a9af4e9b7265de1647936 diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui index 83129a0..bad3df0 100644 --- a/cui/uiconfig/ui/optlanguagespage.ui +++ b/cui/uiconfig/ui/optlanguagespage.ui @@ -110,7 +110,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxLanguageBox" id="userinterface"> + <object class="GtkComboBoxText" id="userinterface"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> @@ -138,7 +138,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxLanguageBox" id="currencylb"> + <object class="GtkComboBoxText" id="currencylb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> commit 1d1a28290a87e2db9e01535792aa0ed3dcbd27b7 Author: Eike Rathke <er...@redhat.com> Date: Tue May 13 19:19:45 2014 +0200 +sal_Int32 ComboBox::GetEntryPos( const void* pData ) const Change-Id: I9199da366eb70e818e1d85823cd7cf530f70167d diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 85ea06f..3ea2f64 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -138,6 +138,7 @@ public: void Clear(); sal_Int32 GetEntryPos( const OUString& rStr ) const; + sal_Int32 GetEntryPos( const void* pData ) const; Image GetEntryImage( sal_Int32 nPos ) const; OUString GetEntry( sal_Int32 nPos ) const; sal_Int32 GetEntryCount() const; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index cfd2e8e..a5810f2 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -931,6 +931,14 @@ sal_Int32 ComboBox::GetEntryPos( const OUString& rStr ) const return nPos; } +sal_Int32 ComboBox::GetEntryPos( const void* pData ) const +{ + sal_Int32 nPos = mpImplLB->GetEntryList()->FindEntry( pData ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount(); + return nPos; +} + OUString ComboBox::GetEntry( sal_Int32 nPos ) const { const sal_Int32 nMRUCount = mpImplLB->GetEntryList()->GetMRUCount(); commit f9a1e9074729d540d29a9ded2b3303373d3a9011 Author: Eike Rathke <er...@redhat.com> Date: Tue May 13 17:15:09 2014 +0200 interface with COMBOBOX_... instead of LISTBOX_... ... even if it is the same value. Change-Id: I62f81d181f25723cba5ca0fbfb395539385a007a diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 8af4458..85ea06f 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -154,7 +154,7 @@ public: void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); void SetBorderStyle( sal_uInt16 nBorderStyle ); - void SetSeparatorPos( sal_Int32 n = LISTBOX_ENTRY_NOTFOUND ); + void SetSeparatorPos( sal_Int32 n = COMBOBOX_ENTRY_NOTFOUND ); void EnableAutocomplete( bool bEnable, bool bMatchCase = false ); bool IsAutocompleteEnabled() const; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits