diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:39:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:38 +0100 |
| commit | 56a6a6f2094f21cd14628ae9d50725a30a36f274 (patch) | |
| tree | 7c5d7e1487f61fd62e820844d8a9e3a274ef037f /writerperfect/source/impress | |
| parent | 24531a040ea90a8631699089118a9e88860a27ee (diff) | |
writerperfect: Use appropriate OUString functions on string constants
Change-Id: If48c8c7181eb8eec7519ba17248244c7ba6bf0d5
Diffstat (limited to 'writerperfect/source/impress')
| -rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.cxx | 10 | ||||
| -rw-r--r-- | writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index efd5ee2ed510..e305bfb6cbed 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -233,22 +233,16 @@ throw (RuntimeException) 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() throw (RuntimeException) { Sequence < OUString > aRet(2); OUString *pArray = aRet.getArray(); - pArray[0] = OUString(SERVICE_NAME1); - pArray[1] = OUString(SERVICE_NAME2); + pArray[0] = "com.sun.star.document.ImportFilter"; + pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; return aRet; } -#undef SERVICE_NAME2 -#undef SERVICE_NAME1 - Reference< XInterface > SAL_CALL KeynoteImportFilter_createInstance(const Reference< XComponentContext > &rContext) throw(Exception) { diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index cdbfaa0f09a8..1a25ac66bc03 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -46,7 +46,7 @@ bool MWAWPresentationImportFilter::doImportDocument(librevenge::RVNGInputStream bool MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) { - rTypeName = ""; + rTypeName.clear(); MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN; MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN; |