svx: Use appropriate OUString functions on string constants

Change-Id: I54931168bfc18c9ce41babdcf535ebc1bcc72c5e

42 files changed, 201 insertions, 208 deletions

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 838556bb3455..60ccf8e18571 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -384,8 +384,7 @@ uno::Reference<XAccessible> SAL_CALL
     }
     else
         throw lang::IndexOutOfBoundsException (
-            OUString("shape has no child with index ")
-            + OUString::number(nIndex),
+            "shape has no child with index " + OUString::number(nIndex),
             static_cast<uno::XWeak*>(this));
 
     return xChild;
@@ -1060,14 +1059,12 @@ void SAL_CALL
     AccessibleShape::notifyEvent (const document::EventObject& rEventObject)
     throw (uno::RuntimeException, std::exception)
 {
-    static const char sShapeModified[] = "ShapeModified";
-
     // First check if the event is for us.
     uno::Reference<drawing::XShape> xShape (
         rEventObject.Source, uno::UNO_QUERY);
     if ( xShape.get() == mxShape.get() )
     {
-        if (rEventObject.EventName.equals (sShapeModified))
+        if (rEventObject.EventName == "ShapeModified")
         {
             //Need to update text children when receiving ShapeModified hint when exiting edit mode for text box
             if (mpText)
diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index 454ddaf16b20..5493c782e743 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -92,7 +92,7 @@ OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (Runt
 Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames(1);
-    aNames[0] = OUString( "VCLXAccessibleSvxFindReplaceDialog" );
+    aNames[0] = "VCLXAccessibleSvxFindReplaceDialog";
     return aNames;
 }
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index c4180770a73f..fda7a3cb375a 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -377,14 +377,14 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
 {
     // a) special notification about start/stop async dispatch!
     //    FeatureDescriptor = "start" || "stop"
-    if (aEvent.FeatureDescriptor.equals(RECOVERY_OPERATIONSTATE_START))
+    if (aEvent.FeatureDescriptor == RECOVERY_OPERATIONSTATE_START)
     {
         if (m_pListener)
             m_pListener->start();
         return;
     }
 
-    if (aEvent.FeatureDescriptor.equals(RECOVERY_OPERATIONSTATE_STOP))
+    if (aEvent.FeatureDescriptor == RECOVERY_OPERATIONSTATE_STOP)
     {
         if (m_pListener)
             m_pListener->end();
@@ -394,7 +394,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
     // b) normal notification about changed items
     //    FeatureDescriptor = "Update"
     //    State             = Lits of information [seq< NamedValue >]
-    if (! aEvent.FeatureDescriptor.equals(RECOVERY_OPERATIONSTATE_UPDATE))
+    if (aEvent.FeatureDescriptor != RECOVERY_OPERATIONSTATE_UPDATE)
         return;
 
     ::comphelper::SequenceAsHashMap lInfo(aEvent.State);
@@ -1268,7 +1268,7 @@ void BrokenRecoveryDialog::impl_refresh()
         sal_uInt16 nPos = m_pFileListLB->InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
         m_pFileListLB->SetEntryData( nPos, (void*)&rInfo );
     }
-    m_sSavePath = "";
+    m_sSavePath.clear();
     m_pOkBtn->GrabFocus();
 }
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 99a8529fa7e7..4e241c64901b 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -64,9 +64,6 @@
 #define IMAP_BINARY_TYPE    OUString("*.sip")
 #define IMAP_CERN_TYPE      OUString("*.map")
 #define IMAP_NCSA_TYPE      OUString("*.map")
-#define IMAP_BINARY_EXT     OUString("sip")
-#define IMAP_CERN_EXT       OUString("map")
-#define IMAP_NCSA_EXT       OUString("map")
 
 SFX_IMPL_MODELESSDIALOG_WITHID( SvxIMapDlgChildWindow, SID_IMAP );
 
@@ -500,17 +497,17 @@ bool SvxIMapDlg::DoSave()
         if ( aFilter == aBinFilter )
         {
             nFormat = IMAP_FORMAT_BIN;
-            aExt = IMAP_BINARY_EXT;
+            aExt = "sip";
         }
         else if ( aFilter == aCERNFilter )
         {
             nFormat = IMAP_FORMAT_CERN;
-            aExt = IMAP_CERN_EXT;
+            aExt = "map";
         }
         else if ( aFilter == aNCSAFilter )
         {
             nFormat = IMAP_FORMAT_NCSA;
-            aExt = IMAP_NCSA_EXT;
+            aExt = "map";
         }
         else
         {
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 0d39472b28b2..054b67439789 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -624,7 +624,9 @@ void IMapWindow::UpdateInfo( bool bNewObj )
         }
         else
         {
-            aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = "";
+            aInfo.aMarkURL.clear();
+            aInfo.aMarkAltText.clear();
+            aInfo.aMarkTarget.clear();
             aInfo.bOneMarked = false;
             aInfo.bActivated = false;
         }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index c811632a29bf..1118a09f856d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2007,8 +2007,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
 OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
                                              bool bSrchFlag ) const
 {
-    if ( !rStr.isEmpty() )
-        rStr = "";
+    rStr.clear();
 
     SfxObjectShell* pSh = SfxObjectShell::Current();
     DBG_ASSERT( pSh, "no DocShell" );
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index c7a218447045..c594238fbe7f 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -418,7 +418,7 @@ OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumb
         return aText;
 
     if (!pRow || !pRow->IsValid())
-        aText = OUString(INVALIDTEXT);
+        aText = INVALIDTEXT;
     else if (pRow->HasField(m_nFieldPos))
     {
         aText = GetCellText( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter );
@@ -436,7 +436,7 @@ OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColu
         if (pTextCell)
             aText = pTextCell->GetText(xField, xFormatter);
         else if (m_bObject)
-            aText = OUString(OBJECTTEXT);
+            aText = OBJECTTEXT;
     }
     return aText;
 }
@@ -674,10 +674,10 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
 
     Reference< XPropertySet > xSourceProps( _rEvent.Source, UNO_QUERY );
 
-    if  (   _rEvent.PropertyName.equals( FM_PROP_VALUE )
-        ||  _rEvent.PropertyName.equals( FM_PROP_STATE )
-        ||  _rEvent.PropertyName.equals( FM_PROP_TEXT )
-        ||  _rEvent.PropertyName.equals( FM_PROP_EFFECTIVE_VALUE )
+    if  (   _rEvent.PropertyName == FM_PROP_VALUE
+        ||  _rEvent.PropertyName == FM_PROP_STATE
+        ||  _rEvent.PropertyName == FM_PROP_TEXT
+        ||  _rEvent.PropertyName == FM_PROP_EFFECTIVE_VALUE
         )
     {   // it was one of the known "value" properties
         if ( !isValuePropertyLocked() )
@@ -685,18 +685,18 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
             implValuePropertyChanged( );
         }
     }
-    else if ( _rEvent.PropertyName.equals( FM_PROP_READONLY ) )
+    else if ( _rEvent.PropertyName == FM_PROP_READONLY )
     {
         implAdjustReadOnly( xSourceProps, true);
     }
-    else if ( _rEvent.PropertyName.equals( FM_PROP_ISREADONLY ) )
+    else if ( _rEvent.PropertyName == FM_PROP_ISREADONLY )
     {
         bool bReadOnly = true;
         _rEvent.NewValue >>= bReadOnly;
         m_rColumn.SetReadOnly(bReadOnly);
         implAdjustReadOnly( xSourceProps, false);
     }
-    else if ( _rEvent.PropertyName.equals( FM_PROP_ENABLED ) )
+    else if ( _rEvent.PropertyName == FM_PROP_ENABLED )
     {
         implAdjustEnabled( xSourceProps );
     }
@@ -2418,7 +2418,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn)
 
 void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
-    if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
+    if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST )
     {
         SetList(_rEvent.NewValue);
     }
