Change GetSavedValue() to return OUString

removed temporarily added OUString(...GetSavedValue()...) constructs again

Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6

52 files changed, 164 insertions, 171 deletions

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 024e140504b3..cc4fde89e07f 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -701,7 +701,7 @@ namespace svx
     //-------------------------------------------------------------------------
     IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
     {
-        m_aFind.Enable( OUString(m_pPlayground->GetWordInputControl().GetSavedValue()) != m_pPlayground->GetWordInputControl().GetText() );
+        m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
 
         bool bSameLen = m_pPlayground->GetWordInputControl().GetText().getLength() == m_pPlayground->GetCurrentText().Len();
         m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChange, m_bDocumentMode && bSameLen );
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index cca9402c5ded..a41c945e0aee 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -894,7 +894,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
         bAppearanceChanged = sal_True;
     }
 
-    if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().ToInt32() )
+    if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().toInt32() )
     {
         pAppearanceCfg->SetFontAntialiasingMinPixelHeight( aAAPointLimit.GetValue() );
         bAppearanceChanged = sal_True;
@@ -1478,7 +1478,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
 
     // Configured date acceptance patterns, for example Y-M-D;M-D or empty for
     // locale default.
-    if (aDatePatternsED.GetText() != OUString(aDatePatternsED.GetSavedValue()))
+    if (aDatePatternsED.GetText() != aDatePatternsED.GetSavedValue())
         pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( aDatePatternsED.GetText());
 
     SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 21278cf8b4d0..5a1438b2073d 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -483,7 +483,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl()
 
     // modified?
     for (unsigned i = 0; i != vFields.size(); ++i)
-        if (OUString(vFields[i]->aEdit.GetSavedValue()) != vFields[i]->aEdit.GetText())
+        if (vFields[i]->aEdit.GetSavedValue() != vFields[i]->aEdit.GetText())
             return true;
     return false;
 }
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9bccdd0ddd55..c21db1da76fb 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -414,52 +414,45 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
             bModified = sal_True;
         }
 
-        if(OUString(aHttpProxyED.GetSavedValue()) != aHttpProxyED.GetText())
+        if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText())
         {
-            xPropertySet->setPropertyValue( aHttpProxyPN,
-                makeAny(rtl::OUString(aHttpProxyED.GetText())));
+            xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(aHttpProxyED.GetText()));
             bModified = sal_True;
         }
 
-        if ( OUString(aHttpPortED.GetSavedValue()) != aHttpPortED.GetText() )
+        if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpPortPN,
-                makeAny(aHttpPortED.GetText().toInt32()));
+            xPropertySet->setPropertyValue( aHttpPortPN, makeAny(aHttpPortED.GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if(OUString(aHttpsProxyED.GetSavedValue()) != aHttpsProxyED.GetText())
+        if( aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpsProxyPN,
-                makeAny(rtl::OUString(aHttpsProxyED.GetText())));
+            xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(aHttpsProxyED.GetText()) );
             bModified = sal_True;
         }
 
-        if ( OUString(aHttpsPortED.GetSavedValue()) != aHttpsPortED.GetText() )
+        if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() )
         {
-            xPropertySet->setPropertyValue( aHttpsPortPN,
-                makeAny(aHttpsPortED.GetText().toInt32()));
+            xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(aHttpsPortED.GetText().toInt32()) );
             bModified = sal_True;
         }
 
-        if(OUString(aFtpProxyED.GetSavedValue()) != aFtpProxyED.GetText())
+        if( aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText())
         {
-            xPropertySet->setPropertyValue( aFtpProxyPN,
-                makeAny( rtl::OUString(aFtpProxyED.GetText())));
+            xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(aFtpProxyED.GetText()) );
             bModified = sal_True;
         }
 
-        if ( OUString(aFtpPortED.GetSavedValue()) != aFtpPortED.GetText() )
+        if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() )
         {
-            xPropertySet->setPropertyValue( aFtpPortPN,
-                makeAny(aFtpPortED.GetText().toInt32()));
+            xPropertySet->setPropertyValue( aFtpPortPN, makeAny(aFtpPortED.GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if ( OUString(aNoProxyForED.GetSavedValue()) != aNoProxyForED.GetText() )
+        if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() )
         {
-            xPropertySet->setPropertyValue( aNoProxyDescPN,
-                makeAny( rtl::OUString(aNoProxyForED.GetText())));
+            xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( aNoProxyForED.GetText()));
             bModified = sal_True;
         }
 
@@ -1386,7 +1379,7 @@ SfxTabPage*  SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
 sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bMailModified = sal_False;
-    if(!pImpl->aMailConfig.bROProgram && OUString(aMailerURLED.GetSavedValue()) != aMailerURLED.GetText())
+    if(!pImpl->aMailConfig.bROProgram && aMailerURLED.GetSavedValue() != aMailerURLED.GetText())
     {
         pImpl->aMailConfig.sProgram = aMailerURLED.GetText();
         bMailModified = sal_True;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 48e120fe7159..e5c43f79cf11 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -176,7 +176,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
     boost::shared_ptr< comphelper::ConfigurationChanges > batch(
         comphelper::ConfigurationChanges::create());
 
-    if ( aUndoEdit.GetText() != OUString(aUndoEdit.GetSavedValue()) )
+    if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() )
         officecfg::Office::Common::Undo::Steps::set(
             aUndoEdit.GetValue(), batch);
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 14d3a193dbcd..918a11fc1492 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -310,7 +310,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
         bModified |= sal_True;
     }
 
-    if ( aAutoSaveEdit.GetText() != OUString(aAutoSaveEdit.GetSavedValue()) )
+    if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() )
     {
         rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
                                  (sal_uInt16)aAutoSaveEdit.GetValue() ) );
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index afad498a15fc..1151fb5dcdde 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -763,7 +763,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
     SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, sal_False);
     const SfxItemSet& rOldSet = GetItemSet();
 
