summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-18 13:39:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-18 14:12:38 +0100
commit56a6a6f2094f21cd14628ae9d50725a30a36f274 (patch)
tree7c5d7e1487f61fd62e820844d8a9e3a274ef037f /writerperfect
parent24531a040ea90a8631699089118a9e88860a27ee (diff)
writerperfect: Use appropriate OUString functions on string constants
Change-Id: If48c8c7181eb8eec7519ba17248244c7ba6bf0d5
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/source/calc/MWAWCalcImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/MWAWDrawImportFilter.cxx2
-rw-r--r--writerperfect/source/impress/KeynoteImportFilter.cxx10
-rw-r--r--writerperfect/source/impress/MWAWPresentationImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/EBookImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/MWAWImportFilter.cxx2
6 files changed, 7 insertions, 13 deletions
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index a923b6b30716..5b2f3f79f2ba 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -46,7 +46,7 @@ bool MWAWCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index f4c0f18d0b74..34939032050a 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -46,7 +46,7 @@ bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;
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;
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 6f9ddf55892b..c6a4ce8e14f7 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -56,7 +56,7 @@ bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Od
bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN;
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 98b210cf24e5..34bf04ea8fda 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -45,7 +45,7 @@ bool MWAWImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Odt
bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
- rTypeName = "";
+ rTypeName.clear();
MWAWDocument::Type docType = MWAWDocument::MWAW_T_UNKNOWN;
MWAWDocument::Kind docKind = MWAWDocument::MWAW_K_UNKNOWN;