@@ -2547,7 +2547,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn)
 
 void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
-    if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
+    if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST )
     {
         SetList(_rEvent.NewValue);
     }
@@ -2632,7 +2632,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum
                 if ( aPosSeq.getLength() )
                     sText = static_cast<ListBox*>(m_pWindow)->GetEntry(aPosSeq.getConstArray()[0]);
                 else
-                    sText = "";
+                    sText.clear();
             }
         }
         catch( const Exception& )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index bf271b37b973..444e322b4f07 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -665,7 +665,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
                     aText += " *";
             }
             else
-                aText = "";
+                aText.clear();
 
             // add the number of selected rows, if applicable
             if (pParent->GetSelectRowCount())
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 145b9338108b..37fa3cfda0ef 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -47,8 +47,8 @@ namespace svxform
 
 
         // FormController
-        REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) );
-        REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) );
+        REGISTER_SERVICE( FormController, "com.sun.star.form.runtime.FormController" );
+        REGISTER_SERVICE( LegacyFormController, "com.sun.star.form.FormController" );
 
 
         // FormController - register selfaware service
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e3fdac5f1f16..e679d186ad59 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -509,7 +509,7 @@ bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::st
             {
                 case TRISTATE_FALSE: *_pCurrentText = "0"; break;
                 case TRISTATE_TRUE: *_pCurrentText = "1"; break;
-                default: *_pCurrentText = ""; break;
+                default: _pCurrentText->clear(); break;
             }
         }
         return true;
@@ -2514,7 +2514,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
     {
         pfmscContextInfo->arrFields.clear();
         pfmscContextInfo->xCursor = NULL;
-        pfmscContextInfo->strUsedFields = "";
+        pfmscContextInfo->strUsedFields.clear();
         return 0L;
     }
 
@@ -3399,10 +3399,10 @@ void FmXFormShell::CreateExternalView()
 
                 for (sal_Int32 i=0; i<aProps.getLength(); ++i, ++pProps)
                 {
-                    if (pProps->Name.equals(FM_PROP_LABEL))
+                    if (pProps->Name == FM_PROP_LABEL)
                         // already set
                         continue;
-                    if (pProps->Name.equals(FM_PROP_DEFAULTCONTROL))
+                    if (pProps->Name == FM_PROP_DEFAULTCONTROL)
                         // allow the column's own "default control"
                         continue;
                     if (pProps->Attributes & PropertyAttribute::READONLY)
@@ -4030,7 +4030,7 @@ bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>
         Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) );
         if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL)
         {
-            m_sCurrentValue = "";
+            m_sCurrentValue.clear();
             return true;
         }
     }
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 93b6f2f13646..f4cde2a2deb7 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -365,64 +365,64 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
         return OBJ_FM_CONTROL;
 
     OUString sPersistentServiceName = xPersistence->getServiceName();
-    if (sPersistentServiceName.equals(FM_COMPONENT_EDIT))   // 5.0-Name
+    if (sPersistentServiceName == FM_COMPONENT_EDIT)   // 5.0-Name
     {
         // may be a simple edit field or a formatted field, dependent of the supported services
         if (_rxObject->supportsService(FM_SUN_COMPONENT_FORMATTEDFIELD))
             return OBJ_FM_FORMATTEDFIELD;
         return OBJ_FM_EDIT;
     }
