diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-24 11:14:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-24 11:21:00 +0100 |
| commit | a577418d9f9fe0e622f60a5b61a6fadc98d819a9 (patch) | |
| tree | 544be8fb0bce188740f759b09b708cd076c0c6b8 /oox | |
| parent | 0261744be26bb1b67aa4b9fde7365f6414584f4a (diff) | |
oox: drop no longer needed STR() macro
Change-Id: I95ebe1915edb53ae25f3f85512b7b843726d8473
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/mathml/importutils.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 99b673dbb6a4..d3c47821a3ef 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -37,9 +37,6 @@ #include <oox/token/namespaces.hxx> #include <rtl/ustring.hxx> -// *sigh* -#define STR( str ) OUString( RTL_CONSTASCII_USTRINGPARAM( str )) - #define OPENING( token ) XML_STREAM_OPENING( token ) #define CLOSING( token ) XML_STREAM_CLOSING( token ) @@ -82,33 +79,33 @@ static OUString tokenToString( int token ) { OUString tokenname = StaticTokenMap::get().getUnicodeTokenName( token & TOKEN_MASK ); if( tokenname.isEmpty()) - tokenname = STR( "???" ); + tokenname = "???"; int nmsp = ( token & NMSP_MASK & ~( TAG_OPENING | TAG_CLOSING )); #if 0 // this is awfully long OUString namespacename = StaticNamespaceMap::get().count( nmsp ) != 0 - ? StaticNamespaceMap::get()[ nmsp ] : STR( "???" ); + ? StaticNamespaceMap::get()[ nmsp ] : OUString( "???" ); #else OUString namespacename; // only few are needed actually switch( nmsp ) { case NMSP_officeMath: - namespacename = STR( "m" ); + namespacename = "m"; break; case NMSP_doc: - namespacename = STR( "w" ); + namespacename = "w"; break; default: - namespacename = STR( "?" ); + namespacename = "?"; break; } #endif if( token == OPENING( token )) - return STR( "<" ) + namespacename + STR( ":" ) + tokenname + STR ( ">" ); + return "<" + namespacename + ":" + tokenname + ">"; if( token == CLOSING( token )) - return STR( "</" ) + namespacename + STR( ":" ) + tokenname + STR ( ">" ); + return "</" + namespacename + ":" + tokenname + ">"; // just the name itself, not specified whether opening or closing - return namespacename + STR( ":" ) + tokenname; + return namespacename + ":" + tokenname; } } // namespace |