diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2011-08-13 13:40:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 17:22:57 +0300 |
| commit | 92a985e7c6a94ee02fd9131c4b382611f326989b (patch) | |
| tree | 9d0261488e7aa9538a51cf585a4efad2ceb91ebd /svtools | |
| parent | d0c301bba0b483c7ffef83fe93fa9658aa10bd44 (diff) | |
Remove extra #define
HTML_CFG_MSIE was an alias for HTML_CFG_MSIE_40, just use it everywhere
for clarity.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/htmlcfg.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/config/htmlcfg.cxx | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx index c668324069bd..26bb48a09cb0 100644 --- a/svtools/inc/svtools/htmlcfg.hxx +++ b/svtools/inc/svtools/htmlcfg.hxx @@ -39,8 +39,7 @@ // !!!be aware!!!: the following defines are _not_ used as values in the configuration file // this is because of compatibility reasons #define HTML_CFG_HTML32 0 // Html 3.2 -#define HTML_CFG_MSIE_40 1 // Internet Explorer 4.0 -#define HTML_CFG_MSIE HTML_CFG_MSIE_40 +#define HTML_CFG_MSIE 1 // Internet Explorer #define HTML_CFG_WRITER 2 // Writer #define HTML_CFG_NS40 3 // Netscape 4.0 #define HTML_CFG_MSIE_40_OLD 4 // Internet Explorer 4.0 - alter Wert diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 4b4f3424e1dd..5de4c38d3bf0 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -163,7 +163,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) switch( nExpMode ) { case 0: nExpMode = HTML_CFG_HTML32; break; - case 1: nExpMode = HTML_CFG_MSIE_40; break; + case 1: nExpMode = HTML_CFG_MSIE; break; case 3: nExpMode = HTML_CFG_WRITER; break; case 4: nExpMode = HTML_CFG_NS40; break; case 5: nExpMode = HTML_CFG_MSIE_40_OLD;break; @@ -233,7 +233,7 @@ void SvxHtmlOptions::Commit() switch( nExpMode ) { case HTML_CFG_HTML32: nExpMode = 0; break; - case HTML_CFG_MSIE_40: nExpMode = 1; break; + case HTML_CFG_MSIE: nExpMode = 1; break; case HTML_CFG_WRITER: nExpMode = 3; break; case HTML_CFG_NS40: nExpMode = 4; break; case HTML_CFG_MSIE_40_OLD: nExpMode = 5; break; @@ -388,7 +388,7 @@ sal_Bool SvxHtmlOptions::IsPrintLayoutExtension() const sal_Bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION); switch( pImp->nExportMode ) { - case HTML_CFG_MSIE_40: + case HTML_CFG_MSIE: case HTML_CFG_NS40 : case HTML_CFG_WRITER : break; |