-    if (sPersistentServiceName.equals(FM_COMPONENT_TEXTFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_TEXTFIELD)
         return OBJ_FM_EDIT;
-    if (sPersistentServiceName.equals(FM_COMPONENT_COMMANDBUTTON))
+    if (sPersistentServiceName == FM_COMPONENT_COMMANDBUTTON)
         return OBJ_FM_BUTTON;
-    if (sPersistentServiceName.equals(FM_COMPONENT_FIXEDTEXT))
+    if (sPersistentServiceName == FM_COMPONENT_FIXEDTEXT)
         return OBJ_FM_FIXEDTEXT;
-    if (sPersistentServiceName.equals(FM_COMPONENT_LISTBOX))
+    if (sPersistentServiceName == FM_COMPONENT_LISTBOX)
         return OBJ_FM_LISTBOX;
-    if (sPersistentServiceName.equals(FM_COMPONENT_CHECKBOX))
+    if (sPersistentServiceName == FM_COMPONENT_CHECKBOX)
         return OBJ_FM_CHECKBOX;
-    if (sPersistentServiceName.equals(FM_COMPONENT_RADIOBUTTON))
+    if (sPersistentServiceName == FM_COMPONENT_RADIOBUTTON)
         return OBJ_FM_RADIOBUTTON;
-    if (sPersistentServiceName.equals(FM_COMPONENT_GROUPBOX))
+    if (sPersistentServiceName == FM_COMPONENT_GROUPBOX)
         return OBJ_FM_GROUPBOX;
-    if (sPersistentServiceName.equals(FM_COMPONENT_COMBOBOX))
+    if (sPersistentServiceName == FM_COMPONENT_COMBOBOX)
         return OBJ_FM_COMBOBOX;
-    if (sPersistentServiceName.equals(FM_COMPONENT_GRID))   // 5.0-Name
+    if (sPersistentServiceName == FM_COMPONENT_GRID)   // 5.0-Name
         return OBJ_FM_GRID;
-    if (sPersistentServiceName.equals(FM_COMPONENT_GRIDCONTROL))
+    if (sPersistentServiceName == FM_COMPONENT_GRIDCONTROL)
         return OBJ_FM_GRID;
-    if (sPersistentServiceName.equals(FM_COMPONENT_IMAGEBUTTON))
+    if (sPersistentServiceName == FM_COMPONENT_IMAGEBUTTON)
         return OBJ_FM_IMAGEBUTTON;
-    if (sPersistentServiceName.equals(FM_COMPONENT_FILECONTROL))
+    if (sPersistentServiceName == FM_COMPONENT_FILECONTROL)
         return OBJ_FM_FILECONTROL;
-    if (sPersistentServiceName.equals(FM_COMPONENT_DATEFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_DATEFIELD)
         return OBJ_FM_DATEFIELD;
-    if (sPersistentServiceName.equals(FM_COMPONENT_TIMEFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_TIMEFIELD)
         return OBJ_FM_TIMEFIELD;
-    if (sPersistentServiceName.equals(FM_COMPONENT_NUMERICFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_NUMERICFIELD)
         return OBJ_FM_NUMERICFIELD;
-    if (sPersistentServiceName.equals(FM_COMPONENT_CURRENCYFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_CURRENCYFIELD)
         return OBJ_FM_CURRENCYFIELD;
-    if (sPersistentServiceName.equals(FM_COMPONENT_PATTERNFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_PATTERNFIELD)
         return OBJ_FM_PATTERNFIELD;
-    if (sPersistentServiceName.equals(FM_COMPONENT_HIDDEN)) // 5.0-Name
+    if (sPersistentServiceName == FM_COMPONENT_HIDDEN) // 5.0-Name
         return OBJ_FM_HIDDEN;
-    if (sPersistentServiceName.equals(FM_COMPONENT_HIDDENCONTROL))
+    if (sPersistentServiceName == FM_COMPONENT_HIDDENCONTROL)
         return OBJ_FM_HIDDEN;
-    if (sPersistentServiceName.equals(FM_COMPONENT_IMAGECONTROL))
+    if (sPersistentServiceName == FM_COMPONENT_IMAGECONTROL)
         return OBJ_FM_IMAGECONTROL;
-    if (sPersistentServiceName.equals(FM_COMPONENT_FORMATTEDFIELD))
+    if (sPersistentServiceName == FM_COMPONENT_FORMATTEDFIELD)
     {
         OSL_FAIL("::getControlTypeByObject : suspicious persistent service name (formatted field) !");
             // objects with that service name should exist as they aren't compatible with older versions
         return OBJ_FM_FORMATTEDFIELD;
     }
-    if ( sPersistentServiceName.equals( FM_SUN_COMPONENT_SCROLLBAR ) )
+    if ( sPersistentServiceName == FM_SUN_COMPONENT_SCROLLBAR )
         return OBJ_FM_SCROLLBAR;
-    if ( sPersistentServiceName.equals( FM_SUN_COMPONENT_SPINBUTTON) )
+    if ( sPersistentServiceName == FM_SUN_COMPONENT_SPINBUTTON )
         return OBJ_FM_SPINBUTTON;
-    if (sPersistentServiceName.equals(FM_SUN_COMPONENT_NAVIGATIONBAR))
+    if ( sPersistentServiceName == FM_SUN_COMPONENT_NAVIGATIONBAR )
         return OBJ_FM_NAVIGATIONBAR;
 
     OSL_FAIL("::getControlTypeByObject : unknown object type !");
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 24edb9239218..6caf40bfbd8c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -605,7 +605,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
         }
         else
         {   // is it the DataField property ?
-            if (evt.PropertyName.equals(FM_PROP_CONTROLSOURCE))
+            if (evt.PropertyName == FM_PROP_CONTROLSOURCE)
             {
                 aSetPos->second.bHasEmptyControlSource = !evt.NewValue.hasValue() || ::comphelper::getString(evt.NewValue).isEmpty();
             }
@@ -711,7 +711,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
     else
     {
         // if it's the DataField property we may have to adjust our cache
-        if (m_pPropertySetCache && evt.PropertyName.equals(FM_PROP_CONTROLSOURCE))
+        if (m_pPropertySetCache && evt.PropertyName == FM_PROP_CONTROLSOURCE)
         {
             Reference< XPropertySet >  xSet(evt.Source, UNO_QUERY);
             PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 5e5ea8cba42c..79afdfe1c79b 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1406,11 +1406,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
 
         // The service name decides which control should be created
         sal_uInt16 nOBJID = OBJ_FM_EDIT;
-        if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_NUMERICFIELD))
+        if(OUString(_rDesc.szServiceName) == FM_SUN_COMPONENT_NUMERICFIELD)
             nOBJID = OBJ_FM_NUMERICFIELD;
-        if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_CHECKBOX))
+        if(OUString(_rDesc.szServiceName) == FM_SUN_COMPONENT_CHECKBOX)
             nOBJID = OBJ_FM_CHECKBOX;
-        if(OUString(_rDesc.szServiceName).equals(FM_COMPONENT_COMMANDBUTTON))
+        if(OUString(_rDesc.szServiceName) == FM_COMPONENT_COMMANDBUTTON)
             nOBJID = OBJ_FM_BUTTON;
 
         typedef ::com::sun::star::form::submission::XSubmission XSubmission_t;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 174774fdc906..b3b095378ed7 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -39,21 +39,21 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 
-#define RECOVERY_CMDPART_PROTOCOL                   OUString( "vnd.sun.star.autorecovery:")
+#define RECOVERY_CMDPART_PROTOCOL                   "vnd.sun.star.autorecovery:"
 
-#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE          OUString( "/doEmergencySave"         )
-#define RECOVERY_CMDPART_DO_RECOVERY                OUString( "/doAutoRecovery"          )
+#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE          "/doEmergencySave"
+#define RECOVERY_CMDPART_DO_RECOVERY                "/doAutoRecovery"
 
 #define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE      OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")
-#define RECOVERY_CMD_DO_EMERGENCY_SAVE              OUString( "vnd.sun.star.autorecovery:/doEmergencySave"       )
-#define RECOVERY_CMD_DO_RECOVERY                    OUString( "vnd.sun.star.autorecovery:/doAutoRecovery"        )
+#define RECOVERY_CMD_DO_EMERGENCY_SAVE              "vnd.sun.star.autorecovery:/doEmergencySave"
+#define RECOVERY_CMD_DO_RECOVERY                    "vnd.sun.star.autorecovery:/doAutoRecovery"
 #define RECOVERY_CMD_DO_ENTRY_BACKUP                OUString( "vnd.sun.star.autorecovery:/doEntryBackup"         )
 #define RECOVERY_CMD_DO_ENTRY_CLEANUP               OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp"        )
 
-#define PROP_STATUSINDICATOR                        OUString( "StatusIndicator"  )
-#define PROP_DISPATCHASYNCHRON                      OUString( "DispatchAsynchron")
-#define PROP_SAVEPATH                               OUString( "SavePath"         )
-#define PROP_ENTRYID                                OUString( "EntryID"          )
+#define PROP_STATUSINDICATOR                        "StatusIndicator"
+#define PROP_DISPATCHASYNCHRON                      "DispatchAsynchron"
+#define PROP_SAVEPATH                               "SavePath"
+#define PROP_ENTRYID                                "EntryID"
 
 #define STATEPROP_ID                                OUString( "ID"           )
 #define STATEPROP_STATE                             OUString( "DocumentState")
@@ -64,9 +64,9 @@
 #define STATEPROP_TITLE                             OUString( "Title"        )
 #define STATEPROP_MODULE                            OUString( "Module"       )
 
-#define RECOVERY_OPERATIONSTATE_START               OUString( "start" )
-#define RECOVERY_OPERATIONSTATE_STOP                OUString( "stop"  )
-#define RECOVERY_OPERATIONSTATE_UPDATE              OUString( "update")
+#define RECOVERY_OPERATIONSTATE_START               "start"
+#define RECOVERY_OPERATIONSTATE_STOP                "stop"
+#define RECOVERY_OPERATIONSTATE_UPDATE              "update"
 
 #define DLG_RET_UNKNOWN                                  -1
 #define DLG_RET_OK                                        1
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index ec85a53862d2..479b5da43d5c 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -28,30 +28,30 @@ namespace com { namespace sun { namespace star { namespace lang {
     class XMultiServiceFactory;
 } } } }
 
-#define FM_COMPONENT_EDIT               OUString( "stardiv.one.form.component.Edit" )
-#define FM_COMPONENT_TEXTFIELD          OUString( "stardiv.one.form.component.TextField" )
-#define FM_COMPONENT_LISTBOX            OUString( "stardiv.one.form.component.ListBox" )
-#define FM_COMPONENT_COMBOBOX           OUString( "stardiv.one.form.component.ComboBox" )
-#define FM_COMPONENT_RADIOBUTTON        OUString( "stardiv.one.form.component.RadioButton" )
-#define FM_COMPONENT_GROUPBOX           OUString( "stardiv.one.form.component.GroupBox" )
-#define FM_COMPONENT_FIXEDTEXT          OUString( "stardiv.one.form.component.FixedText" )
-#define FM_COMPONENT_COMMANDBUTTON      OUString( "stardiv.one.form.component.CommandButton" )
-#define FM_COMPONENT_CHECKBOX           OUString( "stardiv.one.form.component.CheckBox" )
-#define FM_COMPONENT_GRID               OUString( "stardiv.one.form.component.Grid" )
-#define FM_COMPONENT_GRIDCONTROL        OUString( "stardiv.one.form.component.GridControl" )
-#define FM_COMPONENT_IMAGEBUTTON        OUString( "stardiv.one.form.component.ImageButton" )
-#define FM_COMPONENT_FILECONTROL        OUString( "stardiv.one.form.component.FileControl" )
-#define FM_COMPONENT_TIMEFIELD          OUString( "stardiv.one.form.component.TimeField" )
-#define FM_COMPONENT_DATEFIELD          OUString( "stardiv.one.form.component.DateField" )
-#define FM_COMPONENT_NUMERICFIELD       OUString( "stardiv.one.form.component.NumericField" )
-#define FM_COMPONENT_CURRENCYFIELD      OUString( "stardiv.one.form.component.CurrencyField" )
-#define FM_COMPONENT_PATTERNFIELD       OUString( "stardiv.one.form.component.PatternField" )
-#define FM_COMPONENT_FORMATTEDFIELD     OUString( "stardiv.one.form.component.FormattedField" )
-#define FM_COMPONENT_HIDDEN             OUString( "stardiv.one.form.component.Hidden" )
-#define FM_COMPONENT_HIDDENCONTROL      OUString( "stardiv.one.form.component.HiddenControl" )
-#define FM_COMPONENT_IMAGECONTROL       OUString( "stardiv.one.form.component.ImageControl" )
-#define FM_CONTROL_GRID                 OUString( "stardiv.one.form.control.Grid" )
-#define FM_CONTROL_GRIDCONTROL          OUString( "stardiv.one.form.control.GridControl" )
+#define FM_COMPONENT_EDIT               "stardiv.one.form.component.Edit"
+#define FM_COMPONENT_TEXTFIELD          "stardiv.one.form.component.TextField"
+#define FM_COMPONENT_LISTBOX            "stardiv.one.form.component.ListBox"
+#define FM_COMPONENT_COMBOBOX           "stardiv.one.form.component.ComboBox"
+#define FM_COMPONENT_RADIOBUTTON        "stardiv.one.form.component.RadioButton"
+#define FM_COMPONENT_GROUPBOX           "stardiv.one.form.component.GroupBox"
+#define FM_COMPONENT_FIXEDTEXT          "stardiv.one.form.component.FixedText"
+#define FM_COMPONENT_COMMANDBUTTON      "stardiv.one.form.component.CommandButton"
+#define FM_COMPONENT_CHECKBOX           "stardiv.one.form.component.CheckBox"
+#define FM_COMPONENT_GRID               "stardiv.one.form.component.Grid"
+#define FM_COMPONENT_GRIDCONTROL        "stardiv.one.form.component.GridControl"
+#define FM_COMPONENT_IMAGEBUTTON        "stardiv.one.form.component.ImageButton"
+#define FM_COMPONENT_FILECONTROL        "stardiv.one.form.component.FileControl"
+#define FM_COMPONENT_TIMEFIELD          "stardiv.one.form.component.TimeField"
+#define FM_COMPONENT_DATEFIELD          "stardiv.one.form.component.DateField"
+#define FM_COMPONENT_NUMERICFIELD       "stardiv.one.form.component.NumericField"
+#define FM_COMPONENT_CURRENCYFIELD      "stardiv.one.form.component.CurrencyField"
+#define FM_COMPONENT_PATTERNFIELD       "stardiv.one.form.component.PatternField"
+#define FM_COMPONENT_FORMATTEDFIELD     "stardiv.one.form.component.FormattedField"
+#define FM_COMPONENT_HIDDEN             "stardiv.one.form.component.Hidden"
+#define FM_COMPONENT_HIDDENCONTROL      "stardiv.one.form.component.HiddenControl"
+#define FM_COMPONENT_IMAGECONTROL       "stardiv.one.form.component.ImageControl"
+#define FM_CONTROL_GRID                 "stardiv.one.form.control.Grid"
+#define FM_CONTROL_GRIDCONTROL          "stardiv.one.form.control.GridControl"
 #define SRV_SDB_CONNECTION              OUString( "com.sun.star.sdb.Connection" )
 #define FM_SUN_COMPONENT_FORM           OUString( "com.sun.star.form.component.Form" )
 #define FM_SUN_COMPONENT_TEXTFIELD      OUString( "com.sun.star.form.component.TextField" )
@@ -61,22 +61,22 @@ namespace com { namespace sun { namespace star { namespace lang {
 #define FM_SUN_COMPONENT_GROUPBOX       OUString( "com.sun.star.form.component.GroupBox" )
 #define FM_SUN_COMPONENT_FIXEDTEXT      OUString( "com.sun.star.form.component.FixedText" )
 #define FM_SUN_COMPONENT_COMMANDBUTTON  OUString( "com.sun.star.form.component.CommandButton" )
-#define FM_SUN_COMPONENT_CHECKBOX       OUString( "com.sun.star.form.component.CheckBox" )
+#define FM_SUN_COMPONENT_CHECKBOX       "com.sun.star.form.component.CheckBox"
 #define FM_SUN_COMPONENT_GRIDCONTROL    OUString( "com.sun.star.form.component.GridControl" )
 #define FM_SUN_COMPONENT_IMAGEBUTTON    OUString( "com.sun.star.form.component.ImageButton" )
 #define FM_SUN_COMPONENT_FILECONTROL    OUString( "com.sun.star.form.component.FileControl" )
 #define FM_SUN_COMPONENT_TIMEFIELD      OUString( "com.sun.star.form.component.TimeField" )
 #define FM_SUN_COMPONENT_DATEFIELD      OUString( "com.sun.star.form.component.DateField" )
-#define FM_SUN_COMPONENT_NUMERICFIELD   OUString( "com.sun.star.form.component.NumericField" )
+#define FM_SUN_COMPONENT_NUMERICFIELD   "com.sun.star.form.component.NumericField"
 #define FM_SUN_COMPONENT_CURRENCYFIELD  OUString( "com.sun.star.form.component.CurrencyField" )
 #define FM_SUN_COMPONENT_PATTERNFIELD   OUString( "com.sun.star.form.component.PatternField" )
 #define FM_SUN_COMPONENT_HIDDENCONTROL  OUString( "com.sun.star.form.component.HiddenControl" )
 #define FM_SUN_COMPONENT_IMAGECONTROL   OUString( "com.sun.star.form.component.DatabaseImageControl" )
 #define FM_SUN_COMPONENT_FORMATTEDFIELD OUString( "com.sun.star.form.component.FormattedField" )
-#define FM_SUN_COMPONENT_SCROLLBAR      OUString( "com.sun.star.form.component.ScrollBar" )
-#define FM_SUN_COMPONENT_SPINBUTTON     OUString( "com.sun.star.form.component.SpinButton" )
-#define FM_SUN_COMPONENT_NAVIGATIONBAR  OUString( "com.sun.star.form.component.NavigationToolBar" )
-#define FM_SUN_CONTROL_GRIDCONTROL      OUString( "com.sun.star.form.control.GridControl" )
+#define FM_SUN_COMPONENT_SCROLLBAR      "com.sun.star.form.component.ScrollBar"
+#define FM_SUN_COMPONENT_SPINBUTTON     "com.sun.star.form.component.SpinButton"
+#define FM_SUN_COMPONENT_NAVIGATIONBAR  "com.sun.star.form.component.NavigationToolBar"
+#define FM_SUN_CONTROL_GRIDCONTROL      "com.sun.star.form.control.GridControl"
 
 namespace svxform
 {
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 3182e4be0a46..878eea656ff0 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -27,7 +27,7 @@
 #define FMURL_RECORD_MOVENEXT              OUString( ".uno:FormController/moveToNext" )
 #define FMURL_RECORD_MOVELAST              OUString( ".uno:FormController/moveToLast" )
 #define FMURL_RECORD_MOVETONEW             OUString( ".uno:FormController/moveToNew" )
-#define FMURL_RECORD_UNDO                  OUString( ".uno:FormController/undoRecord" )
+#define FMURL_RECORD_UNDO                  ".uno:FormController/undoRecord"
 #define FMURL_RECORD_SAVE                  OUString( ".uno:FormController/saveRecord" )
 #define FMURL_RECORD_DELETE                OUString( ".uno:FormController/deleteRecord" )
 #define FMURL_FORM_REFRESH                 OUString( ".uno:FormController/refreshForm" )
@@ -39,14 +39,14 @@
 #define FMURL_FORM_FILTER                  OUString( ".uno:FormController/filter" )
 #define FMURL_FORM_APPLY_FILTER            OUString( ".uno:FormController/applyFilter" )
 #define FMURL_FORM_REMOVE_FILTER           OUString( ".uno:FormController/removeFilterOrder" )
-#define FMURL_CONFIRM_DELETION             OUString( ".uno:FormSlots/ConfirmDeletion" )
-#define FMURL_COMPONENT_FORMGRIDVIEW       OUString( ".component:DB/FormGridView" )
-#define FMURL_GRIDVIEW_CLEARVIEW           OUString( ".uno:FormSlots/ClearView" )
-#define FMURL_GRIDVIEW_ADDCOLUMN           OUString( ".uno:FormSlots/AddGridColumn" )
-#define FMURL_GRIDVIEW_ATTACHTOFORM        OUString( ".uno:FormSlots/AttachToForm" )
-#define FMARG_ATTACHTO_MASTERFORM          OUString( "MasterForm" )
-#define FMARG_ADDCOL_COLUMNTYPE            OUString( "ColumnType" )
-#define FMARG_ADDCOL_COLUMNPOS             OUString( "ColumnPosition" )
+#define FMURL_CONFIRM_DELETION             ".uno:FormSlots/ConfirmDeletion"
+#define FMURL_COMPONENT_FORMGRIDVIEW       ".component:DB/FormGridView"
+#define FMURL_GRIDVIEW_CLEARVIEW           ".uno:FormSlots/ClearView"
+#define FMURL_GRIDVIEW_ADDCOLUMN           ".uno:FormSlots/AddGridColumn"
+#define FMURL_GRIDVIEW_ATTACHTOFORM        ".uno:FormSlots/AttachToForm"
+#define FMARG_ATTACHTO_MASTERFORM          "MasterForm"
+#define FMARG_ADDCOL_COLUMNTYPE            "ColumnType"
+#define FMARG_ADDCOL_COLUMNPOS             "ColumnPosition"
 
 #endif // INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index a3881dad6510..180337f7f5b9 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
@@ -22,16 +22,16 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-#define FM_COL_TEXTFIELD      OUString( "TextField" )
-#define FM_COL_COMBOBOX       OUString( "ComboBox" )
-#define FM_COL_CHECKBOX       OUString( "CheckBox" )
-#define FM_COL_TIMEFIELD      OUString( "TimeField" )
-#define FM_COL_DATEFIELD      OUString( "DateField" )
-#define FM_COL_NUMERICFIELD   OUString( "NumericField" )
-#define FM_COL_CURRENCYFIELD  OUString( "CurrencyField" )
-#define FM_COL_PATTERNFIELD   OUString( "PatternField" )
-#define FM_COL_LISTBOX        OUString( "ListBox" )
-#define FM_COL_FORMATTEDFIELD OUString( "FormattedField" )
+#define FM_COL_TEXTFIELD      "TextField"
+#define FM_COL_COMBOBOX       "ComboBox"
+#define FM_COL_CHECKBOX       "CheckBox"
+#define FM_COL_TIMEFIELD      "TimeField"
+#define FM_COL_DATEFIELD      "DateField"
+#define FM_COL_NUMERICFIELD   "NumericField"
+#define FM_COL_CURRENCYFIELD  "CurrencyField"
+#define FM_COL_PATTERNFIELD   "PatternField"
+#define FM_COL_LISTBOX        "ListBox"
+#define FM_COL_FORMATTEDFIELD "FormattedField"
 
 // column type ids
 #define TYPE_CHECKBOX       0
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 76b00efff2b1..a3fabc6dbf53 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -88,7 +88,7 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
         case SVX_VALUE_TYPE_NUMBER:
         case SVX_VALUE_TYPE_UNDEFINED:
         default:
-            aValStr = "";
+            aValStr.clear();
     }
 }
 
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 928b6908fc88..bdd0a7a8cb1d 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -69,7 +69,7 @@ bool SvxRotateModeItem::GetPresentation(
                                 SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
                                 OUString& rText, const IntlWrapper * )  const
 {
-    rText = "";
+    rText.clear();
 
     switch ( ePres )
     {
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 304d48f6d68a..4e303a57802f 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -100,9 +100,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM
         case 0 :
         {
             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS );
-            aSeq[0].Name = OUString( VIEWLAYOUT_PARAM_COLUMNS );
+            aSeq[0].Name = VIEWLAYOUT_PARAM_COLUMNS;
             aSeq[0].Value <<= sal_Int32( GetValue() );
-            aSeq[1].Name = OUString( VIEWLAYOUT_PARAM_BOOKMODE );
+            aSeq[1].Name = VIEWLAYOUT_PARAM_BOOKMODE;
             aSeq[1].Value <<= mbBookMode;
             rVal <<= aSeq;
         }
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index a26a30b2cbb0..2c980e02d5b5 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -98,13 +98,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM
         case 0 :
             {
                 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS );
-                aSeq[0].Name = OUString( ZOOMSLIDER_PARAM_CURRENTZOOM );
+                aSeq[0].Name = ZOOMSLIDER_PARAM_CURRENTZOOM;
                 aSeq[0].Value <<= sal_Int32( GetValue() );
-                aSeq[1].Name = OUString( ZOOMSLIDER_PARAM_SNAPPINGPOINTS );
+                aSeq[1].Name = ZOOMSLIDER_PARAM_SNAPPINGPOINTS;
                 aSeq[1].Value <<= maValues;
-                aSeq[2].Name = OUString( ZOOMSLIDER_PARAM_MINZOOM );
+                aSeq[2].Name = ZOOMSLIDER_PARAM_MINZOOM;
                 aSeq[2].Value <<= mnMinZoom;
-                aSeq[3].Name = OUString( ZOOMSLIDER_PARAM_MAXZOOM );
+                aSeq[3].Name = ZOOMSLIDER_PARAM_MAXZOOM;
                 aSeq[3].Value <<= mnMaxZoom;
                 rVal <<= aSeq;
             }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 4568e1696421..d3dcf9714d1c 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -475,7 +475,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
 {
     bool bOk=false;
     OUString& rStr=pFI->GetRepresentation();
-    rStr = "";
+    rStr.clear();
     SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
     if (pTextObj!=NULL) {
         Color* pTxtCol=NULL;
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 03b092b3809f..69deb579b8c2 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1215,13 +1215,13 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool
 
         if(IsGradient())
         {
-            aString = "";
+            aString.clear();
             XFillGradientItem aNewGradItem(aString, aGradTransGradient.aGradient);
             aNewSet.Put(aNewGradItem);
         }
         else
         {
-            aString = "";
+            aString.clear();
             XFillFloatTransparenceItem aNewTransItem(aString, aGradTransGradient.aGradient);
             aNewSet.Put(aNewTransItem);
         }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 22f1733aaa4e..2b0dc96be6aa 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -931,22 +931,22 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
                 if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
                     OUString aCommentStr;
 
-                    INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,OUString("L I N E"));
-                    INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,OUString("F I L L"));
-                    INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,OUString("F O N T W O R K"));
-                    INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,OUString("S H A D O W"));
-                    INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,OUString("C A P T I O N"));
-                    INSERTCOMMENT(SDRATTR_MISC_FIRST,SDRATTR_MISC_LAST,OUString("M I S C E L L A N E O U S"));
-                    INSERTCOMMENT(SDRATTR_EDGE_FIRST,SDRATTR_EDGE_LAST,OUString("C O N N E C T O R"));
-                    INSERTCOMMENT(SDRATTR_MEASURE_FIRST,SDRATTR_MEASURE_LAST,OUString("D I M E N S I O N"));
-                    INSERTCOMMENT(SDRATTR_CIRC_FIRST,SDRATTR_CIRC_LAST,OUString("C I R C U L A R"));
-                    INSERTCOMMENT(SDRATTR_NOTPERSIST_FIRST,SDRATTR_NOTPERSIST_LAST,OUString("N O T P E R S I S T"));
-                    INSERTCOMMENT(SDRATTR_MOVEX,SDRATTR_VERTSHEARONE,OUString("Transformation of all object individually"));
-                    INSERTCOMMENT(SDRATTR_RESIZEXALL,SDRATTR_VERTSHEARALL,OUString("Transformation of all objects together"));
-                    INSERTCOMMENT(SDRATTR_TRANSFORMREF1X,SDRATTR_TRANSFORMREF2Y,OUString("V I E W R E F E R E N C E P O I N T S"));
-                    INSERTCOMMENT(SDRATTR_GRAF_FIRST,SDRATTR_GRAF_LAST,OUString("G R A P H I C"));
-                    INSERTCOMMENT(EE_ITEMS_START,EE_ITEMS_END,OUString("E D I T  E N G I N E"));
-                    INSERTCOMMENT(EE_ITEMS_END+1,EE_ITEMS_END+1,OUString("... by Joe Merten, JME Engineering Berlin ..."));
+                    INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,"L I N E");
+                    INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,"F I L L");
+                    INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,"F O N T W O R K");
+                    INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,"S H A D O W");
+                    INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,"C A P T I O N");
+                    INSERTCOMMENT(SDRATTR_MISC_FIRST,SDRATTR_MISC_LAST,"M I S C E L L A N E O U S");
+                    INSERTCOMMENT(SDRATTR_EDGE_FIRST,SDRATTR_EDGE_LAST,"C O N N E C T O R");
+                    INSERTCOMMENT(SDRATTR_MEASURE_FIRST,SDRATTR_MEASURE_LAST,"D I M E N S I O N");
+                    INSERTCOMMENT(SDRATTR_CIRC_FIRST,SDRATTR_CIRC_LAST,"C I R C U L A R");
+                    INSERTCOMMENT(SDRATTR_NOTPERSIST_FIRST,SDRATTR_NOTPERSIST_LAST,"N O T P E R S I S T");
+                    INSERTCOMMENT(SDRATTR_MOVEX,SDRATTR_VERTSHEARONE,"Transformation of all object individually");
+                    INSERTCOMMENT(SDRATTR_RESIZEXALL,SDRATTR_VERTSHEARALL,"Transformation of all objects together");
+                    INSERTCOMMENT(SDRATTR_TRANSFORMREF1X,SDRATTR_TRANSFORMREF2Y,"V I E W R E F E R E N C E P O I N T S");
+                    INSERTCOMMENT(SDRATTR_GRAF_FIRST,SDRATTR_GRAF_LAST,"G R A P H I C");
+                    INSERTCOMMENT(EE_ITEMS_START,EE_ITEMS_END,"E D I T  E N G I N E");
+                    INSERTCOMMENT(EE_ITEMS_END+1,EE_ITEMS_END+1,"... by Joe Merten, JME Engineering Berlin ...");
 
                     if (!aCommentStr.isEmpty())
                     {
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f2c0f9e2c18a..5c2db6fb35fd 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1121,7 +1121,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, OUString& rStr)
         case FUNIT_NONE   :
         case FUNIT_CUSTOM :
         {
-            rStr = "";
+            rStr.clear();
             break;
         }
         case FUNIT_100TH_MM:
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b60cdd18ceca..20c1decfc840 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -630,9 +630,9 @@ void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const OUString& rRefe
 void SdrGrafObj::ReleaseGraphicLink()
 {
     ImpLinkAbmeldung();
-    aFileName = "";
-    aReferer = "";
-    aFilterName = "";
+    aFileName.clear();
+    aReferer.clear();
+    aFilterName.clear();
 }
 
 bool SdrGrafObj::IsLinkedGraphic() const
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index b59409bf823a..048ceb911455 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -130,8 +130,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind
 
                 if(!aFact.IsValid())
                 {
-                    aStr = "";
-                    aStr += "?";
+                    aStr = "?";
                 }
 
                 sal_Unicode cDec(SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]);
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 0a7615f7df9e..9d21a5eb6eab 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -380,7 +380,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
         m_pImpl->m_MediaProperties.setURL(
             m_pImpl->m_LastFailedPkgURL, tempFileURL, "");
     }
