[Libreoffice] Broken Compile in oox/source/drawingml

I just did a new pull and build and came up with the following error:

/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx: In static member 
function 'static const com::sun::star::uno::Type& cppu::UnoType< <template-parameter-1-1> >::get() 
[with T = int]':
/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:291:   instantiated 
from 'const com::sun::star::uno::Type& cppu::getTypeFavourUnsigned(const T*) [with T = int]'
/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/com/sun/star/uno/Any.hxx:57:   
instantiated from 'com::sun::star::uno::Any::Any(const T&) [with T = int]'
../../inc/oox/helper/propertyset.hxx:163:   instantiated from 'void 
oox::PropertySet::setProperty(sal_Int32, const Type&) [with Type = int]'
/Users/jpowers27/build/clone/filters/oox/source/drawingml/textparagraphproperties.cxx:432:   
instantiated from here
/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:270: error: call of 
overloaded 'cppu_detail_getUnoType(int*)' is ambiguous
/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:157: note: candidates 
are: const com::sun::star::uno::Type& cppu::detail::cppu_detail_getUnoType(const sal_Int32*) <near 
match>
/Users/jpowers27/build/rawbuild/solver/330/unxmacxi.pro/inc/cppu/unotype.hxx:162: note:             
    const com::sun::star::uno::Type& cppu::detail::cppu_detail_getUnoType(const sal_uInt32*) <near 
match>
dmake:  Error code 1, while making '../../unxmacxi.pro/slo/textparagraphproperties.obj'
cat ../../unxmacxi.pro/misc/checkidl.txt

Entering /Users/jpowers27/build/rawbuild/odk/util

/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx: In member function 'void 
sd::DrawViewShell::GetMenuStateSel(SfxItemSet&)':
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:293: warning: unused variable 
'bSet'
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:295: error: 'bSet' was not 
declared in this scope
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx: At global scope:
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:307: error: expected 
unqualified-id before 'else'
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:479: error: expected 
unqualified-id before 'else'
/Users/jpowers27/build/clone/impress/sd/source/ui/view/drviewsj.cxx:530: error: expected 
declaration before '}' token
dmake:  Error code 1, while making '../../../unxmacxi.pro/slo/drviewsj.obj'
cd ../unxmacxi.pro/bin/odkcommon && zip -urq ../odkcommon.zip . || ret=$?; if [[ "$ret" != "12" && 
"$ret" != "1" ]] ; then exit $ret ; fi && echo "Nothing to update for zip"
/usr/bin/perl -w /Users/jpowers27/build/rawbuild/solenv/bin/cleanzip.pl 
../unxmacxi.pro/bin/odkcommon.zip
odk deliver
Module 'odk' delivered successfully. 1 files copied, 3 files unchanged

-----------------------------------------------------------------------
        Oh dear - something failed during the build - sorry !
  For more help with debugging build errors, please see the section in:
            http://wiki.documentfoundation.org/Development

  internal build errors:

ERROR: error 65280 occurred while making /Users/jpowers27/build/rawbuild/oox/source/drawingml
ERROR: error 65280 occurred while making /Users/jpowers27/build/rawbuild/sd/source/ui/view

It's a little past my bed time; so I'm hoping someone else will fix this before I get up tomorrow :)

Joe P.