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>

28 files changed, 50 insertions, 50 deletions

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 007bded67b08..49ca5cc19332 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -219,7 +219,7 @@ void AccessibleShape::UpdateStates (void)
                 try
                 {
                     drawing::FillStyle aFillStyle;
-                    bShapeIsOpaque =  ( xSet->getPropertyValue (OUString("FillStyle")) >>= aFillStyle)
+                    bShapeIsOpaque =  ( xSet->getPropertyValue ("FillStyle") >>= aFillStyle)
                                         && aFillStyle == drawing::FillStyle_SOLID;
                 }
                 catch (::com::sun::star::beans::UnknownPropertyException&)
@@ -642,7 +642,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void)
         if (aSet.is())
         {
             uno::Any aColor;
-            aColor = aSet->getPropertyValue (OUString("LineColor"));
+            aColor = aSet->getPropertyValue ("LineColor");
             aColor >>= nColor;
         }
     }
@@ -668,7 +668,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
         if (aSet.is())
         {
             uno::Any aColor;
-            aColor = aSet->getPropertyValue (OUString("FillColor"));
+            aColor = aSet->getPropertyValue ("FillColor");
             aColor >>= nColor;
         }
     }
@@ -984,7 +984,7 @@ OUString
             uno::Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
             if (xSet.is())
             {
-                uno::Any aZOrder (xSet->getPropertyValue (OUString("ZOrder")));
+                uno::Any aZOrder (xSet->getPropertyValue ("ZOrder"));
                 aZOrder >>= nIndex;
 
                 // Add one to be not zero based.
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index fc8c2e4c7077..571fcbebba5f 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -270,7 +270,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
             Reference< XInputStream > xGraphStream;
             if( aMimeType == aExportMimeType )
             {
-                xShapeSet->getPropertyValue( OUString( "GraphicStream" ) ) >>= xGraphStream;
+                xShapeSet->getPropertyValue("GraphicStream") >>= xGraphStream;
             }
 
             if( xGraphStream.is() )
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 472d9c323f4b..22d913abd922 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -464,10 +464,10 @@ void SvxSearchDialog::Construct_Impl()
                 uno::Any aRet = xDirectAccess->getByName(sProperty);
                 aRet >>= sTemp;
                 m_pComponentFrame->get_label_widget()->SetText(sTemp);
-                aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel1"));
+                aRet = xDirectAccess->getByName("ComponentSearchCommandLabel1");
                 aRet >>= sTemp;
                 m_pSearchComponent1PB->SetText( sTemp );
-                aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel2"));
+                aRet = xDirectAccess->getByName("ComponentSearchCommandLabel2");
                 aRet >>= sTemp;
                 m_pSearchComponent2PB->SetText( sTemp );
             }
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index b5e9b8e20539..129a3657450f 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -119,7 +119,7 @@ namespace svx
             try
             {
                 Reference< XTablesSupplier > xSupTab;
-                _rxForm->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab;
+                _rxForm->getPropertyValue("SingleSelectQueryComposer") >>= xSupTab;
 
                 if(xSupTab.is())
                 {
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 182e74fd49d1..2d5be88f04b0 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -82,7 +82,7 @@ namespace svx
             Reference<XPropertySet> xProp;
             m_aDescriptor[daComponent] >>= xProp;
             if ( xProp.is() )
-                xProp->getPropertyValue(OUString("IsForm")) >>= bForm;
+                xProp->getPropertyValue("IsForm") >>= bForm;
         }
         catch(Exception)
         {}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 4ea2577202a0..9cc3518ea5d1 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -336,7 +336,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
                     // not interested in any results
 
                     Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY);
-                    xStatProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0)));
+                    xStatProps->setPropertyValue("MaxRows", makeAny(sal_Int32(0)));
 
                     xResultSet = xStatement->executeQuery();
                     Reference< XColumnsSupplier >  xSupplyCols(xResultSet, UNO_QUERY);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 71fb78094dd6..86a9b256ebf0 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3071,7 +3071,7 @@ void DbFilterField::Update()
 
         Reference<XPropertySet> xFormProp(xForm,UNO_QUERY);
         Reference< XTablesSupplier > xSupTab;
