Change GetSavedValue() to return OUString

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

Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6

19 files changed, 87 insertions, 94 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 );