diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 01:33:54 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 01:33:54 -0600 |
| commit | cef1ab56b2e955f48bf016e77e7129fab6c85f33 (patch) | |
| tree | 2c0d116a6341f0e89f35dfff47254209552fc663 /filter/source/msfilter/eschesdo.hxx | |
| parent | fix mis-merge in binfilter (diff) | |
| download | core-cef1ab56b2e955f48bf016e77e7129fab6c85f33.tar.gz core-cef1ab56b2e955f48bf016e77e7129fab6c85f33.zip | |
fix mis-merge (mostly tools type remnants)
Diffstat (limited to 'filter/source/msfilter/eschesdo.hxx')
| -rw-r--r-- | filter/source/msfilter/eschesdo.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 7bac341dad91..192a249d0d86 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -62,11 +62,11 @@ public: ~ImplEESdrObject(); sal_Bool ImplGetPropertyValue( const sal_Unicode* pString ); - BOOL ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } + sal_Bool ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 ) { return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; } - INT32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, UINT32 nDef = 0 ) + sal_Int32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, sal_uInt32 nDef = 0 ) { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); } const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; } |