-        xFormProp->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab;
+        xFormProp->getPropertyValue("SingleSelectQueryComposer") >>= xSupTab;
 
         Reference< XConnection >  xConnection(getRowSetConnection(xForm));
         if (!xSupTab.is())
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 83358a73284c..1437ef2435fc 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1455,7 +1455,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
         // retrieve the datebase of the Numberformatter
         try
         {
-            xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= m_aNullDate;
+            xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>= m_aNullDate;
         }
         catch(Exception&)
         {
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 66ab3f32c3d9..5b7c5a72521c 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -221,7 +221,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings*
         m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow );
 
         m_xMeAsFrame->initialize( m_xFrameContainerWindow );
-        m_xMeAsFrame->setName( OUString("form property browser") );
+        m_xMeAsFrame->setName("form property browser");
     }
     catch (Exception&)
     {
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 87a69ac93420..204338ea74e5 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -97,20 +97,20 @@ namespace svxform
             Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY );
             if ( xDocumentSI.is() )
             {
-                if (  xDocumentSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) )
-                   || xDocumentSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) )
+                if (  xDocumentSI->supportsService("com.sun.star.text.TextDocument")
+                   || xDocumentSI->supportsService("com.sun.star.text.WebDocument")
                    )
                 {
                     _rFamilyName = OUString( "ParagraphStyles" );
                     _rStyleName = OUString( "Standard" );
                 }
-                else if ( xDocumentSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+                else if ( xDocumentSI->supportsService("com.sun.star.sheet.SpreadsheetDocument") )
                 {
                     _rFamilyName = OUString( "CellStyles" );
                     _rStyleName = OUString( "Default" );
                 }
-                else if (  xDocumentSI->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) )
-                        || xDocumentSI->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) )
+                else if (  xDocumentSI->supportsService("com.sun.star.drawing.DrawingDocument")
+                        || xDocumentSI->supportsService("com.sun.star.presentation.PresentationDocument")
                         )
                 {
                     _rFamilyName = OUString( "graphics" );
@@ -203,7 +203,7 @@ namespace svxform
         // the names of the family, and the style - depends on the document type we live in
         OUString sFamilyName, sStyleName;
         if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) )
-            throw RuntimeException( OUString( "unknown document type!" ), NULL );
+            throw RuntimeException("unknown document type!", NULL );
 
         // the concrete style
         Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW );
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index d7738dbc4128..c62dd0f66473 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -556,7 +556,7 @@ Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface >
                 {
                     // create and insert (into the destination) a copy of the form
                     xCurrentDestForm.set(
-                        ::comphelper::getProcessServiceFactory()->createInstance(OUString( "com.sun.star.form.component.DataForm" ) ),
+                        ::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.form.component.DataForm"),
                         UNO_QUERY_THROW );
                     ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm );
 
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index d07b31282f92..7696f882dc42 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -928,7 +928,7 @@ namespace svxform
                 {
                     Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW );
                     Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW );
-                    aCaller = xProps->getPropertyValue( OUString("Name") );
+                    aCaller = xProps->getPropertyValue("Name");
                 }
                 catch( Exception& ) {}
             }
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 854d8f1d41a3..46a7d6e190de 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1662,7 +1662,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
         {
             try
             {
-                Any aVal( xSet->getPropertyValue(OUString("TwoDigitDateStart")) );
+                Any aVal( xSet->getPropertyValue("TwoDigitDateStart") );
                 aVal >>= n;
                 return sal_True;
             }
@@ -1695,7 +1695,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal);
+                    xSet->setPropertyValue("TwoDigitDateStart", aVal);
                 }
                 catch(Exception&)
                 {
@@ -1736,7 +1736,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal);
+                    xSet->setPropertyValue("TwoDigitDateStart", aVal);
                 }
                 catch(Exception&)
                 {
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 7b07764c60e8..b66d2ed5f5f8 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -121,7 +121,7 @@ private:
             // SfxObjectShellRef is good here since the model controls the lifetime of the shell
             SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell();
             ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" );
-            xListenerProps->setPropertyValue( OUString( "Model" ), makeAny( xObjectShell->GetModel() ) );
+            xListenerProps->setPropertyValue("Model", makeAny( xObjectShell->GetModel() ) );
 
             m_vbaListener = xScriptListener;
         }
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 913e8b99255c..033c72545f3c 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -221,7 +221,7 @@ namespace svxform
                 if ( !sDataSourceName.isEmpty() )
                     xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext ) );
                 if ( xDsProperties.is() )
