ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

replace a series of if/else if/ by a switch

Browse Source 
Change-Id: I6319971e1a2a4bffa0466fa37a31beff5a349fd1
Reviewed-on: https://gerrit.libreoffice.org/53535
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2018-04-27 07:39:15 +02:00
parent b00d6854f8
commit e0e8f5f60f
2 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+17 -19
View File
@@ -388,29 +388,27 @@ bool MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput
if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE)
&& confidence != libwps::WPS_CONFIDENCE_NONE)
{
if (creator == libwps::WPS_MSWORKS)
switch (creator)
{
rTypeName = "calc_MS_Works_Document";
return true;
}
if (creator == libwps::WPS_LOTUS || creator == libwps::WPS_SYMPHONY)
{
rTypeName = "calc_WPS_Lotus_Document";
return true;
}
if (creator == libwps::WPS_QUATTRO_PRO)
{
rTypeName = "calc_WPS_QPro_Document";
return true;
}
if (creator == libwps::WPS_RESERVED_2)
{
rTypeName = "calc_MS_Multiplan";
return true;
case libwps::WPS_MSWORKS:
rTypeName = "calc_MS_Works_Document";
break;
case libwps::WPS_LOTUS:
case libwps::WPS_SYMPHONY:
rTypeName = "calc_WPS_Lotus_Document";
break;
case libwps::WPS_QUATTRO_PRO:
rTypeName = "calc_WPS_QPro_Document";
break;
case libwps::WPS_RESERVED_2:
rTypeName = "calc_MS_Multiplan";
break;
default:
break;
}
}
return false;
return !rTypeName.isEmpty();
}
void MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator&) {}
writerperfect/source/writer/MSWorksImportFilter.cxx
+13 -13
View File
@@ -98,23 +98,23 @@ bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OU
if ((kind == libwps::WPS_TEXT) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))
{
if (creator == libwps::WPS_MSWORKS)
switch (creator)
{
rTypeName = "writer_MS_Works_Document";
case libwps::WPS_MSWORKS:
rTypeName = "writer_MS_Works_Document";
break;
case libwps::WPS_RESERVED_0:
rTypeName = "writer_MS_Write";
break;
case libwps::WPS_RESERVED_1:
rTypeName = "writer_DosWord";
break;
default:
break;
}
else if (creator == libwps::WPS_RESERVED_0)
{
rTypeName = "writer_MS_Write";
}
else
{
rTypeName = "writer_DosWord";
}
return true;
}
return false;
return !rTypeName.isEmpty();
}
void MSWorksImportFilter::doRegisterHandlers(OdtGenerator& rGenerator)