-    sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != OUString(m_pGraphTransMF->GetSavedValue()));
+    sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue());
     if ( pOld )
     {
         const SvxBrushItem& rOldItem    = (const SvxBrushItem&)*pOld;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 960eaa3481e6..3eb3c00f91ef 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -617,10 +617,10 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
                                                         rCoreAttrs, SID_ATTR_BORDER_INNER );
                     if (
                         !pOldBoxItem ||
-                        m_pLeftMF->GetText() != OUString(m_pLeftMF->GetSavedValue()) ||
-                        m_pRightMF->GetText() != OUString(m_pRightMF->GetSavedValue()) ||
-                        m_pTopMF->GetText() != OUString(m_pTopMF->GetSavedValue()) ||
-                        m_pBottomMF->GetText() != OUString(m_pBottomMF->GetSavedValue()) ||
+                        m_pLeftMF->GetText() != m_pLeftMF->GetSavedValue() ||
+                        m_pRightMF->GetText() != m_pRightMF->GetSavedValue() ||
+                        m_pTopMF->GetText() != m_pTopMF->GetSavedValue() ||
+                        m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() ||
                         nMinValue == m_pLeftMF->GetValue() ||
                         nMinValue == m_pRightMF->GetValue() ||
                         nMinValue == m_pTopMF->GetValue() ||
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index a5b199ec8c53..fd3829db0223 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -906,7 +906,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
     }
 
     if ( !bChanged )
-        bChanged = !pNameBox->GetSavedValue().Len();
+        bChanged = pNameBox->GetSavedValue().isEmpty();
 
     if ( !bChanged && pExampleSet &&
          pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
@@ -946,7 +946,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
 
     if ( !bChanged )
     {
-        bChanged = !pStyleBox->GetSavedValue().Len();
+        bChanged = pStyleBox->GetSavedValue().isEmpty();
 
         if ( m_pImpl->m_bInSearchMode && bChanged &&
              aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE )
@@ -995,7 +995,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
 
     if ( !bChanged )
     {
-        bChanged = !pStyleBox->GetSavedValue().Len();
+        bChanged = pStyleBox->GetSavedValue().isEmpty();
 
         if ( m_pImpl->m_bInSearchMode && bChanged &&
              aInfo.GetItalic() == ITALIC_NONE && aInfo.GetWeight() != WEIGHT_NORMAL )
@@ -1023,7 +1023,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
 
     if ( pSizeBox->GetText().isEmpty() )   // GetValue() returns the min-value
         nSize = 0;
-    long nSavedSize = pSizeBox->GetSavedValue().ToInt32();
+    long nSavedSize = pSizeBox->GetSavedValue().toInt32();
     bool bRel = true;
 
     if ( !pSizeBox->IsRelative() )
@@ -3197,7 +3197,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
 
     if ( !bChanged &&
          ( m_pKerningLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND ||
-           ( !m_pKerningMF->GetSavedValue().Len() && m_pKerningMF->IsEnabled() ) ) )
+           ( m_pKerningMF->GetSavedValue().isEmpty() && m_pKerningMF->IsEnabled() ) ) )
         bChanged = sal_True;
 
     if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -3223,7 +3223,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
 
     // Scale Width
     nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
-    if ( m_pScaleWidthMF->GetText() != OUString(m_pScaleWidthMF->GetSavedValue()) )
+    if ( m_pScaleWidthMF->GetText() != m_pScaleWidthMF->GetSavedValue() )
     {
         rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
         bModified = sal_True;
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 782f63a31496..64d26c5cac4a 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -324,49 +324,49 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
     sal_Bool     bModified = sal_False;
     sal_Int32    nValue;
 
-    if( aMtrFldHorz1.GetText() != OUString(aMtrFldHorz1.GetSavedValue()) )
+    if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHorz1, eUnit );
         rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHorz2.GetText() != OUString(aMtrFldHorz2.GetSavedValue()) )
+    if( aMtrFldHorz2.GetText() != aMtrFldHorz2.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHorz2, eUnit );
         rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldVert1.GetText() != OUString(aMtrFldVert1.GetSavedValue()) )
+    if( aMtrFldVert1.GetText() != aMtrFldVert1.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldVert1, eUnit );
         rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldVert2.GetText() != OUString(aMtrFldVert2.GetSavedValue()) )
+    if( aMtrFldVert2.GetText() != aMtrFldVert2.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldVert2, eUnit );
         rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine1.GetText() != OUString(aMtrFldLine1.GetSavedValue()) )
+    if( aMtrFldLine1.GetText() != aMtrFldLine1.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldLine1, eUnit );
         rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine2.GetText() != OUString(aMtrFldLine2.GetSavedValue()) )
+    if( aMtrFldLine2.GetText() != aMtrFldLine2.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldLine2, eUnit );
         rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine3.GetText() != OUString(aMtrFldLine3.GetSavedValue()) )
+    if( aMtrFldLine3.GetText() != aMtrFldLine3.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldLine3, eUnit );
         rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index bbe07837e139..1d3694b22a65 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -237,8 +237,8 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
 {
     const SfxItemPool& rPool = *rSet.GetPool();
     sal_Bool bModified = sal_False;
-    if( OUString(aWidthMF.GetSavedValue()) != aWidthMF.GetText() ||
-        OUString(aHeightMF.GetSavedValue()) != aHeightMF.GetText() )
+    if( aWidthMF.GetSavedValue() != aWidthMF.GetText() ||
+        aHeightMF.GetSavedValue() != aHeightMF.GetText() )
     {
         sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE );
         FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -256,9 +256,9 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
             aSz = (const SvxSizeItem&)GetItemSet().Get( nW );
 
         Size aTmpSz( aSz.GetSize() );
-        if( aWidthMF.GetText() != OUString(aWidthMF.GetSavedValue()) )
+        if( aWidthMF.GetText() != aWidthMF.GetSavedValue() )
             aTmpSz.Width() = lcl_GetValue( aWidthMF, eUnit );
-        if( aHeightMF.GetText() != OUString(aHeightMF.GetSavedValue()) )
+        if( aHeightMF.GetText() != aHeightMF.GetSavedValue() )
             aTmpSz.Height() = lcl_GetValue( aHeightMF, eUnit );
         aSz.SetSize( aTmpSz );
         aWidthMF.SaveValue();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 084986ffa24c..4050e8d85bbb 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -438,35 +438,35 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
     sal_Int32    nValue;
     TriState eState;
 
-    if( aMtrFldLineDist.GetText() != OUString(aMtrFldLineDist.GetSavedValue()) )
+    if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldLineDist, eUnit );
         rAttrs.Put( SdrMeasureLineDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelplineOverhang.GetText() != OUString(aMtrFldHelplineOverhang.GetSavedValue()) )
+    if( aMtrFldHelplineOverhang.GetText() != aMtrFldHelplineOverhang.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHelplineOverhang, eUnit );
         rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelplineDist.GetText() != OUString(aMtrFldHelplineDist.GetSavedValue()) )
