commit 1ee901d4496b79d39fbffde8bce988a159dda74e
author Vladimir Glazounov <vg@openoffice.org> Tue Feb 22 07:22:09 2005 +0000
committer Vladimir Glazounov <vg@openoffice.org> Tue Feb 22 07:22:09 2005 +0000
tree f3d1c03998e410da494caa30908084c282b6c23e
parent ff3ced12f9fd7b81c66176c260b58e1452d7b26a

INTEGRATION: CWS swqbugfixes14 (1.32.40); FILE MERGED
2005/01/28 12:37:22 od 1.32.40.1: #i33818# - template style document for HTML documents:
	   search also for OpenDocument Writer/Web template file

sw/source/filter/html/swhtml.cxx

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7dd5154..1eb1ecc 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: swhtml.cxx,v $
 *
 *  $Revision: 1.32 $
 *  $Revision: 1.33 $
 *
 *  last change: $Author: rt $ $Date: 2005-01-11 12:28:43 $
 *  last change: $Author: vg $ $Date: 2005-02-22 08:22:09 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -341,19 +341,24 @@ String HTMLReader::GetTemplateName() const
    sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") );
    String sTemplateWithoutExt( sTemplate );
#ifndef MAC_WITHOUT_EXT
    sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") );
    // --> OD 2005-01-26 - first search for OpenDocument Writer/Web template
    sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".oth") );
    // <--
#endif

    SvtPathOptions aOpt;
    // 6.0 (extension .stw)
    // OpenDocument Writer/Web template (extension .oth)
    BOOL bSet = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );

#ifndef MAC_WITHOUT_EXT
    if( !bSet )
    {
        // 5.0 (extension .vor)
        // 6.0 (extension .stw)
        sTemplate = sTemplateWithoutExt;
        sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".vor") );
        // --> OD 2005-01-26 - no OpenDocument Writer/Web template found.
        // search for OpenOffice.org Writer/Web template
        sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") );
        // <--
        bSet = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
    }
#endif