-    m_pImpl->m_LastFailedPkgURL = ""; // once only
+    m_pImpl->m_LastFailedPkgURL.clear(); // once only
 }
 
 /// copy a stream from XStorage to temp file
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 21896f051524..2f495acf2293 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -996,7 +996,7 @@ void SdrOle2Obj::BreakFileLink_Impl()
                 uno::Reference< embed::XLinkageSupport > xLinkSupport( mpImpl->mxObjRef.GetObject(), uno::UNO_QUERY_THROW );
                 xLinkSupport->breakLink( xStorage, mpImpl->aPersistName );
                 DisconnectFileLink_Impl();
-                mpImpl->maLinkURL = "";
+                mpImpl->maLinkURL.clear();
             }
             catch( ::com::sun::star::uno::Exception& )
             {
@@ -1577,7 +1577,7 @@ void SdrOle2Obj::SetPersistName( const OUString& rPersistName )
 
 void SdrOle2Obj::AbandonObject()
 {
-    mpImpl->aPersistName = "";
+    mpImpl->aPersistName.clear();
     mpImpl->mbLoadingOLEObjectFailed = false;
     SetObjRef(0);
 }
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index bdc898e43abc..6ba01a3b1874 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1036,7 +1036,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
         Point aBeg(rDrag.GetStart());
         Point aNow(rDrag.GetNow());
 
-        aStr = "";
+        aStr.clear();
         aStr += "dx=";
         mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, true);
         aStr += aMetr;
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 3e955521c99a..6ecfa1fcfac8 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1282,7 +1282,7 @@ OUString SdrView::GetStatusText()
                 }
             }
         } else {
-            aStr = "";
+            aStr.clear();
         }
     }
     else if(!aName.isEmpty())
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index b0e70db75ff9..d6defe8ffbcb 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -112,15 +112,15 @@ void PaletteGPL::LoadPalette()
             OString token;
 
             token = lcl_getToken(aLine, nIndex);
