diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-22 18:14:51 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-22 18:26:04 +0100 |
| commit | 4ceba05995b9fafdc00896e3253f405299ff1066 (patch) | |
| tree | 366e7c013cb811dcdaa21c1015be7267b8561e01 /oox/inc | |
| parent | ffd2cc342f4ba54feeecbd3d31632131b45886ef (diff) | |
oox: kill no longer needed S() macro
Change-Id: If3f1bb787d6debaa63e3bed3a48e44b5e34c27b7
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/export/drawingml.hxx | 6 | ||||
| -rw-r--r-- | oox/inc/oox/export/utils.hxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index a355ac486e71..486d792b08e1 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -76,7 +76,7 @@ protected: ::sax_fastparser::FSHelperPtr mpFS; ::oox::core::XmlFilterBase* mpFB; - bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String aName ); + bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString aName ); bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState, String aName, ::com::sun::star::beans::PropertyState& eState ); @@ -104,8 +104,8 @@ public: void WriteSolidFill( sal_uInt32 nColor ); void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); - void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String sURLPropName, sal_Int32 nXmlNamespace ); - void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String sURLPropName ); + void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName, sal_Int32 nXmlNamespace ); + void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName ); void WriteOutline( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteStretch(); void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing ); diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx index d39d5f782578..f43faca01b3a 100644 --- a/oox/inc/oox/export/utils.hxx +++ b/oox/inc/oox/export/utils.hxx @@ -20,7 +20,6 @@ #ifndef _OOX_EXPORT_UTILS_HXX_ #define _OOX_EXPORT_UTILS_HXX_ -#define S(x) String( RTL_CONSTASCII_USTRINGPARAM( x ) ) #define US(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x )) #define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr() #define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr() |