mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerperfect: Use appropriate OUString functions on string constants

Browse Source 
Change-Id: If48c8c7181eb8eec7519ba17248244c7ba6bf0d5
This commit is contained in:
Stephan Bergmann
2014-12-18 13:39:58 +01:00
parent 24531a040e
commit 56a6a6f209
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerperfect/source/calc/MWAWCalcImportFilter.cxx
View File

@@ -46,7 +46,7 @@ bool MWAWCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) bool MWAWCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{ {
rTypeName = ""; rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN; MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN; MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;

2
writerperfect/source/draw/MWAWDrawImportFilter.cxx
View File

@@ -46,7 +46,7 @@ bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{ {
rTypeName = ""; rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN; MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN; MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;

10
writerperfect/source/impress/KeynoteImportFilter.cxx
View File

@@ -233,22 +233,16 @@ throw (RuntimeException)
return OUString("org.libreoffice.comp.Impress.KeynoteImportFilter"); return OUString("org.libreoffice.comp.Impress.KeynoteImportFilter");
} }
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
#define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection"
Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames() Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames()
throw (RuntimeException) throw (RuntimeException)
{ {
Sequence < OUString > aRet(2); Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString(SERVICE_NAME1); pArray[0] = "com.sun.star.document.ImportFilter";
pArray[1] = OUString(SERVICE_NAME2); pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
return aRet; return aRet;
} }
#undef SERVICE_NAME2
#undef SERVICE_NAME1
Reference< XInterface > SAL_CALL KeynoteImportFilter_createInstance(const Reference< XComponentContext > &rContext) Reference< XInterface > SAL_CALL KeynoteImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception) throw(Exception)
{ {

2
writerperfect/source/impress/MWAWPresentationImportFilter.cxx
View File

@@ -46,7 +46,7 @@ bool MWAWPresentationImportFilter::doImportDocument(librevenge::RVNGInputStream
bool MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) bool MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{ {
rTypeName = ""; rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN; MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN; MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;

2
writerperfect/source/writer/EBookImportFilter.cxx
View File

@@ -56,7 +56,7 @@ bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Od
bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{ {
rTypeName = ""; rTypeName.clear();
EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN; EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN;

2
writerperfect/source/writer/MWAWImportFilter.cxx
View File

@@ -45,7 +45,7 @@ bool MWAWImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Odt
bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{ {
rTypeName = ""; rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN; MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN; MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;