-            if(token == "" || nIndex == -1) continue;
+            if(token.isEmpty() || nIndex == -1) continue;
             sal_Int32 r = token.toInt32();
 
             token = lcl_getToken(aLine, nIndex);
-            if(token == "" || nIndex == -1) continue;
+            if(token.isEmpty() || nIndex == -1) continue;
             sal_Int32 g = token.toInt32();
 
             token = lcl_getToken(aLine, nIndex);
-            if(token == "") continue;
+            if(token.isEmpty()) continue;
             sal_Int32 b = token.toInt32();
 
             OString name;
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index ae2c111570d8..617d6609d41a 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -74,7 +74,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
 {
     css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create( rxContext ) );
     css::util::URL aURL;
-    aURL.Complete = OUString(COMMAND_EXECUTESEARCH);
+    aURL.Complete = COMMAND_EXECUTESEARCH;
     xURLTransformer->parseStrict(aURL);
 
     OUString sFindText;
@@ -100,23 +100,23 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
     }
 
     css::uno::Sequence< css::beans::PropertyValue > lArgs(6);
-    lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING);
+    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
     lArgs[0].Value <<= sFindText;
-    lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD);
+    lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
     lArgs[1].Value <<= aSearchBackwards;
-    lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS);
+    lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
     lArgs[2].Value <<= (sal_Int32)0;
