diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
| commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
| tree | c8b168e8e0619c387d30f206848ec30ca7238a00 /oox | |
| parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) | |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 9 | ||||
| -rw-r--r-- | oox/source/export/chartexport.cxx | 12 | ||||
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index dc76fef505e2..c2eabfe9f7af 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -134,14 +134,6 @@ struct AutoFormatEntry #define AUTOFORMAT_COLOR( first, last, themed_style, color_token ) \ { first, last, themed_style, color_token, XML_TOKEN_INVALID, 0, 100, 0, false } -#define AUTOFORMAT_ACCENTS( first, themed_style ) \ - AUTOFORMAT_COLOR( first, first, themed_style, XML_accent1 ), \ - AUTOFORMAT_COLOR( first + 1, first + 1, themed_style, XML_accent2 ), \ - AUTOFORMAT_COLOR( first + 2, first + 2, themed_style, XML_accent3 ), \ - AUTOFORMAT_COLOR( first + 3, first + 3, themed_style, XML_accent4 ), \ - AUTOFORMAT_COLOR( first + 4, first + 4, themed_style, XML_accent5 ), \ - AUTOFORMAT_COLOR( first + 5, first + 5, themed_style, XML_accent6 ) - #define AUTOFORMAT_COLORMOD( first, last, themed_style, color_token, mod_token, mod_value ) \ { first, last, themed_style, color_token, mod_token, mod_value, 100, 0, false } @@ -401,7 +393,6 @@ static const AutoFormatEntry spUpDownBarEffects[] = }; #undef AUTOFORMAT_COLOR -#undef AUTOFORMAT_ACCENTS #undef AUTOFORMAT_COLORMOD #undef AUTOFORMAT_ACCENTSMOD #undef AUTOFORMAT_PATTERN diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 4f4b83d53b49..000859d9ef70 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -105,20 +105,8 @@ using ::sax_fastparser::FSHelperPtr; DBG(extern void dump_pset(Reference< XPropertySet > rXPropSet)); -#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr() - namespace oox { namespace drawingml { -#define GETA(propName) \ - GetProperty( rXPropSet, String( #propName ) ) - -#define GETAD(propName) \ - ( GetPropertyAndState( rXPropSet, rXPropState, String( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) - -#define GET(variable, propName) \ - if ( GETA(propName) ) \ - mAny >>= variable; - class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > { public: diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index f4b9b11186d7..1cdf563dc956 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -25,7 +25,6 @@ # include <com/sun/star/style/LineSpacing.hpp> # include <com/sun/star/style/LineSpacingMode.hpp> # include <com/sun/star/text/WritingMode.hpp> -# define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() using ::com::sun::star::style::LineSpacing; using ::com::sun::star::text::WritingMode; #endif |