mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix previous commit

Browse Source 
Change-Id: Iebd7674cc8afb547821878dd1565b0f300d22f1f
This commit is contained in:
Julien Nabet
2014-05-11 11:34:09 +02:00
parent df521e3d96
commit 68e7692d2a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cppuhelper/test/testpropshlp.cxx
View File

@@ -56,7 +56,7 @@ static Property * getPropertyTable1()
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString
Property( OUString("b"), 1, getCppuCharType( ) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char
Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get()0) ,
Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32
Property( OUString("d"), 5, getCppuType( (double*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double
@@ -89,7 +89,7 @@ static Property * getPropertyTable2()
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString
Property( OUString("d"), 5, getCppuType( (double*)0) ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double
Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get()0),
Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32
Property( OUString("e"), 7, getCppuBooleanType() ,
PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool
@@ -411,8 +411,8 @@ Property * getBasicProps()
Property( OUString("BOOL") , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ),
Property( OUString("INT16") , PROPERTY_INT16,
getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
Property( OUString("INT32") , PROPERTY_INT32, cppu::UnoType<sal_Int32>::get()0 ), PropertyAttribute::BOUND ),
Property( OUString("TEST") , 55 , cppu::UnoType<sal_Int32>::get()0), PropertyAttribute::BOUND )
Property( OUString("INT32") , PROPERTY_INT32, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::BOUND ),
Property( OUString("TEST") , 55 , cppu::UnoType<sal_Int32>::get(), PropertyAttribute::BOUND )
};
pTable = aBasicProps;
}

2
sd/source/filter/xml/sdxmlwrp.cxx
View File

@@ -444,7 +444,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
{ OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
::getCppuType( (Reference<XInterface> *)0 ),