+    if( aMtrFldHelplineDist.GetText() != aMtrFldHelplineDist.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHelplineDist, eUnit );
         rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelpline1Len.GetText() != OUString(aMtrFldHelpline1Len.GetSavedValue()) )
+    if( aMtrFldHelpline1Len.GetText() != aMtrFldHelpline1Len.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHelpline1Len, eUnit );
         rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelpline2Len.GetText() != OUString(aMtrFldHelpline2Len.GetSavedValue()) )
+    if( aMtrFldHelpline2Len.GetText() != aMtrFldHelpline2Len.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldHelpline2Len, eUnit );
         rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) );
@@ -480,7 +480,7 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
         bModified = sal_True;
     }
 
-    if( aMtrFldDecimalPlaces.GetText() != OUString(aMtrFldDecimalPlaces.GetSavedValue()) )
+    if( aMtrFldDecimalPlaces.GetText() != aMtrFldDecimalPlaces.GetSavedValue() )
     {
         nValue = static_cast<sal_Int32>(aMtrFldDecimalPlaces.GetValue());
         rAttrs.Put(
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index daaf17ea2b2f..81bdbb33a0b9 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -685,13 +685,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     nWhich = GetWhich( SID_ATTR_ULSPACE );
     SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
 
-    if ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) )
+    if ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() )
     {
         aMargin.SetLeft( (sal_uInt16)GetCoreValue( aLeftMarginEdit, eUnit ) );
         bModified |= sal_True;
     }
 
-    if ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) )
+    if ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() )
     {
         aMargin.SetRight( (sal_uInt16)GetCoreValue( aRightMarginEdit, eUnit ) );
         bModified |= sal_True;
@@ -710,13 +710,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 
     sal_Bool bMod = sal_False;
 
-    if ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) )
+    if ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() )
     {
         aTopMargin.SetUpper( (sal_uInt16)GetCoreValue( aTopMarginEdit, eUnit ) );
         bMod |= sal_True;
     }
 
-    if ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) )
+    if ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() )
     {
         aTopMargin.SetLower( (sal_uInt16)GetCoreValue( aBottomMarginEdit, eUnit ) );
         bMod |= sal_True;
@@ -1630,7 +1630,7 @@ bool SvxPageDescPage::IsPrinterRangeOverflow(
     long nValue = static_cast<long>(rField.GetValue());
     if ( bCheck &&
          (  nValue < nFirstMargin || nValue > nLastMargin ) &&
-         rField.GetText() != OUString(rField.GetSavedValue()) )
+         rField.GetText() != rField.GetSavedValue() )
     {
         rField.SetValue( nValue < nFirstMargin ? nFirstMargin : nLastMargin );
          bRet = true;
@@ -1664,19 +1664,19 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear )
 bool SvxPageDescPage::IsMarginOutOfRange()
 {
     bool bRet = ( ( ( !( pImpl->m_nPos & MARGIN_LEFT ) &&
-                      ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) ) ) &&
+                      ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() ) ) &&
                     ( aLeftMarginEdit.GetValue() < nFirstLeftMargin ||
                       aLeftMarginEdit.GetValue() > nLastLeftMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_RIGHT ) &&
-                      ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) ) ) &&
+                      ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() ) ) &&
                     ( aRightMarginEdit.GetValue() < nFirstRightMargin ||
                       aRightMarginEdit.GetValue() > nLastRightMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_TOP ) &&
-                      ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) ) ) &&
+                      ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() ) ) &&
                     ( aTopMarginEdit.GetValue() < nFirstTopMargin ||
                       aTopMarginEdit.GetValue() > nLastTopMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_BOTTOM ) &&
-                      ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) ) ) &&
+                      ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() ) ) &&
                     ( aBottomMarginEdit.GetValue() < nFirstBottomMargin ||
                       aBottomMarginEdit.GetValue() > nLastBottomMargin ) ) );
     return bRet;
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 7eb291109b2d..32e0448fc2ba 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -343,25 +343,25 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
     sal_Int32    nValue;
     TriState eState;
 
-    if( aMtrFldLeft.GetText() != OUString(aMtrFldLeft.GetSavedValue()) )
+    if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldLeft, eUnit );
         rAttrs.Put( SdrTextLeftDistItem( nValue ) );
     }
 
-    if( aMtrFldRight.GetText() != OUString(aMtrFldRight.GetSavedValue()) )
+    if( aMtrFldRight.GetText() != aMtrFldRight.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldRight, eUnit );
         rAttrs.Put( SdrTextRightDistItem( nValue ) );
     }
 
-    if( aMtrFldTop.GetText() != OUString(aMtrFldTop.GetSavedValue()) )
+    if( aMtrFldTop.GetText() != aMtrFldTop.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldTop, eUnit );
         rAttrs.Put( SdrTextUpperDistItem( nValue ) );
     }
 
-    if( aMtrFldBottom.GetText() != OUString(aMtrFldBottom.GetSavedValue()) )
+    if( aMtrFldBottom.GetText() != aMtrFldBottom.GetSavedValue() )
     {
         nValue = GetCoreValue( aMtrFldBottom, eUnit );
         rAttrs.Put( SdrTextLowerDistItem( nValue ) );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 08d15d630016..eb319023b93c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -340,7 +340,7 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
     {
         // linear transparence
         sal_uInt16 nPos = (sal_uInt16)aMtrTransparent.GetValue();
-        if(nPos != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() || !bLinearActive)
+        if(nPos != (sal_uInt16)aMtrTransparent.GetSavedValue().toInt32() || !bLinearActive)
         {
             XFillTransparenceItem aItem(nPos);
             SdrShadowTransparenceItem aShadowItem(nPos);
@@ -359,12 +359,12 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
         // transparence gradient, fill ItemSet from values
         if(!bGradActive
             || (XGradientStyle)aLbTrgrGradientType.GetSelectEntryPos() != (XGradientStyle)aLbTrgrGradientType.GetSavedValue()
-            || (sal_uInt16)aMtrTrgrAngle.GetValue() != (sal_uInt16)aMtrTrgrAngle.GetSavedValue().ToInt32()
-            || (sal_uInt16)aMtrTrgrCenterX.GetValue() != (sal_uInt16)aMtrTrgrCenterX.GetSavedValue().ToInt32()
-            || (sal_uInt16)aMtrTrgrCenterY.GetValue() != (sal_uInt16)aMtrTrgrCenterY.GetSavedValue().ToInt32()
-            || (sal_uInt16)aMtrTrgrBorder.GetValue() != (sal_uInt16)aMtrTrgrBorder.GetSavedValue().ToInt32()
-            || (sal_uInt16)aMtrTrgrStartValue.GetValue() != (sal_uInt16)aMtrTrgrStartValue.GetSavedValue().ToInt32()
-            || (sal_uInt16)aMtrTrgrEndValue.GetValue() != (sal_uInt16)aMtrTrgrEndValue.GetSavedValue().ToInt32() )
+            || (sal_uInt16)aMtrTrgrAngle.GetValue() != (sal_uInt16)aMtrTrgrAngle.GetSavedValue().toInt32()
+            || (sal_uInt16)aMtrTrgrCenterX.GetValue() != (sal_uInt16)aMtrTrgrCenterX.GetSavedValue().toInt32()
+            || (sal_uInt16)aMtrTrgrCenterY.GetValue() != (sal_uInt16)aMtrTrgrCenterY.GetSavedValue().toInt32()
+            || (sal_uInt16)aMtrTrgrBorder.GetValue() != (sal_uInt16)aMtrTrgrBorder.GetSavedValue().toInt32()
+            || (sal_uInt16)aMtrTrgrStartValue.GetValue() != (sal_uInt16)aMtrTrgrStartValue.GetSavedValue().toInt32()
+            || (sal_uInt16)aMtrTrgrEndValue.GetValue() != (sal_uInt16)aMtrTrgrEndValue.GetSavedValue().toInt32() )
         {
             sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)aMtrTrgrStartValue.GetValue() * 255) / 100);
             sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)aMtrTrgrEndValue.GetValue() * 255) / 100);
