diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-23 15:25:26 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-23 15:25:26 +0200 |
| commit | b6f723660177e50250058159e96436a25bb925dc (patch) | |
| tree | 0b4ebb7a82c0b936e5594aa1a30db6b75fc5ebfd /oox/inc | |
| parent | a41acbe3896fef5cb07e10611144ae7af3f59874 (diff) | |
oox builds again after the m106 merge.
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/helper/propertyset.hxx | 3 | ||||
| -rw-r--r-- | oox/inc/oox/xls/richstring.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx index 421908d0e790..fd0c1a7a1fcd 100644 --- a/oox/inc/oox/helper/propertyset.hxx +++ b/oox/inc/oox/helper/propertyset.hxx @@ -101,7 +101,8 @@ public: /** Gets the specified boolean property from the property set. @return true = property contains true; false = property contains false or error occurred. */ - bool getBoolProperty( sal_Int32 nPropId ) const; + inline bool getBoolProperty( sal_Int32 nPropId ) const + { bool bValue = false; return getProperty( bValue, nPropId ) && bValue; } /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. @param orValues (out-parameter) The related property values. diff --git a/oox/inc/oox/xls/richstring.hxx b/oox/inc/oox/xls/richstring.hxx index fcddfd2ab688..cf20fba8c7d5 100644 --- a/oox/inc/oox/xls/richstring.hxx +++ b/oox/inc/oox/xls/richstring.hxx @@ -81,7 +81,7 @@ public: void writeFontProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, - sal_Int32 nXfId ) const; + const Font* pFont ) const; private: ::rtl::OUString maText; /// Portion text. |