-    lArgs[3].Name = OUString(SEARCHITEM_TRANSLITERATEFLAGS);
+    lArgs[3].Name = SEARCHITEM_TRANSLITERATEFLAGS;
     SvtCTLOptions aCTLOptions;
     sal_Int32 nFlags = 0;
     nFlags |= (!aMatchCase ? static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
     nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
     nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 );
     lArgs[3].Value <<= nFlags;
-    lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
+    lArgs[4].Name = SEARCHITEM_COMMAND;
     lArgs[4].Value <<= (sal_Int16)(aFindAll ?
         SVX_SEARCHCMD_FIND_ALL : SVX_SEARCHCMD_FIND );
-    lArgs[5].Name = OUString(SEARCHITEM_ALGORITHMTYPE);
+    lArgs[5].Name = SEARCHITEM_ALGORITHMTYPE;
     lArgs[5].Value <<= (sal_Int16)0;  // 0 == SearchAlgorithms_ABSOLUTE
 
     css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY);
@@ -592,7 +592,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
     impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP );
 
     css::frame::FeatureStateEvent aEvent;
-    aEvent.FeatureURL.Complete = OUString(COMMAND_APPENDSEARCHHISTORY);
+    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
     css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
     if (xStatusListener.is())
         xStatusListener->statusChanged( aEvent );
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 1b8645595bd4..0de8dbbf73cf 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -213,15 +213,15 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString
         m_pDialog->getSettings( bDirectionToSimplified, bTranslateCommonTerms );
     }
 