-                    xDsProperties->getPropertyValue( OUString( "Info" ) ) >>= aInfo;
+                    xDsProperties->getPropertyValue("Info") >>= aInfo;
             }
             catch( const Exception& )
             {
@@ -410,7 +410,7 @@ namespace svxform
             switch ( nClassId )
             {
                 case FormComponentType::SCROLLBAR:
-                    _rxControlModel->setPropertyValue( OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) );
+                    _rxControlModel->setPropertyValue("LiveScroll", makeAny( (sal_Bool)sal_True ) );
                     // NO break!
                 case FormComponentType::SPINBUTTON:
                 {
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 7145abb1e60f..d2280fa433e9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3101,7 +3101,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
         {
             Reference< XMultiServiceFactory > xFactory( xConnection, UNO_QUERY_THROW );
             m_xComposer.set(
-                xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer"  ) ),
+                xFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
                 UNO_QUERY_THROW );
 
             Reference< XPropertySet > xSet( xForm, UNO_QUERY );
@@ -3181,7 +3181,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         xQueryColumns->getByName(pRefValues[j].Name) >>= xSet;
 
                         // get the RealName
-                        xSet->getPropertyValue(OUString("RealName")) >>= aRealName;
+                        xSet->getPropertyValue("RealName") >>= aRealName;
 
                         // compare the condition field name and the RealName
                         if (aCompare(aRealName, pRefValues[j].Name))
@@ -3194,7 +3194,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++)
                         {
                             xColumnsByIndex->getByIndex(n) >>= xSet;
-                            xSet->getPropertyValue(OUString("RealName")) >>= aRealName;
+                            xSet->getPropertyValue("RealName") >>= aRealName;
                             if (aCompare(aRealName, pRefValues[j].Name))
                             {
                                 // get the column by its alias
@@ -3694,7 +3694,7 @@ namespace
                 return sal_True;
 
             Reference< XPropertySet > xDataSourceSettings(
-                xDataSource->getPropertyValue( OUString( "Settings"  ) ),
+                xDataSource->getPropertyValue("Settings"),
                 UNO_QUERY_THROW );
 
             sal_Bool bShouldValidate = true;
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index e978c9e59933..43cbe8231829 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -41,7 +41,7 @@ namespace svxform
         // the layout manager
         Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY );
         if ( xFrameProps.is() )
-            xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= m_xLayouter;
+            xFrameProps->getPropertyValue("LayoutManager") >>= m_xLayouter;
     }
 
     //--------------------------------------------------------------------
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e1af74e63f0d..e2d816e3b91f 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -236,7 +236,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
         util::DateTime  aDateTimeModified;
         DateTime        aDateTime( DateTime::EMPTY );
 
-        aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDateTimeModified;
+        aCnt.getPropertyValue("DateModified") >>= aDateTimeModified;
         ::utl::typeConvert( aDateTimeModified, aDateTime );
         rData.aThemeChangeDate = aDateTime;
         rData.aThemeChangeTime = aDateTime;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 06c8d158af6c..692a67027002 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -271,7 +271,7 @@ sal_Bool FileExists( const INetURLObject& rURL )
             ::ucbhelper::Content        aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
             OUString    aTitle;
 
-            aCnt.getPropertyValue( OUString("Title") ) >>= aTitle;
+            aCnt.getPropertyValue("Title") >>= aTitle;
             bRet = ( !aTitle.isEmpty() );
         }
         catch( const ucb::ContentCreationException& )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index f2c4c5a744e1..ac342d346923 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1196,7 +1196,7 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s
         ::ucbhelper::Content         aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
         sal_Bool        bFolder = false;
 
-        aCnt.getPropertyValue( OUString("IsFolder") ) >>= bFolder;
+        aCnt.getPropertyValue("IsFolder") >>= bFolder;
 
         if( bFolder )
         {
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index c3c3e43473a5..cf8dc1ce4fdb 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -49,7 +49,7 @@ namespace
         {
             try
             {
-                const uno::Any aNumber(xSet->getPropertyValue(OUString("Number")));
+                const uno::Any aNumber(xSet->getPropertyValue("Number"));
                 aNumber >>= nRetval;
             }
             catch(const uno::Exception&)
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 9b5e9e486480..2f5d2cd83acf 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -78,8 +78,8 @@ using namespace ::com::sun::star;
         {
             // Printer and VirtualDevice, or rather: no OutDev
             uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-            const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY);
-            uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY);
+            const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance("com.sun.star.awt.UnoControlContainer"), uno::UNO_QUERY);
+            uno::Reference< awt::XControlModel > xModel(xFactory->createInstance("com.sun.star.awt.UnoControlContainerModel"), uno::UNO_QUERY);
             uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY);
             if (xControl.is())
                 xControl->setModel(xModel);
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index d00e0b8fa548..1d37bfc95ed3 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -452,7 +452,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed
     uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj));
     try
     {
-        xMan.set(xFrame->getPropertyValue( OUString("LayoutManager") ),uno::UNO_QUERY);
+        xMan.set(xFrame->getPropertyValue("LayoutManager"),uno::UNO_QUERY);
     }
     catch ( uno::Exception& )
     {
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 7a8f76383d06..ebbd5f2a4f0b 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -175,7 +175,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
             ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
-            ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( OUString( "DateModified" ) ) );
+            ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue("DateModified") );
             ::com::sun::star::util::DateTime aDateTime;
 
             aAny >>= aDateTime;
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 06697135ebab..82d7fe31ce66 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -310,7 +310,7 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj)
     uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
     if (xSet.is())
     {
-        uno::Any aValue( xSet->getPropertyValue( OUString("DefaultControl")) );
+        uno::Any aValue( xSet->getPropertyValue("DefaultControl") );
         OUString aStr;
 
         if( aValue >>= aStr )
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 61e7dfceb589..3204f2fd67f4 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -295,7 +295,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const :
 
         // Transform coordinates from internal to pixel.
         if (maShapeTreeInfo.GetViewForwarder() == NULL)
-            throw uno::RuntimeException (OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this));
+            throw uno::RuntimeException ("AccessibleCell has no valid view forwarder",static_cast<uno::XWeak*>(this));
 
         ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) );
         ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() ));
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 781a9b55c5d5..779753c45b5f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1536,7 +1536,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame
     try
     {
         Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW );
