diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-01 13:18:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-01 12:34:51 +0000 |
commit | 39414827352e58e8be76abaa9a5a1ac9518d927f (patch) | |
tree | 7b856026bae224c678cab020ce00f97574d2bbba /sc/source/ui/unoobj/scdetect.cxx | |
parent | d5c4823555e6f5c4e3bd9258c819bb2a763227c4 (diff) |
loplugin:oncevar in sal..scripting
Change-Id: Id9ab12f3a61eb83a2288b2fd4d99ab77f5833e1b
Reviewed-on: https://gerrit.libreoffice.org/30461
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/unoobj/scdetect.cxx')
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index bb2c407c3f9a..6e3318bdddc8 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -35,12 +35,6 @@ using utl::MediaDescriptor; namespace { -const sal_Char pFilterLotus[] = "Lotus"; -const sal_Char pFilterQPro6[] = "Quattro Pro 6.0"; -const sal_Char pFilterDBase[] = "dBase"; -const sal_Char pFilterDif[] = "DIF"; -const sal_Char pFilterSylk[] = "SYLK"; - // Tabelle mit Suchmustern // Bedeutung der Sequenzen // 0x00??: genau Byte 0x?? muss an dieser Stelle stehen @@ -290,35 +284,35 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l if (!detectThisFormat(*pStream, pLotus) && !detectThisFormat(*pStream, pLotusNew) && !detectThisFormat(*pStream, pLotus2)) return OUString(); - pSearchFilterName = pFilterLotus; + pSearchFilterName = "Lotus"; } else if (aTypeName == "calc_QPro") { if (!detectThisFormat(*pStream, pQPro)) return OUString(); - pSearchFilterName = pFilterQPro6; + pSearchFilterName = "Quattro Pro 6.0"; } else if (aTypeName == "calc_SYLK") { if (!detectThisFormat(*pStream, pSylk)) return OUString(); - pSearchFilterName = pFilterSylk; + pSearchFilterName = "SYLK"; } else if (aTypeName == "calc_DIF") { if (!detectThisFormat(*pStream, pDIF1) && !detectThisFormat(*pStream, pDIF2)) return OUString(); - pSearchFilterName = pFilterDif; + pSearchFilterName = "DIF"; } else if (aTypeName == "calc_dBase") { if (!lcl_MayBeDBase(*pStream)) return OUString(); - pSearchFilterName = pFilterDBase; + pSearchFilterName = "dBase"; } else return OUString(); |