@@ -1168,7 +1168,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
                 if( !aNumFldStepCount.GetText().isEmpty() )
                 {
                     nValue = (sal_uInt16) aNumFldStepCount.GetValue();
-                    if( nValue != (sal_uInt16) aNumFldStepCount.GetSavedValue().ToInt32() )
+                    if( nValue != (sal_uInt16) aNumFldStepCount.GetSavedValue().toInt32() )
                         bValueModified = sal_True;
                 }
             }
@@ -1266,7 +1266,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
             }
             else if( aTsbOriginal.IsEnabled() &&
                      aTsbOriginal.GetState() == STATE_CHECK &&
-                     aMtrFldXSize.GetSavedValue().Len() > 0 )
+                     !aMtrFldXSize.GetSavedValue().isEmpty() )
                 pItem = new XFillBmpSizeXItem( 0 );
 
             if( pItem )
@@ -1303,7 +1303,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
             }
             else if( aTsbOriginal.IsEnabled() &&
                      aTsbOriginal.GetState() == STATE_CHECK &&
-                     aMtrFldYSize.GetSavedValue().Len() > 0 )
+                     !aMtrFldYSize.GetSavedValue().isEmpty() )
                 pItem = new XFillBmpSizeYItem( 0 );
 
             if( pItem )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 9fb4d89b3a75..07d7267c3fc9 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -230,8 +230,8 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 long SvxHatchTabPage::CheckChanges_Impl()
 {
-    if( aMtrDistance.GetText()           != OUString(aMtrDistance.GetSavedValue()) ||
-        aMtrAngle.GetText()              != OUString(aMtrAngle.GetSavedValue()) ||
+    if( aMtrDistance.GetText()           != aMtrDistance.GetSavedValue() ||
+        aMtrAngle.GetText()              != aMtrAngle.GetSavedValue() ||
         aLbLineType.GetSelectEntryPos()  != aLbLineType.GetSavedValue()  ||
         aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
         aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index fbd083b4c759..5348692af871 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -752,8 +752,8 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Line width
-    // GetSavedValue() returns String!
-    if( aMtrLineWidth.GetText() != OUString(aMtrLineWidth.GetSavedValue()) )
+    // GetSavedValue() returns OUString!
+    if( aMtrLineWidth.GetText() != aMtrLineWidth.GetSavedValue() )
     {
         XLineWidthItem aItem( GetCoreValue( aMtrLineWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH );
@@ -764,7 +764,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line start
-    if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
+    if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
     {
         XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -775,7 +775,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line end
-    if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
+    if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
     {
         XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
@@ -868,7 +868,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
     }
 
     // Width line start
-    if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
+    if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
     {
         XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -879,7 +879,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line end
-    if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
+    if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
     {
         XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
@@ -892,7 +892,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
 
     // Transparency
     sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
-    if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() )
+    if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().toInt32() )
     {
         XLineTransparenceItem aItem( nVal );
         pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 6108aaaa5606..4718ec5d13c8 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -222,13 +222,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
     // is here used to NOT lose changes
     //XDashStyle eXDS;
 
-    if( aNumFldNumber1.GetText()     != OUString(aNumFldNumber1.GetSavedValue()) ||
-        aMtrLength1.GetText()        != OUString(aMtrLength1.GetSavedValue()) ||
+    if( aNumFldNumber1.GetText()     != aNumFldNumber1.GetSavedValue() ||
+        aMtrLength1.GetText()        != aMtrLength1.GetSavedValue() ||
         aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() ||
-        aNumFldNumber2.GetText()     != OUString(aNumFldNumber2.GetSavedValue()) ||
-        aMtrLength2.GetText()        != OUString(aMtrLength2.GetSavedValue()) ||
+        aNumFldNumber2.GetText()     != aNumFldNumber2.GetSavedValue() ||
+        aMtrLength2.GetText()        != aMtrLength2.GetSavedValue() ||
         aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
-        aMtrDistance.GetText()       != OUString(aMtrDistance.GetSavedValue()) )
+        aMtrDistance.GetText()       != aMtrDistance.GetSavedValue() )
     {
         ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 7213cdc6baf6..c0fa6c2ba2a6 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -346,7 +346,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
 
         // transparency
         sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
-        if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() )
+        if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().toInt32() )
         {
             SdrShadowTransparenceItem aItem( nVal );
             pOld = GetOldItem( rAttrs, SDRATTR_SHADOWTRANSPARENCE );
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 2076a1c46311..925ac9ecfc49 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -291,7 +291,7 @@ namespace dbaui
     {
         sal_Bool bChangedSomething = sal_False;
 
-        if (m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue()))
+        if (m_aUserName.GetText() != m_aUserName.GetSavedValue())
         {
             _rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText()));
             _rSet.Put(SfxStringItem(DSID_PASSWORD, String()));
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index ef5cd570d584..b4150effa75e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -182,7 +182,7 @@ DBG_NAME(OTextConnectionPageSetup)
         fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
         fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
 
-        if ( m_aETHostServer.GetText() != OUString(m_aETHostServer.GetSavedValue()) )
+        if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() )
         {
             DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
             ::dbaccess::ODsnTypeCollection* pCollection = NULL;
@@ -825,7 +825,7 @@ DBG_NAME(OAuthentificationPageSetup)
     {
         sal_Bool bChangedSomething = sal_False;
 
-        if (m_aETUserName.GetText() != OUString(m_aETUserName.GetSavedValue()))
+        if (m_aETUserName.GetText() != m_aETUserName.GetSavedValue())
         {
             _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText()));
             _rSet.Put(SfxStringItem(DSID_PASSWORD, String()));
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index f979b51d4a14..05d5485eec21 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -386,23 +386,23 @@ DBG_NAME(OTextConnectionHelper)
 
         if ( ( m_nAvailableSections & TC_SEPARATORS ) != 0 )
         {
-            if( m_aFieldSeparator.GetText() != OUString(m_aFieldSeparator.GetSavedValue()) )
+            if( m_aFieldSeparator.GetText() != m_aFieldSeparator.GetSavedValue() )
             {
                 rSet.Put( SfxStringItem(DSID_FIELDDELIMITER, GetSeparator( m_aFieldSeparator, m_aFieldSeparatorList) ) );
                 bChangedSomething = sal_True;
             }
-            if( m_aTextSeparator.GetText() != OUString(m_aTextSeparator.GetSavedValue()) )
+            if( m_aTextSeparator.GetText() != m_aTextSeparator.GetSavedValue() )
             {
                 rSet.Put( SfxStringItem(DSID_TEXTDELIMITER, GetSeparator( m_aTextSeparator, m_aTextSeparatorList) ) );
                 bChangedSomething = sal_True;
             }
 
-            if( m_aDecimalSeparator.GetText() != OUString(m_aDecimalSeparator.GetSavedValue()) )
+            if( m_aDecimalSeparator.GetText() != m_aDecimalSeparator.GetSavedValue() )
             {
                 rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().copy(0, 1) ) );
                 bChangedSomething = sal_True;
             }
-            if( m_aThousandsSeparator.GetText() != OUString(m_aThousandsSeparator.GetSavedValue()) )
+            if( m_aThousandsSeparator.GetText() != m_aThousandsSeparator.GetSavedValue() )
             {
                 rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().copy(0,1) ) );
                 bChangedSomething = sal_True;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index fcdb61c091c8..46840d8ad32e 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -228,7 +228,7 @@ namespace dbaui
     // -----------------------------------------------------------------------
     void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething)
     {
-        if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().ToInt32()) )
+        if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().toInt32()) )
         {
             _rSet.Put(SfxInt32Item(_nID, static_cast<sal_Int32>(_pEdit->GetValue())));
             _bChangedSomething = sal_True;
@@ -237,7 +237,7 @@ namespace dbaui
     // -----------------------------------------------------------------------
     void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething)
     {
-        if( (_pEdit != NULL) && (_pEdit->GetText() != OUString(_pEdit->GetSavedValue())) )
+        if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) )
         {
             _rSet.Put(SfxStringItem(_nID, _pEdit->GetText()));
             _bChangedSomething = sal_True;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 45831a6d99c9..f79cab6d354c 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -705,7 +705,7 @@ namespace dbaui
 
         bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet );
 
