[Libreoffice-commits] core.git: sw/source
Michael Stahl
mstahl at redhat.com
Fri Apr 4 09:20:08 PDT 2014
sw/source/ui/index/cnttab.cxx | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
New commits:
commit 97b20c9deee46195357896197440cc1cc43d3452
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Apr 4 15:17:47 2014 +0200
SwMultiTOXTabDialog: the file we ship is called idxexample.odt
Change-Id: Ib62f992814ec83f3bb25a0197b50b0b85979d0bb
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 394cf83..a296eeb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -473,31 +473,12 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
if(!pExampleFrame && !bExampleCreated)
{
bExampleCreated = sal_True;
- OUString sTemplate("internal/idxexample");
-
- OUString sTemplateWithoutExt( sTemplate );
- sTemplate += ".odt";
+ OUString sTemplate("internal/idxexample.odt");
SvtPathOptions aOpt;
aOpt.SetTemplatePath(OUString(LIBO_SHARE_FOLDER "/template/common"));
- // 6.0 (extension .sxw)
bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
- if( !bExist )
- {
- // 6.0 (extension .sxw)
- sTemplate = sTemplateWithoutExt;
- sTemplate += ".sxw";
- bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
- }
- if( !bExist )
- {
- // 5.0 (extension .vor)
- sTemplate = sTemplateWithoutExt;
- sTemplate += ".sdw";
- bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
- }
-
if(!bExist)
{
OUString sInfo(SW_RESSTR(STR_FILE_NOT_FOUND));
More information about the Libreoffice-commits
mailing list