summaryrefslogtreecommitdiff
path: root/comphelper/source/misc
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/misc')
-rw-r--r--comphelper/source/misc/mediadescriptor.cxx6
-rw-r--r--comphelper/source/misc/mimeconfighelper.cxx16
-rw-r--r--comphelper/source/misc/numberedcollection.cxx2
-rw-r--r--comphelper/source/misc/numbers.cxx2
-rw-r--r--comphelper/source/misc/storagehelper.cxx2
5 files changed, 14 insertions, 14 deletions
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index f3bc92f9e174..82a1b29de8bb 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -463,7 +463,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
// b) ... or we must get it from the given URL
OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString());
if (sURL.isEmpty())
- throw css::uno::Exception( OUString( "Found no URL." ),
+ throw css::uno::Exception("Found no URL.",
css::uno::Reference< css::uno::XInterface >());
// Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
@@ -482,7 +482,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
throw(::com::sun::star::uno::RuntimeException)
{
if ( !_rxPostData.is() )
- throw css::lang::IllegalArgumentException( OUString( "Found invalid PostData." ),
+ throw css::lang::IllegalArgumentException("Found invalid PostData.",
css::uno::Reference< css::uno::XInterface >(), 1);
// PostData can't be used in read/write mode!
@@ -642,7 +642,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
else
{
sal_Bool bRequestReadOnly = bReadOnly;
- aContent.getPropertyValue( OUString( "IsReadOnly" ) ) >>= bReadOnly;
+ aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly )
return sal_False; // the document is explicitly requested with WRITEABLE mode
}
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 733bf2645873..68ef68ceda5f 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -273,10 +273,10 @@ sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortc
if ( xVerbsConfig.is() && ( xVerbsConfig->getByName( aVerbShortcut ) >>= xVerbsProps ) && xVerbsProps.is() )
{
embed::VerbDescriptor aTempDescr;
- if ( ( xVerbsProps->getByName( OUString( "VerbID" ) ) >>= aTempDescr.VerbID )
- && ( xVerbsProps->getByName( OUString( "VerbUIName" ) ) >>= aTempDescr.VerbName )
- && ( xVerbsProps->getByName( OUString( "VerbFlags" ) ) >>= aTempDescr.VerbFlags )
- && ( xVerbsProps->getByName( OUString( "VerbAttributes" ) ) >>= aTempDescr.VerbAttributes ) )
+ if ( ( xVerbsProps->getByName("VerbID") >>= aTempDescr.VerbID )
+ && ( xVerbsProps->getByName("VerbUIName") >>= aTempDescr.VerbName )
+ && ( xVerbsProps->getByName("VerbFlags") >>= aTempDescr.VerbFlags )
+ && ( xVerbsProps->getByName("VerbAttributes") >>= aTempDescr.VerbAttributes ) )
{
aDescriptor = aTempDescr;
bResult = sal_True;
@@ -467,7 +467,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
OUString aEntryDocName;
if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
- && ( xObjectProps->getByName( OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+ && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName )
&& aEntryDocName == aDocName )
{
return GetObjPropsFromConfigEntry( GetSequenceClassIDRepresentation( aClassIDs[nInd] ),
@@ -501,7 +501,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString&
try
{
if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() )
- xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult;
+ xObjectProps->getByName("ObjectFactory") >>= aResult;
}
catch( uno::Exception& )
{
@@ -537,7 +537,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString&
OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
&& aEntryDocName == aDocName )
{
- xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult;
+ xObjectProps->getByName("ObjectFactory") >>= aResult;
break;
}
}
@@ -851,7 +851,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
if ( xFilterEnum->nextElement() >>= aProps )
{
SequenceAsHashMap aPropsHM( aProps );
- sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( OUString("Flags"),
+ sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault("Flags",
(sal_Int32)0 );
if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
{
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 2f3e357f0167..50255eebb523 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -109,7 +109,7 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
::osl::ResettableMutexGuard aLock(m_aMutex);
if (nNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
- throw css::lang::IllegalArgumentException (OUString("Special valkud INVALID_NUMBER not allowed as input parameter."), m_xOwner.get(), 1);
+ throw css::lang::IllegalArgumentException ("Special valkud INVALID_NUMBER not allowed as input parameter.", m_xOwner.get(), 1);
TDeadItemList lDeadItems;
TNumberedItemHash::iterator pComponent;
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 8bd744f77946..569d492d1049 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -42,7 +42,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
{
staruno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
if (xFormat.is())
- xFormat->getPropertyValue(OUString( "Type" )) >>= nReturn;
+ xFormat->getPropertyValue("Type") >>= nReturn;
}
catch(...)
{
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index d9077ab882f6..1b371487ad31 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -231,7 +231,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
OUString aMediaType;
- xStorProps->getPropertyValue( OUString( "MediaType" ) ) >>= aMediaType;
+ xStorProps->getPropertyValue("MediaType") >>= aMediaType;
sal_Int32 nResult = 0;