-        if ( m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue()) )
+        if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() )
         {
             _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) );
             _rSet.Put( SfxStringItem( DSID_PASSWORD, String()));
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 2e1087836888..c571a111c8ca 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -48,7 +48,7 @@ namespace dbaui
     public:
         inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
-        inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
@@ -80,7 +80,7 @@ namespace dbaui
         inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
         inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
 
-        inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
@@ -115,7 +115,7 @@ namespace dbaui
         inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
         inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
 
-        inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 5205c7ece933..cb6974176626 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -215,7 +215,7 @@ sal_Bool OCopyTable::LeavePage()
         }
     }
 
-    if ( !m_edTableName.GetSavedValue().Equals(m_edTableName.GetText()) )
+    if ( m_edTableName.GetSavedValue() != m_edTableName.GetText() )
     { // table exists and name has changed
         if ( m_pParent->getOperation() == CopyTableOperation::AppendData )
         {
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 4173f7de49c4..227227b48fa2 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1102,7 +1102,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
         sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
         xGroup->setGroupOn( nGroupOn );
     }
-    if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
+    if ( m_aGroupIntervalEd.GetSavedValue().toInt32() != m_aGroupIntervalEd.GetValue() )
     {
         xGroup->setGroupInterval( static_cast<sal_Int32>(m_aGroupIntervalEd.GetValue()) );
         m_aGroupIntervalEd.SaveValue();
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 14b7b8800747..55963e2ffaff 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -89,8 +89,8 @@ sal_Bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet)
     OUString aSheetPrefix = aEdSheetPrefix.GetText();
 
 
-    if ( OUString(aEdNSheets.GetSavedValue()) != aEdNSheets.GetText()
-         || static_cast<OUString>(aEdSheetPrefix.GetSavedValue()) != aSheetPrefix )
+    if ( aEdNSheets.GetSavedValue() != aEdNSheets.GetText()
+         || aEdSheetPrefix.GetSavedValue() != aSheetPrefix )
     {
         aOpt.SetInitTabCount( nTabCount );
         aOpt.SetInitTabPrefix( aSheetPrefix );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index f36e4a6f56e7..cb7b49c787ce 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -463,7 +463,7 @@ sal_Bool    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
         bRet = sal_True;
     }
 
-    if(aTabMF.GetText() != OUString(aTabMF.GetSavedValue()))
+    if(aTabMF.GetText() != aTabMF.GetSavedValue())
     {
         rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
                     sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 8e13cdeb4421..58824985eb49 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -335,7 +335,7 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
     if (   WAS_DEFAULT(nWhichPageNo,rOldSet)
         && (    (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue())
             || (   bUseValue && bUseValue == aBtnPageNo.GetSavedValue()
-                   && aEdPageNo.GetText() == OUString(aEdPageNo.GetSavedValue()) ) ) )
+                   && aEdPageNo.GetText() == aEdPageNo.GetSavedValue() ) ) )
     {
             rCoreSet.ClearItem( nWhichPageNo );
     }
