diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:35:13 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:34 +0100 |
commit | b1fab4ab325636eacf7c0387d55b6cc184f89c5f (patch) | |
tree | ae4fc4883d0106d08384eb9f628b28087babe991 /sw/source/uibase/uno | |
parent | e5bd0f8b0a83f5c7f0f204adc081b102c765ca8e (diff) |
sw: Use appropriate OUString functions on string constants
Change-Id: I9c3e03324c69beb5af4c43da208086600876f875
Diffstat (limited to 'sw/source/uibase/uno')
-rw-r--r-- | sw/source/uibase/uno/SwXFilterOptions.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uno/unomailmerge.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 57477a0a3661..fef02b76f6bc 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -67,7 +67,7 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = OUString( FILTER_OPTIONS_NAME ); + pArray[0].Name = FILTER_OPTIONS_NAME; pArray[0].Value <<= sFilterOptions; return aRet; diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 39627971b482..5d96097863b3 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -811,7 +811,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( if ( xCurModel.get() != xModel.get() ) { // in case it was a temporary model -> close it, and delete the file DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName ); - aTmpFileName = ""; + aTmpFileName.clear(); } // (in case it wasn't a temporary model, it will be closed in the dtor, at the latest) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 56c148b939f5..ea3683fc8017 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1784,15 +1784,15 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt Sequence< OUString > aRet (3); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( ( "com.sun.star.document.OfficeDocument" ) ); - pArray[1] = OUString ( ( "com.sun.star.text.GenericTextDocument" ) ); + pArray[0] = "com.sun.star.document.OfficeDocument"; + pArray[1] = "com.sun.star.text.GenericTextDocument"; if (bTextDoc) - pArray[2] = OUString ( ( "com.sun.star.text.TextDocument" ) ); + pArray[2] = "com.sun.star.text.TextDocument"; else if (bWebDoc) - pArray[2] = OUString ( ( "com.sun.star.text.WebDocument" ) ); + pArray[2] = "com.sun.star.text.WebDocument"; else if (bGlobalDoc) - pArray[2] = OUString ( ( "com.sun.star.text.GlobalDocument" ) ); + pArray[2] = "com.sun.star.text.GlobalDocument"; return aRet; } @@ -3425,7 +3425,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sBookmarks) { - sSuffix = ""; + sSuffix.clear(); Reference< XNameAccess > xBkms = new SwXLinkNameAccessWrapper( pxDoc->getBookmarks(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xBkms, UNO_QUERY); |