-        m_bIsWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument"));
+        m_bIsWriter = xServices->supportsService("com.sun.star.text.TextDocument");
     }
     catch(const uno::Exception& )
     {
@@ -1739,11 +1739,11 @@ struct SvxStyleToolBoxControl::Impl
         {
             Reference< style::XStyleFamiliesSupplier > xStylesSupplier( xModel, UNO_QUERY_THROW );
             Reference< lang::XServiceInfo > xServices( xModel, UNO_QUERY_THROW );
-            bSpecModeWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument"));
+            bSpecModeWriter = xServices->supportsService("com.sun.star.text.TextDocument");
             if(bSpecModeWriter)
             {
                 Reference<container::XNameAccess> xParaStyles;
-                    xStylesSupplier->getStyleFamilies()->getByName(OUString("ParagraphStyles")) >>=
+                    xStylesSupplier->getStyleFamilies()->getByName("ParagraphStyles") >>=
                     xParaStyles;
                 static const sal_Char* aWriterStyles[] =
                 {
@@ -1762,7 +1762,7 @@ struct SvxStyleToolBoxControl::Impl
                         Reference< beans::XPropertySet > xStyle;
                         xParaStyles->getByName( OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle;
                         OUString sName;
-                        xStyle->getPropertyValue(OUString("DisplayName")) >>= sName;
+                        xStyle->getPropertyValue("DisplayName") >>= sName;
                         if( !sName.isEmpty() )
                             aDefaultStyles.push_back(sName);
                     }
@@ -1795,7 +1795,7 @@ struct SvxStyleToolBoxControl::Impl
                         {
                             Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW );
                             OUString sName;
-                            xStyle->getPropertyValue(OUString("DisplayName")) >>= sName;
+                            xStyle->getPropertyValue("DisplayName") >>= sName;
                             if( !sName.isEmpty() )
                                 aDefaultStyles.push_back(sName);
                         }
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 9bbd7345a4e2..74a2abfbb2f3 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -201,7 +201,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
                 if (xPropSet.is())
                 {
                     css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-                    css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) );
+                    css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager");
                     aValue >>= xLayoutManager;
                     if (xLayoutManager.is())
                     {
@@ -937,7 +937,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
     if (xPropSet.is())
     {
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-        css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) );
+        css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager");
         aValue >>= xLayoutManager;
         if (xLayoutManager.is())
         {
@@ -1060,7 +1060,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
             return;
 
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-        css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) );
+        css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager");
         aValue >>= xLayoutManager;
         if (!xLayoutManager.is())
             return;