[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Mar 4 12:36:57 PST 2011


 sc/source/ui/dbgui/pvfundlg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 467a931a1e0b70fcbd56efa7eb9cf837baa0190f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 4 20:29:03 2011 +0000

    Workaround dodgy compiler problem.
    
    Bad parse from gcc-4.6.0 of...
    pvfundlg.cxx: In function 'bool lclFillListBox(ListBoxType&, const com::sun::star::uno::Sequence<rtl::OUString>&, USHORT) [with ListBoxType = ListBox, USHORT = short unsigned int]':
    pvfundlg.cxx:699:60:   instantiated from here
    pvfundlg.cxx:74:55: error: invalid use of 'com::sun::star::uno::Sequence< <template-parameter-1-1> >::getConstArray [with E = rtl::OUString]' to form a pointer-to-member-function
    pvfundlg.cxx:74:55: note:   a qualified-id is required
    pvfundlg.cxx:74: confused by earlier errors, bailing out

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index ca4fbaf..dc58119 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -73,7 +73,8 @@ template< typename ListBoxType >
 bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, USHORT nEmptyPos = LISTBOX_APPEND )
 {
     bool bEmpty = false;
-    if( const OUString* pStr = rStrings.getConstArray() )
+    const OUString* pStr = rStrings.getConstArray();
+    if( pStr )
     {
         for( const OUString* pEnd = pStr + rStrings.getLength(); pStr != pEnd; ++pStr )
         {


More information about the Libreoffice-commits mailing list