@@ -513,7 +513,7 @@ static sal_Bool lcl_PutScaleItem( sal_uInt16               nWhich,
 {
     sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
     sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
-        (OUString(rEd.GetSavedValue()) != rEd.GetText()) ||
+        (rEd.GetSavedValue() != rEd.GetText()) ||
                         !WAS_DEFAULT( nWhich, rOldSet );
 
     if( bDataChanged )
@@ -537,8 +537,8 @@ static sal_Bool lcl_PutScaleItem2( sal_uInt16               nWhich,
     sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue();
     sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
     sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
-        (OUString(rEd1.GetSavedValue()) != rEd1.GetText()) ||
-        (OUString(rEd2.GetSavedValue()) != rEd2.GetText()) ||
+        (rEd1.GetSavedValue() != rEd1.GetText()) ||
+        (rEd2.GetSavedValue() != rEd2.GetText()) ||
                         !WAS_DEFAULT( nWhich, rOldSet );
 
     if( bDataChanged )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 83c6d53a933b..77960f056cc0 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -444,7 +444,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
     }
 
     // Tabulatorabstand
-    if( aMtrFldTabstop.GetText() != OUString(aMtrFldTabstop.GetSavedValue()) )
+    if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() )
     {
         sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP );
         SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh );
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index fa081b743ad0..022bc730b732 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -129,7 +129,7 @@ namespace svt
     //------------------------------------------------------------------
     sal_Bool ComboBoxCellController::IsModified() const
     {
-        return OUString(GetComboBox().GetSavedValue()) != GetComboBox().GetText();
+        return GetComboBox().GetSavedValue() != GetComboBox().GetText();
     }
 
     //------------------------------------------------------------------
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index b42d81b52b42..3d85f3e1e4df 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -1175,7 +1175,7 @@ void AssignmentPersistentData::Commit()
     // -------------------------------------------------------------------
     IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox)
     {
-        if (OUString(_pBox->GetSavedValue()) != _pBox->GetText())
+        if (_pBox->GetSavedValue() != _pBox->GetText())
         {
             if (_pBox == &m_aDatasource)
                 resetTables();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 708f52b69ebb..7f0fd525c9ed 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -409,8 +409,8 @@ void SvxRubyDialog::GetText()
     for(int i = 0; i < 8; i+=2)
     {
         if(aEditArr[i]->IsEnabled() &&
-           (aEditArr[i]->GetText() != OUString(aEditArr[i]->GetSavedValue()) ||
-            aEditArr[i + 1]->GetText() != OUString(aEditArr[i + 1]->GetSavedValue())))
+           (aEditArr[i]->GetText() != aEditArr[i]->GetSavedValue() ||
+            aEditArr[i + 1]->GetText() != aEditArr[i + 1]->GetSavedValue()))
         {
             Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
             DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" );
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 42dd0335b94b..8ac388c91cf2 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -73,7 +73,7 @@ SvxFmAbsRecWin::~SvxFmAbsRecWin()
 // -----------------------------------------------------------------------
 void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
 {
-    if ( _bForce || ( GetText() != OUString(GetSavedValue()) ) )
+    if ( _bForce || ( GetText() != GetSavedValue() ) )
     {
         sal_Int64 nRecord = GetValue();
         if (nRecord < GetMin() || nRecord > GetMax())
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 7b450d9bc4ec..e7efa9177250 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -248,9 +248,9 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
 
     SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText());
     aINetFmt.SetName(m_pNameED->GetText());
-    bModified |= m_pURLED->GetText() != OUString(m_pURLED->GetSavedValue());
+    bModified |= m_pURLED->GetText() != m_pURLED->GetSavedValue();
     bModified |= m_pNameED->IsModified();
-    bModified |= OUString(m_pTargetFrmLB->GetSavedValue()) != m_pTargetFrmLB->GetText();
+    bModified |= m_pTargetFrmLB->GetSavedValue() != m_pTargetFrmLB->GetText();
 
     // set valid settings first
     String sEntry = m_pVisitedLB->GetSelectEntry();
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 671b1956605b..54975d724f41 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -134,7 +134,7 @@ sal_Bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
     }
     if(aNewStartCB.GetState() != aNewStartCB.GetSavedValue() ||
         aNewStartNumberCB.GetState() != aNewStartNumberCB.GetSavedValue()||
-       aNewStartNF.GetText() != OUString(aNewStartNF.GetSavedValue()))
+       aNewStartNF.GetText() != aNewStartNF.GetSavedValue())
     {
         bModified = sal_True;
         sal_Bool bNewStartChecked = STATE_CHECK == aNewStartCB.GetState();
@@ -146,7 +146,7 @@ sal_Bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
 
     if(aCountParaCB.GetSavedValue() != aCountParaCB.GetState() ||
         aRestartParaCountCB.GetSavedValue() != aRestartParaCountCB.GetState() ||
-       OUString(aRestartNF.GetSavedValue()) != aRestartNF.GetText() )
+       aRestartNF.GetSavedValue() != aRestartNF.GetText() )
     {
         SwFmtLineNumber aFmt;
         aFmt.SetStartValue( static_cast< sal_uLong >(aRestartParaCountCB.GetState() == STATE_CHECK ?
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 05c781af06ec..d044096a5c6c 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -170,15 +170,15 @@ SfxTabPage*  SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS
 
 sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
-    if(m_aDisplayNameED.GetText() != OUString(m_aDisplayNameED.GetSavedValue()))
+    if(m_aDisplayNameED.GetText() != m_aDisplayNameED.GetSavedValue())
         m_pConfigItem->SetMailDisplayName(m_aDisplayNameED.GetText());
-    if(m_aAddressED.GetText() != OUString(m_aAddressED.GetSavedValue()))
+    if(m_aAddressED.GetText() != m_aAddressED.GetSavedValue())
         m_pConfigItem->SetMailAddress(m_aAddressED.GetText());
     if( m_aReplyToCB.GetSavedValue() != m_aReplyToCB.IsChecked())
         m_pConfigItem->SetMailReplyTo(m_aReplyToCB.IsChecked());
-    if(m_aReplyToED.GetText() != OUString(m_aReplyToED.GetSavedValue()))
+    if(m_aReplyToED.GetText() != m_aReplyToED.GetSavedValue())
         m_pConfigItem->SetMailReplyTo(m_aReplyToED.GetText());
-    if(m_aServerED.GetText() != OUString(m_aServerED.GetSavedValue()))
+    if(m_aServerED.GetText() != m_aServerED.GetSavedValue())
         m_pConfigItem->SetMailServer(m_aServerED.GetText());
 
     if(m_aPortNF.IsModified())
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 24cbe9a8d27f..ca292f7c3fce 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -189,7 +189,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
         bRet = sal_True;
     }
 
-    if(aTabMF.IsVisible() && aTabMF.GetText() != OUString(aTabMF.GetSavedValue()))
+    if(aTabMF.IsVisible() && aTabMF.GetText() != aTabMF.GetSavedValue())
     {
         rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
                     (sal_uInt16)aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP))));
@@ -205,7 +205,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
         bRet = sal_True;
     }
 