-    if( rPropertyName.equals( "IsDirectionToSimplified" ) )
+    if( rPropertyName == "IsDirectionToSimplified" )
     {
         aRet <<= bDirectionToSimplified;
     }
-    else if( rPropertyName.equals( "IsUseCharacterVariants" ) )
+    else if( rPropertyName == "IsUseCharacterVariants" )
     {
         aRet <<= bUseCharacterVariants;
     }
-    else if( rPropertyName.equals( "IsTranslateCommonTerms" ) )
+    else if( rPropertyName == "IsTranslateCommonTerms" )
     {
         aRet <<= bTranslateCommonTerms;
     }
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 30b672789104..1f837a939a5a 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -370,8 +370,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                         aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
                         break;
                     case SVX_NUMBER_NONE:
-                        aPageNumValue = "";
-                        aPageNumValue += " ";
+                        aPageNumValue = " ";
                         break;
                     default:
                         aPageNumValue += OUString::number( (sal_Int32)mnPageNumber );
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 425e9719f95d..c96fe65f0529 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -263,11 +263,11 @@ static bool delete_pending_crash()
 RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL)
 {
     m_eJob = RecoveryUI::E_JOB_UNKNOWN;
-    if (aURL.Protocol.equals(RECOVERY_CMDPART_PROTOCOL))
+    if (aURL.Protocol == RECOVERY_CMDPART_PROTOCOL)
     {
-        if (aURL.Path.equals(RECOVERY_CMDPART_DO_EMERGENCY_SAVE))
+        if (aURL.Path == RECOVERY_CMDPART_DO_EMERGENCY_SAVE)
             m_eJob = RecoveryUI::E_DO_EMERGENCY_SAVE;
-        else if (aURL.Path.equals(RECOVERY_CMDPART_DO_RECOVERY))
+        else if (aURL.Path == RECOVERY_CMDPART_DO_RECOVERY)
             m_eJob = RecoveryUI::E_DO_RECOVERY;
     }
 
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 0f93277ee927..111883e94c48 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -347,7 +347,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
             if( pGraphic )
             {
                 GraphicObject aObj( *pGraphic );
-                aURL = OUString( UNO_NAME_GRAPHOBJ_URLPREFIX);
+                aURL = UNO_NAME_GRAPHOBJ_URLPREFIX;
                 aURL += OStringToOUString(aObj.GetUniqueID(),
                     RTL_TEXTENCODING_ASCII_US);
             }
@@ -367,7 +367,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
             {
                 ::comphelper::IEmbeddedHelper *pPersist = mpObj->GetModel()->GetPersist();
                 if( (NULL == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) )
-                    aPersistName = "";
+                    aPersistName.clear();
             }
         }
 
