diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 11:38:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 11:39:18 +0000 |
| commit | 322afee279afd6ce5a99212757d0747858959d80 (patch) | |
| tree | ff6ae1f9a58d59eb68557d8a8febec901ece7110 | |
| parent | 897aa4fa71813ca188b0e1e01ca41ca1e35d415d (diff) | |
MAC_WITHOUT_EXT never defined thesedays
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 019c9dd0e826..23cc0df2d024 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -165,16 +165,13 @@ String HTMLReader::GetTemplateName() const sTemplate += INET_PATH_TOKEN; sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") ); String sTemplateWithoutExt( sTemplate ); -#ifndef MAC_WITHOUT_EXT // first search for OpenDocument Writer/Web template sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".oth") ); -#endif SvtPathOptions aPathOpt; // OpenDocument Writer/Web template (extension .oth) sal_Bool bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); -#ifndef MAC_WITHOUT_EXT if( !bSet ) { // 6.0 (extension .stw) @@ -184,7 +181,6 @@ String HTMLReader::GetTemplateName() const sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") ); bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); } -#endif if( !bSet ) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 59382cb9ce67..414bc5f51888 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -513,15 +513,12 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) sTemplate += INET_PATH_TOKEN; sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") ); String sTemplateWithoutExt( sTemplate ); -#ifndef MAC_WITHOUT_EXT sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".odt") ); -#endif SvtPathOptions aOpt; // 6.0 (extension .sxw) sal_Bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); -#ifndef MAC_WITHOUT_EXT if( !bExist ) { // 6.0 (extension .sxw) @@ -536,7 +533,6 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(".sdw") ); bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); } -#endif if(!bExist) { |