summaryrefslogtreecommitdiff
path: root/framework/source/fwe
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 /framework/source/fwe
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 'framework/source/fwe')
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx2
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx2
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx18
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx2
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx4
5 files changed, 14 insertions, 14 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 974a8d1b7207..a4f58f7ba78c 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -81,7 +81,7 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException)
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
return (OWeakObject *)( new ActionTriggerSeparatorPropertySet());
else
- throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this );
+ throw com::sun::star::uno::RuntimeException("Unknown service specifier!", (OWeakObject *)this );
}
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 3996d6d87374..6f67b8a14e03 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -102,7 +102,7 @@ throw ( Exception, RuntimeException )
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
return (OWeakObject *)( new ActionTriggerSeparatorPropertySet());
else
- throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this );
+ throw com::sun::star::uno::RuntimeException("Unknown service specifier!", (OWeakObject *)this );
}
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 96149e4338d2..782eb2447f4a 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -74,13 +74,13 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet,
try
{
// mandatory properties
- a = xActionTriggerPropertySet->getPropertyValue( OUString( "Text" ) );
+ a = xActionTriggerPropertySet->getPropertyValue("Text");
a >>= aMenuLabel;
- a = xActionTriggerPropertySet->getPropertyValue( OUString( "CommandURL" ) );
+ a = xActionTriggerPropertySet->getPropertyValue("CommandURL");
a >>= aCommandURL;
- a = xActionTriggerPropertySet->getPropertyValue( OUString( "Image" ) );
+ a = xActionTriggerPropertySet->getPropertyValue("Image");
a >>= xBitmap;
- a = xActionTriggerPropertySet->getPropertyValue( OUString( "SubContainer" ) );
+ a = xActionTriggerPropertySet->getPropertyValue("SubContainer");
a >>= xSubContainer;
}
catch (const Exception&)
@@ -90,7 +90,7 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet,
// optional properties
try
{
- a = xActionTriggerPropertySet->getPropertyValue( OUString( "HelpURL" ) );
+ a = xActionTriggerPropertySet->getPropertyValue("HelpURL");
a >>= aHelpURL;
}
catch (const Exception&)
@@ -260,7 +260,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
// Retrieve the menu attributes and set them in our PropertySet
OUString aLabel = pMenu->GetItemText( nItemId );
a <<= aLabel;
- xPropSet->setPropertyValue( OUString( "Text" ), a );
+ xPropSet->setPropertyValue("Text", a );
OUString aCommandURL = pMenu->GetItemCommand( nItemId );
@@ -271,7 +271,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
}
a <<= aCommandURL;
- xPropSet->setPropertyValue( OUString( "CommandURL" ), a );
+ xPropSet->setPropertyValue("CommandURL", a );
Image aImage = pMenu->GetItemImage( nItemId );
if ( !!aImage )
@@ -279,7 +279,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
// We use our own optimized XBitmap implementation
Reference< XBitmap > xBitmap( static_cast< cppu::OWeakObject* >( new ImageWrapper( aImage )), UNO_QUERY );
a <<= xBitmap;
- xPropSet->setPropertyValue( OUString( "Image" ), a );
+ xPropSet->setPropertyValue("Image", a );
}
}
catch (const Exception&)
@@ -351,7 +351,7 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon
Reference< XIndexContainer > xSubContainer = CreateActionTriggerContainer( rActionTriggerContainer );
a <<= xSubContainer;
- xPropSet->setPropertyValue( OUString( "SubContainer" ), a );
+ xPropSet->setPropertyValue("SubContainer", a );
FillActionTriggerContainerWithMenu( pPopupMenu, xSubContainer );
}
}
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index e3c1de422067..40d09c187181 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -673,7 +673,7 @@ namespace framework
? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
: rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
if ( nElements == 0 )
- throw EmptyUndoStackException( OUString( "stack is empty" ), getXUndoManager() );
+ throw EmptyUndoStackException("stack is empty", getXUndoManager() );
aGuard.clear();
// <--- SYNCHRONIZED
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 97ec8ce35ca2..8ffd7a20587b 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -262,7 +262,7 @@ throw( SAXException, RuntimeException )
{
try
{
- xPropSet->setPropertyValue( OUString( "UIName" ), makeAny( aUIName ) );
+ xPropSet->setPropertyValue("UIName", makeAny( aUIName ) );
}
catch ( const UnknownPropertyException& )
{
@@ -699,7 +699,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
{
try
{
- xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName;
+ xPropSet->getPropertyValue("UIName") >>= aUIName;
}
catch ( const UnknownPropertyException& )
{