@@ -536,7 +536,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID)
 
     if( pOle2Obj )
     {
-        rHexCLSID = "";
+        rHexCLSID.clear();
 
         if( pOle2Obj->IsEmpty() )
         {
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index fc9a12768cb4..83c6f77843d4 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1666,7 +1666,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
 
     if ((pMap->nFlags & beans::PropertyAttribute::READONLY) != 0)
         throw beans::PropertyVetoException(
-            OUString("Readonly property can't be set: ") + rPropertyName,
+            "Readonly property can't be set: " + rPropertyName,
             uno::Reference<drawing::XShape>(this));
 
     mpModel->SetChanged();
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index f09d9513a542..07132555a233 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -188,7 +188,7 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(const OUString& _aURLNoPar,
     sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' );
     if( -1 == _nPos )
     {
-        rContainerStorageName = "";
+        rContainerStorageName.clear();
         rObjectStorageName = aURLNoPar;
     }
     else
@@ -290,7 +290,7 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
         nPos = aURLNoPar.lastIndexOf( '/' );
         if( -1 == nPos )
         {
-            rContainerStorageName = "";
+            rContainerStorageName.clear();
             rObjectStorageName = aURLNoPar.copy( nPathStart );
         }
         else if( nPos > nPathStart )
@@ -480,7 +480,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL(
         }
 
         ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 );
-        sRetURL = OUString( XML_EMBEDDEDOBJECT_URL_BASE );
+        sRetURL = XML_EMBEDDEDOBJECT_URL_BASE;
         sRetURL += aObjectStorageName;
 
         if( pOut )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 4dcd264077bf..033cc699c801 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -622,7 +622,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt
                     RTL_TEXTENCODING_ASCII_US);
             }
             else
-                rURLPair.second = "";
+                rURLPair.second.clear();
         }
         else
         {
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 0a16759726e8..a24689b2478d 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -33,10 +33,10 @@
 #include <sax/tools/converter.hxx>
 #include <boost/scoped_array.hpp>
 
-#define FORMAT_BMP  OUString("bmp")
-#define FORMAT_GIF  OUString("gif")
-#define FORMAT_JPG  OUString("jpg")
-#define FORMAT_PNG  OUString("png")
+#define FORMAT_BMP  "bmp"
+#define FORMAT_GIF  "gif"
+#define FORMAT_JPG  "jpg"
+#define FORMAT_PNG  "png"
 
 GraphicFilter* XOutBitmap::pGrfFilter = NULL;
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 06e44c472bc6..ae7e2406256d 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -156,7 +156,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
                 if( !pCompareValueFunc( pItem, pCheckItem ) )
                 {
                     // same name but different value, we need a new name for this item
-                    aUniqueName = "";
+                    aUniqueName.clear();
                     bForceNew = true;
                 }
                 break;
@@ -1392,7 +1392,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
                     if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() )
                     {
                         // same name but different value, we need a new name for this item
-                        aUniqueName = "";
+                        aUniqueName.clear();
                         bForceNew = true;
                     }
                     break;
@@ -1414,7 +1414,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
                         if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() )
                         {
                             // same name but different value, we need a new name for this item
-                            aUniqueName = "";
+                            aUniqueName.clear();
                             bForceNew = true;
                         }
                         break;
@@ -1438,7 +1438,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
                     if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() )
                     {
                         // same name but different value, we need a new name for this item
-                        aUniqueName = "";
+                        aUniqueName.clear();
                         bForceNew = true;
                     }
                     break;
@@ -1459,7 +1459,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
                         if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() )
                         {
                             // same name but different value, we need a new name for this item
-                            aUniqueName = "";
+                            aUniqueName.clear();
                             bForceNew = true;
                         }
                         break;
@@ -1675,7 +1675,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
                     if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() )
                     {
                         // same name but different value, we need a new name for this item
-                        aUniqueName = "";
+                        aUniqueName.clear();
                         bForceNew = true;
                     }
                     break;
@@ -1697,7 +1697,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
                         if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() )
                         {
                             // same name but different value, we need a new name for this item
-                            aUniqueName = "";
+                            aUniqueName.clear();
                             bForceNew = true;
                         }
                         break;
@@ -1721,7 +1721,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
                     if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() )
                     {
                         // same name but different value, we need a new name for this item
-                        aUniqueName = "";
+                        aUniqueName.clear();
                         bForceNew = true;
                     }
                     break;
@@ -1742,7 +1742,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
                         if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() )
                         {
                             // same name but different value, we need a new name for this item
-                            aUniqueName = "";
+                            aUniqueName.clear();
                             bForceNew = true;
                         }
                         break;