-    if (aWordCountED.GetText() != OUString(aWordCountED.GetSavedValue()))
+    if (aWordCountED.GetText() != aWordCountED.GetSavedValue())
     {
         boost::shared_ptr< comphelper::ConfigurationChanges > batch(
             comphelper::ConfigurationChanges::create());
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8cd9f2406d63..d28bd4d0c132 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -631,11 +631,11 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
     String sLabel       =  aLabelBox   .GetText();
     String sIdx         =  aIdxBox     .GetText();
 
-    bool bStandardHeightChanged = OUString(aStandardHeightLB.GetSavedValue()) != aStandardHeightLB.GetText();
-    bool bTitleHeightChanged = OUString(aTitleHeightLB.GetSavedValue()) != aTitleHeightLB.GetText();
-    bool bListHeightChanged = OUString(aListHeightLB.GetSavedValue()) != aListHeightLB.GetText() && (!bListHeightDefault || !bSetListHeightDefault );
-    bool bLabelHeightChanged = OUString(aLabelHeightLB.GetSavedValue()) != aLabelHeightLB.GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault );
-    bool bIndexHeightChanged = OUString(aIndexHeightLB.GetSavedValue()) != aIndexHeightLB.GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault );
+    bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText();
+    bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText();
+    bool bListHeightChanged = aListHeightLB.GetSavedValue() != aListHeightLB.GetText() && (!bListHeightDefault || !bSetListHeightDefault );
+    bool bLabelHeightChanged = aLabelHeightLB.GetSavedValue() != aLabelHeightLB.GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault );
+    bool bIndexHeightChanged = aIndexHeightLB.GetSavedValue() != aIndexHeightLB.GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault );
     if(bNotDocOnly)
     {
         pFontConfig->SetFontStandard(sStandard, nFontGroup);
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 5cbaa819da84..4e591ecf4c5a 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -367,7 +367,7 @@ sal_Bool    SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
         aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry();
         rConfig.SetColumnAssignment( rDBData, aAssignment );
     }
-    if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue()))
+    if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue())
         rConfig.SetFemaleGenderValue(m_aFemaleFieldCB.GetText());
 
     lcl_StoreGreetingsBox(m_aFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE);
@@ -561,7 +561,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl)
             aAssignment[MM_PART_GENDER] = ::rtl::OUString();
         rConfigItem.SetColumnAssignment( rDBData, aAssignment );
     }
-    if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue()))
+    if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue())
         rConfigItem.SetFemaleGenderValue(m_aFemaleFieldCB.GetText());
 
     EndDialog(RET_OK);
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 4ef4b5e62f77..2985131fc88f 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -232,8 +232,8 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& )
         sal_Bool bDBListBoxChanged = sOldDBName != sTempDBName ||
             sOldTableName != sTempTableName || sOldColumnName != sTempColumnName;
         if (!IsFldEdit() ||
-            OUString(aConditionED.GetSavedValue()) != aConditionED.GetText() ||
-            OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
+            aConditionED.GetSavedValue() != aConditionED.GetText() ||
+            aValueED.GetSavedValue() != aValueED.GetText() ||
              bDBListBoxChanged ||
              nOldFormat != nFormat || nOldSubType != nSubType)
         {
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 79011585cca6..7577b34f72a7 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -618,9 +618,9 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
         nOldSel != aSelectionLB.GetSelectEntryPos() ||
         nOldFormat != nFormat ||
         aFixedCB.GetState() != aFixedCB.GetSavedValue() ||
-        aValueED.GetText() != OUString(aValueED.GetSavedValue()) ||
-        aLevelED.GetText() != OUString(aLevelED.GetSavedValue()) ||
-        aDateOffsetED.GetText() != OUString(aDateOffsetED.GetSavedValue()))
+        aValueED.GetText() != aValueED.GetSavedValue() ||
+        aLevelED.GetText() != aLevelED.GetSavedValue() ||
+        aDateOffsetED.GetText() != aDateOffsetED.GetSavedValue())
     {
         InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', aNumFormatLB.IsAutomaticLanguage() );
     }
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index ba1871b7157a..03aba2059aed 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -593,11 +593,11 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
     }
 
     if (!IsFldEdit() ||
-        OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
-        OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
-        OUString(aCond1ED.GetSavedValue()) != aCond1ED.GetText() ||
-        OUString(aCond2ED.GetSavedValue()) != aCond2ED.GetText() ||
-        OUString(aListNameED.GetSavedValue()) != aListNameED.GetText() ||
+        aNameED.GetSavedValue() != aNameED.GetText() ||
+        aValueED.GetSavedValue() != aValueED.GetText() ||
+        aCond1ED.GetSavedValue() != aCond1ED.GetText() ||
+        aCond2ED.GetSavedValue() != aCond2ED.GetText() ||
+        aListNameED.GetSavedValue() != aListNameED.GetText() ||
         bDropDownLBChanged ||
         nOldFormat != nFormat)
     {
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 695a8f632df7..520ae57cbce9 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -940,8 +940,8 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
     }
 
     if (!IsFldEdit() || bModified ||
-        OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
-        OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
+        aNameED.GetSavedValue() != aNameED.GetText() ||
+        aValueED.GetSavedValue() != aValueED.GetText() ||
         aTypeLB.GetSavedValue() != aTypeLB.GetSelectEntryPos() ||
         aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() ||
         aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos())
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 2ae36613956e..cb4fb7353380 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1215,14 +1215,14 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
     }
 
     if (!IsFldEdit() ||
-        OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
-        OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
+        aNameED.GetSavedValue() != aNameED.GetText() ||
+        aValueED.GetSavedValue() != aValueED.GetText() ||
         aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() ||
         aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos() ||
         nOldFormat != aNumFormatLB.GetFormat() ||
         aInvisibleCB.GetState() != aInvisibleCB.GetSavedValue() ||
         aChapterLevelLB.GetSavedValue() != aChapterLevelLB.GetSelectEntryPos() ||
-        OUString(aSeparatorED.GetSavedValue()) != aSeparatorED.GetText())
+        aSeparatorED.GetSavedValue() != aSeparatorED.GetText())
     {
         InsertFld( nTypeId, nSubType, aName, aVal, nFormat,
                     cSeparator, aNumFormatLB.IsAutomaticLanguage() );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 82ac9346884b..1a35cc492ca1 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -979,7 +979,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
         aHoriOrient.SetRelationOrient( eRel );
         aHoriOrient.SetPosToggle(aMirrorPagesCB.IsChecked());
 
-        sal_Bool bMod = aAtHorzPosED.GetText() != OUString(aAtHorzPosED.GetSavedValue());
+        sal_Bool bMod = aAtHorzPosED.GetText() != aAtHorzPosED.GetSavedValue();
         bMod |= aMirrorPagesCB.GetState() != aMirrorPagesCB.GetSavedValue();
 
         if ( eHOri == text::HoriOrientation::NONE &&
@@ -1017,7 +1017,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
         aVertOrient.SetVertOrient    ( eVOri);
         aVertOrient.SetRelationOrient( eRel );
 
-        sal_Bool bMod = aAtVertPosED.GetText() != OUString(aAtVertPosED.GetSavedValue());
+        sal_Bool bMod = aAtVertPosED.GetText() != aAtVertPosED.GetSavedValue();
 
         if ( eVOri == text::VertOrientation::NONE &&
              ( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) )
@@ -2982,9 +2982,9 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
 sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
 {
     sal_Bool bRet = sal_False;
-    if (aNameED.GetText() != OUString(aNameED.GetSavedValue()))
+    if (aNameED.GetText() != aNameED.GetSavedValue())
         bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, aNameED.GetText()));
-    if (aAltNameED.GetText()  != OUString(aAltNameED.GetSavedValue()))
+    if (aAltNameED.GetText()  != aAltNameED.GetSavedValue())
         bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, aAltNameED.GetText()));
 
     const SfxPoolItem* pOldItem;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5c275f5cd034..71536a807c7c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1059,7 +1059,7 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
     const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
     SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
     aReadOnlyCB.Check(rDesc.IsReadonly());
