summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-06-29 21:24:12 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-06-29 21:52:54 +0000
commitba0a57702cdef7a0389c06841711d7e3079d471c (patch)
tree223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /embeddedobj
parent8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff)
remove OUString wrap for string literals
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx4
-rw-r--r--embeddedobj/source/commonembedding/xfactory.cxx2
-rw-r--r--embeddedobj/source/general/docholder.cxx12
-rw-r--r--embeddedobj/source/general/xcreator.cxx4
-rw-r--r--embeddedobj/source/msole/oleembed.cxx10
-rw-r--r--embeddedobj/source/msole/olepersist.cxx12
-rw-r--r--embeddedobj/source/msole/ownview.cxx6
7 files changed, 25 insertions, 25 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 06868e7b4a20..128a5eb3060f 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -508,7 +508,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
// no need to let the file stay after the stream is removed since the embedded document
// can not be stored directly
uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW );
- xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL;
+ xTempStreamProps->getPropertyValue("Uri") >>= aTempFileURL;
}
catch( const uno::Exception& )
{
@@ -857,7 +857,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
// no need to let the file stay after the stream is removed since the embedded document
// can not be stored directly
uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW );
- xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL;
+ xTempStreamProps->getPropertyValue("Uri") >>= aTempFileURL;
}
catch( const uno::Exception& )
{
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 0ccd7b1028aa..58567275318e 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -102,7 +102,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
OUString aMediaType;
try {
- uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ) );
+ uno::Any aAny = xPropSet->getPropertyValue("MediaType");
aAny >>= aMediaType;
}
catch ( const uno::Exception& )
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index b9deda50e7a7..44b4c59c0e52 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager;
+ xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
if ( xLayoutManager.is() )
{
xLayoutManager->setVisible( bVisible );
@@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
try
{
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
+ xPropSet->getPropertyValue("LayoutManager") >>= xOwnLM;
xDocAreaAcc = xContainerLM->getDockingAreaAcceptor();
}
catch( const uno::Exception& ){}
@@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::
try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
+ xPropSet->getPropertyValue("LayoutManager") >>= xOwnLM;
} catch( const uno::Exception& )
{}
@@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
try {
uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
- xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
+ xPropSet->getPropertyValue("LayoutManager") >>= xOwnLM;
} catch( const uno::Exception& )
{}
@@ -972,12 +972,12 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
OUString sUrl;
uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY);
if ( xServiceInfo.is()
- && xServiceInfo->supportsService(OUString("com.sun.star.report.ReportDefinition")) )
+ && xServiceInfo->supportsService("com.sun.star.report.ReportDefinition") )
{
sUrl = OUString(".component:DB/ReportDesign");
}
else if( xServiceInfo.is()
- && xServiceInfo->supportsService( OUString("com.sun.star.chart2.ChartDocument") ))
+ && xServiceInfo->supportsService("com.sun.star.chart2.ChartDocument"))
sUrl = OUString("private:factory/schart");
else
sUrl = OUString("private:object");
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 734f8c5461bc..d3bb4ccbeb11 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -151,7 +151,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
throw uno::RuntimeException();
try {
- uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ));
+ uno::Any aAny = xPropSet->getPropertyValue("MediaType");
aAny >>= aMediaType;
}
catch ( const uno::Exception& )
@@ -183,7 +183,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
throw uno::RuntimeException();
try {
- uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ));
+ uno::Any aAny = xPropSet->getPropertyValue("MediaType");
aAny >>= aMediaType;
if ( aMediaType == "application/vnd.sun.star.oleobject" )
aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 3773a21f4fc3..306ba5a0151a 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -274,7 +274,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
&& ( aFilterName == "Calc MS Excel 2007 XML" || aFilterName == "Impress MS PowerPoint 2007 XML" || aFilterName == "MS Word 2007 XML" ) )
{
uno::Reference< container::XNameAccess > xFilterFactory(
- m_xFactory->createInstance( OUString( "com.sun.star.document.FilterFactory" )),
+ m_xFactory->createInstance("com.sun.star.document.FilterFactory"),
uno::UNO_QUERY_THROW );
OUString aDocServiceName;
@@ -326,7 +326,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
xDocument->close( sal_True );
uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW );
OUString aMediaType;
- xStorProps->getPropertyValue( OUString( "MediaType" ) ) >>= aMediaType;
+ xStorProps->getPropertyValue("MediaType") >>= aMediaType;
xTmpStorage->dispose();
// look for the related embedded object factory
@@ -728,9 +728,9 @@ namespace
if (bCopied)
{
- xNativeTempFile->setPropertyValue(OUString("RemoveFile"),
+ xNativeTempFile->setPropertyValue("RemoveFile",
uno::makeAny(sal_False));
- uno::Any aUrl = xNativeTempFile->getPropertyValue(OUString("Uri"));
+ uno::Any aUrl = xNativeTempFile->getPropertyValue("Uri");
aUrl >>= sUrl;
xNativeTempFile = uno::Reference<beans::XPropertySet>();
@@ -742,7 +742,7 @@ namespace
}
else
{
- xNativeTempFile->setPropertyValue(OUString("RemoveFile"),
+ xNativeTempFile->setPropertyValue("RemoveFile",
uno::makeAny(sal_True));
}
#else
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 8f88131b8e1a..f352fdd32c24 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -84,8 +84,8 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
uno::UNO_QUERY_THROW );
try {
- xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
- uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" ));
+ xTempFile->setPropertyValue("RemoveFile", uno::makeAny( sal_False ) );
+ uno::Any aUrl = xTempFile->getPropertyValue("Uri");
aUrl >>= aResult;
}
catch ( const uno::Exception& )
@@ -164,8 +164,8 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStora
xParentStorage->copyStreamElementData( aEntryName, xTempStream );
- xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
- uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" ));
+ xTempFile->setPropertyValue("RemoveFile", uno::makeAny( sal_False ) );
+ uno::Any aUrl = xTempFile->getPropertyValue("Uri");
aUrl >>= aResult;
}
catch( const uno::RuntimeException& )
@@ -189,7 +189,7 @@ void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, cons
if ( !xPropSet.is() )
throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet
- xPropSet->setPropertyValue( OUString( "MediaType" ), uno::makeAny( aMediaType ) );
+ xPropSet->setPropertyValue("MediaType", uno::makeAny( aMediaType ) );
}
#endif
//------------------------------------------------------
@@ -199,7 +199,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
if ( !xPropSet.is() )
throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface
- xPropSet->setPropertyValue( OUString( "UseCommonStoragePasswordEncryption" ),
+ xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
uno::makeAny( (sal_Bool)sal_True ) );
}
#ifdef WNT
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index cd60186efab2..1df837c44a0f 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -202,7 +202,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
throw uno::RuntimeException();
uno::Reference< document::XTypeDetection > xTypeDetection(
- xFactory->createInstance( OUString( "com.sun.star.document.TypeDetection" )),
+ xFactory->createInstance("com.sun.star.document.TypeDetection"),
uno::UNO_QUERY_THROW );
OUString aTypeName;
@@ -273,8 +273,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
throw uno::RuntimeException();
try {
- xNativeTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) );
- uno::Any aUrl = xNativeTempFile->getPropertyValue( OUString( "Uri" ));
+ xNativeTempFile->setPropertyValue("RemoveFile", uno::makeAny( sal_False ) );
+ uno::Any aUrl = xNativeTempFile->getPropertyValue("Uri");
aUrl >>= aNativeTempURL;
}
catch ( uno::Exception& )