-    if(aTitleED.GetText() == OUString(aTitleED.GetSavedValue()))
+    if(aTitleED.GetText() == aTitleED.GetSavedValue())
     {
         if(rDesc.GetTitle())
             aTitleED.SetText(*rDesc.GetTitle());
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 54a3c31fdc39..ca76be4638f3 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -184,14 +184,14 @@ sal_Bool    SwTextGridPage::FillItemSet(SfxItemSet &rSet)
     sal_Bool bRet = sal_False;
     if(aNoGridRB.GetSavedValue() != aNoGridRB.IsChecked()||
         aLinesGridRB.GetSavedValue() != aLinesGridRB.IsChecked()||
-        aLinesPerPageNF.GetSavedValue().ToInt32()
+        aLinesPerPageNF.GetSavedValue().toInt32()
            != aLinesPerPageNF.GetValue()||
-        aTextSizeMF.GetSavedValue().ToInt32() != aTextSizeMF.GetValue()||
-        aCharsPerLineNF.GetSavedValue().ToInt32()
+        aTextSizeMF.GetSavedValue().toInt32() != aTextSizeMF.GetValue()||
+        aCharsPerLineNF.GetSavedValue().toInt32()
            != aCharsPerLineNF.GetValue()||
         aSnapToCharsCB.GetSavedValue() != aSnapToCharsCB.IsChecked() ||
-        aRubySizeMF.GetSavedValue().ToInt32() != aRubySizeMF.GetValue()||
-        aCharWidthMF.GetSavedValue().ToInt32() != aCharWidthMF.GetValue()||
+        aRubySizeMF.GetSavedValue().toInt32() != aRubySizeMF.GetValue()||
+        aCharWidthMF.GetSavedValue().toInt32() != aCharWidthMF.GetValue()||
         aRubyBelowCB.GetSavedValue() != aRubyBelowCB.IsChecked()||
         aDisplayCB.GetSavedValue() != aDisplayCB.IsChecked()||
         aPrintCB.GetSavedValue() != aPrintCB.IsChecked()||
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 4c4da43aca89..0653144b8651 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -398,8 +398,8 @@ sal_Bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
 
     if(bModified)
     {
-        if( m_pBottomMF->GetText() != OUString(m_pBottomMF->GetSavedValue()) ||
-            m_pTopMF->GetText() != OUString(m_pTopMF->GetSavedValue()) )
+        if( m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() ||
+            m_pTopMF->GetText() != m_pTopMF->GetSavedValue() )
         {
             SvxULSpaceItem aULSpace(RES_UL_SPACE);
             aULSpace.SetUpper( (sal_uInt16) m_pTopMF->Denormalize(
@@ -410,7 +410,7 @@ sal_Bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
         }
 
     }
-    if(m_pNameED->GetText() != OUString(m_pNameED->GetSavedValue()))
+    if(m_pNameED->GetText() != m_pNameED->GetSavedValue())
     {
         rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText()));
         bModified = sal_True;
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 73b35850faa1..6ccd798b31fb 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -63,7 +63,7 @@ private:
     Impl_IMEInfos*      mpIMEInfos;
     XubString           maText;
     OUString            maPlaceholderText;
-    XubString           maSaveValue;
+    OUString            maSaveValue;
     XubString           maUndoText;
     XubString           maRedoText;
     long                mnXOffset;
@@ -214,7 +214,7 @@ public:
     virtual OUString    GetPlaceholderText() const;
 
     void                SaveValue() { maSaveValue = GetText(); }
-    const XubString&    GetSavedValue() const { return maSaveValue; }
+    const OUString&     GetSavedValue() const { return maSaveValue; }
 
     virtual void        SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; }
     virtual const Link& GetModifyHdl() const { return maModifyHdl; }
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 748f761550ea..e22c24979ea7 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -35,7 +35,7 @@ class VCL_DLLPUBLIC VclMultiLineEdit : public Edit
 private:
     ImpVclMEdit*    pImpVclMEdit;
 
-    XubString       aSaveValue;
+    OUString        aSaveValue;
     Link            aModifyHdlLink;
 
     Timer*          pUpdateDataTimer;
@@ -104,7 +104,7 @@ public:
     sal_Bool            IsRightToLeft() const;
 
     void            SaveValue()                         { aSaveValue = GetText(); }
-    const XubString&    GetSavedValue() const               { return aSaveValue; }
+    const OUString&    GetSavedValue() const            { return aSaveValue; }
 
     void            SetModifyHdl( const Link& rLink )   { aModifyHdlLink = rLink; }
     const Link&     GetModifyHdl() const                { return aModifyHdlLink; }