[Libreoffice-commits] .: 3 commits - cui/source dbaccess/source reportdesign/source sc/source sd/source svtools/source svx/source sw/source vcl/inc

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 24 13:28:45 PST 2013


 cui/source/dialogs/hangulhanjadlg.cxx                 |    2 
 cui/source/options/optgdlg.cxx                        |    4 
 cui/source/options/optgenrl.cxx                       |    2 
 cui/source/options/optinet2.cxx                       |   37 +-
 cui/source/options/optmemory.cxx                      |    2 
 cui/source/options/optsave.cxx                        |    2 
 cui/source/tabpages/backgrnd.cxx                      |    2 
 cui/source/tabpages/border.cxx                        |    8 
 cui/source/tabpages/chardlg.cxx                       |   12 
 cui/source/tabpages/connect.cxx                       |   14 -
 cui/source/tabpages/grfpage.cxx                       |    8 
 cui/source/tabpages/measure.cxx                       |   12 
 cui/source/tabpages/page.cxx                          |   18 -
 cui/source/tabpages/textattr.cxx                      |    8 
 cui/source/tabpages/tparea.cxx                        |   20 -
 cui/source/tabpages/tphatch.cxx                       |    4 
 cui/source/tabpages/tpline.cxx                        |   33 --
 cui/source/tabpages/tplnedef.cxx                      |   10 
 cui/source/tabpages/tpshadow.cxx                      |    2 
 dbaccess/source/ui/dlg/ConnectionPage.cxx             |    2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx     |    4 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx       |    8 
 dbaccess/source/ui/dlg/adminpages.cxx                 |    4 
 dbaccess/source/ui/dlg/detailpages.cxx                |    2 
 dbaccess/source/ui/inc/FieldControls.hxx              |    6 
 dbaccess/source/ui/misc/WCPage.cxx                    |    2 
 reportdesign/source/ui/dlg/GroupsSorting.cxx          |    2 
 sc/source/ui/optdlg/tpdefaults.cxx                    |    4 
 sc/source/ui/optdlg/tpview.cxx                        |    2 
 sc/source/ui/pagedlg/tptable.cxx                      |    8 
 sd/source/ui/dlg/tpoption.cxx                         |    2 
 svtools/source/brwbox/ebbcontrols.cxx                 |    2 
 svtools/source/dialogs/addresstemplate.cxx            |    2 
 svx/source/customshapes/EnhancedCustomShape2d.cxx     |  231 ++++++++----------
 svx/source/customshapes/EnhancedCustomShape3d.cxx     |   42 +--
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |    6 
 svx/source/customshapes/EnhancedCustomShapeEngine.hxx |    1 
 svx/source/customshapes/tbxcustomshapes.cxx           |   26 +-
 svx/source/dialog/_bmpmask.cxx                        |    8 
 svx/source/dialog/pfiledlg.cxx                        |    4 
 svx/source/dialog/rubydialog.cxx                      |    4 
 svx/source/dialog/sendreportunx.cxx                   |   10 
 svx/source/dialog/srchdlg.cxx                         |    2 
 svx/source/dialog/svxbmpnumvalueset.cxx               |    6 
 svx/source/form/tbxform.cxx                           |    2 
 sw/source/ui/chrdlg/chardlg.cxx                       |    4 
 sw/source/ui/chrdlg/numpara.cxx                       |    4 
 sw/source/ui/config/mailconfigpage.cxx                |    8 
 sw/source/ui/config/optload.cxx                       |    4 
 sw/source/ui/config/optpage.cxx                       |   10 
 sw/source/ui/dbui/mmgreetingspage.cxx                 |    4 
 sw/source/ui/fldui/flddb.cxx                          |    4 
 sw/source/ui/fldui/flddok.cxx                         |    6 
 sw/source/ui/fldui/fldfunc.cxx                        |   10 
 sw/source/ui/fldui/fldref.cxx                         |    4 
 sw/source/ui/fldui/fldvar.cxx                         |    6 
 sw/source/ui/frmdlg/frmpage.cxx                       |    8 
 sw/source/ui/index/cnttab.cxx                         |    2 
 sw/source/ui/misc/pggrid.cxx                          |   10 
 sw/source/ui/table/tabledlg.cxx                       |    6 
 vcl/inc/vcl/edit.hxx                                  |    4 
 vcl/inc/vcl/vclmedit.hxx                              |    4 
 62 files changed, 327 insertions(+), 363 deletions(-)

New commits:
commit e2e99d0b11319333ece9827187ef4098fad47f3e
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Thu Jan 24 21:49:28 2013 +0100

    Remove RTL_CONSTASCII_USTRINGPARAM in svx
    
    replace equals() with ==
    
    Change-Id: Ic1aed52398beb2132d8c6824335b865ceb4255b3

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 96fc82c..8c199a0 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -78,9 +78,9 @@ void EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( EnhancedCustomShape
     rParameter.Value <<= nNewValue;
 }
 
-rtl::OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 nP1, sal_Int16 nP2, sal_Int16 nP3 )
+OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 nP1, sal_Int16 nP2, sal_Int16 nP3 )
 {
-    rtl::OUString aEquation;
+    OUString aEquation;
     sal_Bool b1Special = ( nFlags & 0x2000 ) != 0;
     sal_Bool b2Special = ( nFlags & 0x4000 ) != 0;
     sal_Bool b3Special = ( nFlags & 0x8000 ) != 0;
@@ -144,41 +144,41 @@ rtl::OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_I
         break;
         case 2 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "(" ) );
+            aEquation += "(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "+" ) );
+            aEquation += "+";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")/2" ) );
+            aEquation += ")/2";
         }
         break;
         case 3 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "abs(" ) );
+            aEquation += "abs(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
+            aEquation += ")";
         }
         break;
         case 4 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "min(" ) );
+            aEquation += "min(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
+            aEquation += ",";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
+            aEquation += ")";
         }
         break;
         case 5 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "max(" ) );
+            aEquation += "max(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
+            aEquation += ",";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
+            aEquation += ")";
         }
         break;
         case 6 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "if(" ) );
+            aEquation += "if(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
             aEquation += rtl::OUString( (sal_Unicode)',' );
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
@@ -189,135 +189,133 @@ rtl::OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_I
         break;
         case 7 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "sqrt(" ) );
+            aEquation += "sqrt(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
+            aEquation += "*";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "+" ) );
+            aEquation += "+";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
+            aEquation += "*";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "+" ) );
+            aEquation += "+";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
+            aEquation += "*";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
             aEquation += rtl::OUString( (sal_Unicode)')' );
         }
         break;
         case 8 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "atan2(" ) );
+            aEquation += "atan2(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
+            aEquation += ",";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")/(pi/180)" ) );
+            aEquation += ")/(pi/180)";
         }
         break;
         case 9 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*sin(" ) );
+            aEquation += "*sin(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))" ) );
+            aEquation += "*(pi/180))";
         }
         break;
         case 10 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*cos(" ) );
+            aEquation += "*cos(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))" ) );
+            aEquation += "*(pi/180))";
         }
         break;
         case 11 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "cos(atan2(" ) );
+            aEquation += "*cos(atan2(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
+            aEquation += ",";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "))" ) );
+            aEquation += "))";
         }
         break;
         case 12 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "sin(atan2(" ) );
+            aEquation += "*sin(atan2(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
+            aEquation += ",";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "))" ) );
+            aEquation += "))";
         }
         break;
         case 13 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "sqrt(" ) );
+            aEquation += "sqrt(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
+            aEquation += ")";
         }
         break;
         case 15 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*sqrt(1-(" ) );
+            aEquation += "*sqrt(1-(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
+            aEquation += "/";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(" ) );
+            aEquation += ")";
+            aEquation += "*(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
+            aEquation += "/";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "))" ) );
+            aEquation += "))";
         }
         break;
         case 16 :
         {
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*tan(" ) );
+            aEquation += "*tan(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ) );
+            aEquation += ")";
         }
         break;
         case 0x80 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "sqrt(" ) );
+            aEquation += "sqrt(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
+            aEquation += "*";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-" ) );
+            aEquation += "-";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*" ) );
+            aEquation += "*";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
             aEquation += rtl::OUString( (sal_Unicode)')' );
         }
         break;
         case 0x81 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "(cos(" ) );
+            aEquation += "(cos(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))*(" ) );
+            aEquation += "*(pi/180))*(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-10800)+sin(" ) );
+            aEquation += "-10800)+sin(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))*(" ) );
+            aEquation += "*(pi/180))*(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-10800))+10800" ) );
+            aEquation += "-10800))+10800";
         }
         break;
         case 0x82 :
         {
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-(sin(" ) );
+            aEquation += "-(sin(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))*(" ) );
+            aEquation += "*(pi/180))*(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-10800)-cos(" ) );
+            aEquation += "-10800)-cos(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "*(pi/180))*(" ) );
+            aEquation += "*(pi/180))*(";
             EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special );
-            aEquation += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "-10800))+10800" ) );
+            aEquation += "-10800))+10800";
         }
         break;
     }
@@ -330,9 +328,9 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS
     {
         if ( nPara & 0x400 )
         {
-            rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "?" ) );
+            rParameter += "?";
             rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara & 0xff ) );
-            rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+            rParameter += " ";
         }
         else
         {
@@ -349,29 +347,29 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS
                 case DFF_Prop_adjust9Value :
                 case DFF_Prop_adjust10Value :
                 {
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "$" ) );
+                    rParameter += "$";
                     rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) );
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+                    rParameter += " ";
                 }
                 break;
                 case DFF_Prop_geoLeft :
                 {
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "left" ) );
+                    rParameter += "left";
                 }
                 break;
                 case DFF_Prop_geoTop :
                 {
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "top" ) );
+                    rParameter += "top";
                 }
                 break;
                 case DFF_Prop_geoRight :
                 {
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "right" ) );
+                    rParameter += "right";
                 }
                 break;
                 case DFF_Prop_geoBottom :
                 {
-                    rParameter += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "bottom" ) );
+                    rParameter += "bottom";
                 }
                 break;
             }
@@ -446,28 +444,28 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
         {
             const com::sun::star::beans::PropertyValue& rPropVal = rHandleProperties[ i ];
 
-            const rtl::OUString sPosition           ( RTL_CONSTASCII_USTRINGPARAM( "Position" ) );
-            const rtl::OUString sMirroredX          ( RTL_CONSTASCII_USTRINGPARAM( "MirroredX" ) );
-            const rtl::OUString sMirroredY          ( RTL_CONSTASCII_USTRINGPARAM( "MirroredY" ) );
-            const rtl::OUString sSwitched           ( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
-            const rtl::OUString sPolar              ( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
-            const rtl::OUString sRefX               ( RTL_CONSTASCII_USTRINGPARAM( "RefX" ) );
-            const rtl::OUString sRefY               ( RTL_CONSTASCII_USTRINGPARAM( "RefY" ) );
-            const rtl::OUString sRefAngle           ( RTL_CONSTASCII_USTRINGPARAM( "RefAngle" ) );
-            const rtl::OUString sRefR               ( RTL_CONSTASCII_USTRINGPARAM( "RefR" ) );
-            const rtl::OUString sRadiusRangeMinimum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMinimum" ) );
-            const rtl::OUString sRadiusRangeMaximum ( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMaximum" ) );
-            const rtl::OUString sRangeXMinimum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMinimum" ) );
-            const rtl::OUString sRangeXMaximum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeXMaximum" ) );
-            const rtl::OUString sRangeYMinimum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMinimum" ) );
-            const rtl::OUString sRangeYMaximum      ( RTL_CONSTASCII_USTRINGPARAM( "RangeYMaximum" ) );
-
-            if ( rPropVal.Name.equals( sPosition ) )
+            const rtl::OUString sPosition           ( "Position" );
+            const rtl::OUString sMirroredX          ( "MirroredX" );
+            const rtl::OUString sMirroredY          ( "MirroredY" );
+            const rtl::OUString sSwitched           ( "Switched" );
+            const rtl::OUString sPolar              ( "Polar" );
+            const rtl::OUString sRefX               ( "RefX" );
+            const rtl::OUString sRefY               ( "RefY" );
+            const rtl::OUString sRefAngle           ( "RefAngle" );
+            const rtl::OUString sRefR               ( "RefR" );
+            const rtl::OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" );
+            const rtl::OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" );
+            const rtl::OUString sRangeXMinimum      ( "RangeXMinimum" );
+            const rtl::OUString sRangeXMaximum      ( "RangeXMaximum" );
+            const rtl::OUString sRangeYMinimum      ( "RangeYMinimum" );
+            const rtl::OUString sRangeYMaximum      ( "RangeYMaximum" );
+
+            if ( rPropVal.Name == sPosition )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aPosition )
                     bRetValue = sal_True;
             }
-            else if ( rPropVal.Name.equals( sMirroredX ) )
+            else if ( rPropVal.Name == sMirroredX )
             {
                 sal_Bool bMirroredX = sal_Bool();
                 if ( rPropVal.Value >>= bMirroredX )
@@ -476,7 +474,7 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
                         rDestinationHandle.nFlags |= HANDLE_FLAGS_MIRRORED_X;
                 }
             }
-            else if ( rPropVal.Name.equals( sMirroredY ) )
+            else if ( rPropVal.Name == sMirroredY )
             {
                 sal_Bool bMirroredY = sal_Bool();
                 if ( rPropVal.Value >>= bMirroredY )
@@ -485,7 +483,7 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
                         rDestinationHandle.nFlags |= HANDLE_FLAGS_MIRRORED_Y;
                 }
             }
-            else if ( rPropVal.Name.equals( sSwitched ) )
+            else if ( rPropVal.Name == sSwitched )
             {
                 sal_Bool bSwitched = sal_Bool();
                 if ( rPropVal.Value >>= bSwitched )
@@ -494,57 +492,57 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
                         rDestinationHandle.nFlags |= HANDLE_FLAGS_SWITCHED;
                 }
             }
-            else if ( rPropVal.Name.equals( sPolar ) )
+            else if ( rPropVal.Name == sPolar )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aPolar )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_POLAR;
             }
-            else if ( rPropVal.Name.equals( sRefX ) )
+            else if ( rPropVal.Name == sRefX )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.nRefX )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_REFX;
             }
-            else if ( rPropVal.Name.equals( sRefY ) )
+            else if ( rPropVal.Name == sRefY )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.nRefY )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_REFY;
             }
-            else if ( rPropVal.Name.equals( sRefAngle ) )
+            else if ( rPropVal.Name == sRefAngle )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.nRefAngle )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_REFANGLE;
             }
-            else if ( rPropVal.Name.equals( sRefR ) )
+            else if ( rPropVal.Name == sRefR )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.nRefR )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_REFR;
             }
-            else if ( rPropVal.Name.equals( sRadiusRangeMinimum ) )
+            else if ( rPropVal.Name == sRadiusRangeMinimum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aRadiusRangeMinimum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RADIUS_RANGE_MINIMUM;
             }
-            else if ( rPropVal.Name.equals( sRadiusRangeMaximum ) )
+            else if ( rPropVal.Name == sRadiusRangeMaximum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aRadiusRangeMaximum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM;
             }
-            else if ( rPropVal.Name.equals( sRangeXMinimum ) )
+            else if ( rPropVal.Name == sRangeXMinimum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aXRangeMinimum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RANGE_X_MINIMUM;
             }
-            else if ( rPropVal.Name.equals( sRangeXMaximum ) )
+            else if ( rPropVal.Name == sRangeXMaximum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aXRangeMaximum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RANGE_X_MAXIMUM;
             }
-            else if ( rPropVal.Name.equals( sRangeYMinimum ) )
+            else if ( rPropVal.Name == sRangeYMinimum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aYRangeMinimum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RANGE_Y_MINIMUM;
             }
-            else if ( rPropVal.Name.equals( sRangeYMaximum ) )
+            else if ( rPropVal.Name == sRangeYMaximum )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aYRangeMaximum )
                     rDestinationHandle.nFlags |= HANDLE_FLAGS_RANGE_Y_MAXIMUM;
@@ -564,7 +562,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     //////////////////////
     // AdjustmentValues //
     //////////////////////
-    const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
+    const rtl::OUString sAdjustmentValues( "AdjustmentValues" );
     const Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sAdjustmentValues );
     if ( pAny )
         *pAny >>= seqAdjustmentValues;
@@ -572,7 +570,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     ///////////////
     // Coordsize //
     ///////////////
-    const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) );
+    const rtl::OUString sViewBox( "ViewBox" );
     const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox );
     com::sun::star::awt::Rectangle aViewBox;
     if ( pViewBox && (*pViewBox >>= aViewBox ) )
@@ -582,12 +580,12 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
         nCoordWidthG  = labs( aViewBox.Width );
         nCoordHeightG = labs( aViewBox.Height);
     }
-    const rtl::OUString sPath( RTL_CONSTASCII_USTRINGPARAM ( "Path" ) );
+    const rtl::OUString sPath( "Path" );
 
     //////////////////////
     // Path/Coordinates //
     //////////////////////
-    const rtl::OUString sCoordinates( RTL_CONSTASCII_USTRINGPARAM ( "Coordinates" ) );
+    const rtl::OUString sCoordinates( "Coordinates" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sCoordinates );
     if ( pAny )
         *pAny >>= seqCoordinates;
@@ -595,7 +593,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     /////////////////////
     // Path/GluePoints //
     /////////////////////
-    const rtl::OUString sGluePoints( RTL_CONSTASCII_USTRINGPARAM ( "GluePoints" ) );
+    const rtl::OUString sGluePoints( "GluePoints" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sGluePoints );
     if ( pAny )
         *pAny >>= seqGluePoints;
@@ -603,7 +601,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     ///////////////////
     // Path/Segments //
     ///////////////////
-    const rtl::OUString sSegments( RTL_CONSTASCII_USTRINGPARAM ( "Segments" ) );
+    const rtl::OUString sSegments( "Segments" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSegments );
     if ( pAny )
         *pAny >>= seqSegments;
@@ -611,7 +609,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     //////////////////////
     // Path/SubViewSize //
     //////////////////////
-    const rtl::OUString sSubViewSize( RTL_CONSTASCII_USTRINGPARAM ( "SubViewSize" ) );
+    const rtl::OUString sSubViewSize( "SubViewSize" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSubViewSize );
     if ( pAny )
         *pAny >>= seqSubViewSize;
@@ -619,7 +617,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     ///////////////////
     // Path/StretchX //
     ///////////////////
-    const rtl::OUString sStretchX( RTL_CONSTASCII_USTRINGPARAM ( "StretchX" ) );
+    const rtl::OUString sStretchX( "StretchX" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchX );
     if ( pAny )
     {
@@ -631,7 +629,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     ///////////////////
     // Path/StretchY //
     ///////////////////
-    const rtl::OUString sStretchY( RTL_CONSTASCII_USTRINGPARAM ( "StretchY" ) );
+    const rtl::OUString sStretchY( "StretchY" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchY );
     if ( pAny )
     {
@@ -643,7 +641,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     /////////////////////
     // Path/TextFrames //
     /////////////////////
-    const rtl::OUString sTextFrames( RTL_CONSTASCII_USTRINGPARAM ( "TextFrames" ) );
+    const rtl::OUString sTextFrames( "TextFrames" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sTextFrames );
     if ( pAny )
         *pAny >>= seqTextFrames;
@@ -651,7 +649,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     ///////////////
     // Equations //
     ///////////////
-    const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
+    const rtl::OUString sEquations( "Equations" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations );
     if ( pAny )
         *pAny >>= seqEquations;
@@ -659,7 +657,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha
     /////////////
     // Handles //
     /////////////
-    const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
+    const rtl::OUString sHandles( "Handles" );
     pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sHandles );
     if ( pAny )
         *pAny >>= seqHandles;
@@ -763,9 +761,9 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
     aP.Y() -= aS.Height() / 2;
     aLogicRect = Rectangle( aP, aS );
 
-    const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
-    const rtl::OUString sMirroredX( RTL_CONSTASCII_USTRINGPARAM ( "MirroredX" ) );
-    const rtl::OUString sMirroredY( RTL_CONSTASCII_USTRINGPARAM ( "MirroredY" ) );
+    const rtl::OUString sType( "Type" );
+    const rtl::OUString sMirroredX( "MirroredX" );
+    const rtl::OUString sMirroredY( "MirroredY" );
 
     rtl::OUString sShapeType;
     SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
@@ -814,7 +812,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
         case mso_sptNil :
         {
             if( sShapeType.getLength() > 4 &&
-                sShapeType.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-" )))
+                sShapeType.match( "col-" ))
             {
                 nColorData = sShapeType.copy( 4 ).toInt32( 16 );
             }
@@ -1383,7 +1381,7 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
             // and writing them back into the GeometryItem
             SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)
                 (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
-            const rtl::OUString sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
+            const rtl::OUString sAdjustmentValues( "AdjustmentValues" );
             com::sun::star::beans::PropertyValue aPropVal;
             aPropVal.Name = sAdjustmentValues;
             aPropVal.Value <<= seqAdjustmentValues;
@@ -1848,8 +1846,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 case UNKNOWN :
                 default :
                 {
-                    rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
-                        "CustomShapes::unknown PolyFlagValue :"));
+                    rtl::OStringBuffer aString("CustomShapes::unknown PolyFlagValue :");
                     aString.append(static_cast<sal_Int32>(nCommand));
                     OSL_FAIL(aString.getStr());
                 }
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 664d1d9..aaff743 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -60,7 +60,7 @@ const char aExtrusion[] = "Extrusion";
 void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY )
 {
     ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair;
-     const rtl::OUString    sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) );
+     const rtl::OUString    sOrigin( "Origin" );
     Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sOrigin );
     if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) )
     {
@@ -72,7 +72,7 @@ void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOr
 void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY )
 {
     ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair;
-     const rtl::OUString    sRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "RotateAngle" ) );
+     const rtl::OUString    sRotateAngle( "RotateAngle" );
     Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sRotateAngle );
     if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) )
     {
@@ -86,7 +86,7 @@ void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double&
 void GetSkew( SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle )
 {
     ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair;
-     const rtl::OUString    sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) );
+     const rtl::OUString    sSkew( "Skew" );
     Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sSkew );
     if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) )
     {
@@ -100,7 +100,7 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d
 {
     ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair;
     double fDepth = 0, fFraction = 0;
-    const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
+    const rtl::OUString sDepth( "Depth" );
     Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sDepth );
     if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) )
     {
@@ -134,7 +134,7 @@ double GetDouble( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPrope
 drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault )
 {
     drawing::ShadeMode eRet( eDefault );
-    const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
+    const rtl::OUString sShadeMode( "ShadeMode" );
     Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sShadeMode );
     if ( pAny )
         *pAny >>= eRet;
@@ -199,7 +199,7 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus
 ,   pMap( pM )
 {
     SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
-    const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
+    const rtl::OUString sProjectionMode( "ProjectionMode" );
     Any* pAny = rGeometryItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sProjectionMode );
     if ( pAny )
         *pAny >>= eProjectionMode;
@@ -213,7 +213,7 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus
         fOriginX = fOriginX * pCustomShape->GetLogicRect().GetWidth();
         fOriginY = fOriginY * pCustomShape->GetLogicRect().GetHeight();
 
-        const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
+        const rtl::OUString sViewPoint( "ViewPoint" );
         drawing::Position3D aViewPointDefault( 3472, -3472, 25000 );
         drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) );
         fViewPoint.setX(aViewPoint.PositionX);
@@ -330,7 +330,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             fDepth = 1.0;
 
         drawing::ProjectionMode eProjectionMode( drawing::ProjectionMode_PARALLEL );
-        const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
+        const rtl::OUString sProjectionMode( "ProjectionMode" );
         Any* pAny = rGeometryItem.GetPropertyValueByName( aExtrusion, sProjectionMode );
         if ( pAny )
             *pAny >>= eProjectionMode;
@@ -346,7 +346,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         sal_Bool bUseTwoFillStyles( sal_False );
 
         drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) );
-        const rtl::OUString aExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
+        const rtl::OUString aExtrusionColor( "Color" );
         sal_Bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, sal_False );
 
         XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) );
@@ -560,7 +560,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             {
                 aNewTransform.translate( -fOriginX, fOriginY, 0.0 );
                 // now set correct camera position
-                const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
+                const rtl::OUString sViewPoint( "ViewPoint" );
                 drawing::Position3D aViewPointDefault( 3472, -3472, 25000 );
                 drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) );
                 double fViewPointX = aViewPoint.PositionX;
@@ -578,33 +578,33 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             // light //
             ///////////
 
-            const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
+            const rtl::OUString sBrightness( "Brightness" );
             double fAmbientIntensity = GetDouble( rGeometryItem, sBrightness, 22178.0 / 655.36, NULL ) / 100.0;
 
 
-            const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
+            const rtl::OUString sFirstLightDirection( "FirstLightDirection" );
             drawing::Direction3D aFirstLightDirectionDefault( 50000, 0, 10000 );
             drawing::Direction3D aFirstLightDirection( GetDirection3D( rGeometryItem, sFirstLightDirection, aFirstLightDirectionDefault ) );
             if ( aFirstLightDirection.DirectionZ == 0.0 )
                 aFirstLightDirection.DirectionZ = 1.0;
 
-            const rtl::OUString sFirstLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightLevel" ) );
+            const rtl::OUString sFirstLightLevel( "FirstLightLevel" );
             double fLightIntensity = GetDouble( rGeometryItem, sFirstLightLevel, 43712.0 / 655.36, NULL ) / 100.0;
 
-            const rtl::OUString sFirstLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightHarsh" ) );
+            const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" );
             /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, sal_False );
 
-            const rtl::OUString sSecondLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightDirection" ) );
+            const rtl::OUString sSecondLightDirection( "SecondLightDirection" );
             drawing::Direction3D aSecondLightDirectionDefault( -50000, 0, 10000 );
             drawing::Direction3D aSecondLightDirection( GetDirection3D( rGeometryItem, sSecondLightDirection, aSecondLightDirectionDefault ) );
             if ( aSecondLightDirection.DirectionZ == 0.0 )
                 aSecondLightDirection.DirectionZ = -1;
 
-            const rtl::OUString sSecondLightLevel( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightLevel" ) );
+            const rtl::OUString sSecondLightLevel( "SecondLightLevel" );
             double fLight2Intensity = GetDouble( rGeometryItem, sSecondLightLevel, 43712.0 / 655.36, NULL ) / 100.0;
 
-            const rtl::OUString sSecondLightHarsh( RTL_CONSTASCII_USTRINGPARAM ( "SecondLightHarsh" ) );
-            const rtl::OUString sLightFace( RTL_CONSTASCII_USTRINGPARAM ( "LightFace" ) );
+            const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" );
+            const rtl::OUString sLightFace( "LightFace" );
             /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, sal_False );
             /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, sal_False );
 
@@ -637,8 +637,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
                 pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) );
                 pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) );
 
-            const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) );
-            const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) );
+            const rtl::OUString sSpecularity( "Specularity" );
+            const rtl::OUString sMetal( "Metal" );
             double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100;
             sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False );
 
@@ -695,7 +695,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS
         aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward));
     }
 
-    const rtl::OUString sRotationCenter( RTL_CONSTASCII_USTRINGPARAM ( "RotationCenter" ) );
+    const rtl::OUString sRotationCenter( "RotationCenter" );
     drawing::Direction3D aRotationCenterDefault( 0, 0, 0 ); // default seems to be wrong, a fractional size of shape has to be used!!
     drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, sRotationCenter, aRotationCenterDefault ) );
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 7e599f2..81c12a9 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -50,7 +50,7 @@
 rtl::OUString EnhancedCustomShapeEngine_getImplementationName()
     throw( NMSP_UNO::RuntimeException )
 {
-    return B2UCONST( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
+    return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
 }
 sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& ServiceName )
     throw( NMSP_UNO::RuntimeException )
@@ -62,7 +62,7 @@ SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames
 {
     SEQ( rtl::OUString ) aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = B2UCONST( "com.sun.star.drawing.CustomShapeEngine" );
+    pArray[0] = "com.sun.star.drawing.CustomShapeEngine";
     return aRet;
 }
 
@@ -245,7 +245,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
         SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
             pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
         sal_Bool bTextPathOn = sal_False;
-        const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
+        const rtl::OUString sTextPath( "TextPath" );
         com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
         if ( pAny )
             *pAny >>= bTextPathOn;
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index 44e67b7..14a3721 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -44,7 +44,6 @@
 
 #define REF( _def_Obj )         NMSP_UNO::Reference< _def_Obj >
 #define SEQ( _def_Obj )         NMSP_UNO::Sequence< _def_Obj >
-#define B2UCONST( _def_pChar )  (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
 
 // ---------------------------
 // - EnhancedCustomShapeEngine -
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 0f8a409..7a29065 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -37,7 +37,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 
 SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
-    m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) )
+    m_aSubTbxResName( "private:resource/toolbar/" )
 {
     switch( nSlotId )
     {
@@ -47,40 +47,40 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId
         }
         case SID_DRAWTBX_CS_BASIC :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes.diamond" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "basicshapes" ) );
+            m_aCommand = ".uno:BasicShapes.diamond";
+            m_aSubTbName = "basicshapes";
         }
         break;
 
         case SID_DRAWTBX_CS_SYMBOL :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes.smiley" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "symbolshapes" ) );
+            m_aCommand = ".uno:SymbolShapes.smiley";
+            m_aSubTbName = "symbolshapes";
         }
         break;
 
         case SID_DRAWTBX_CS_ARROW :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes.left-right-arrow" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "arrowshapes" ) );
+            m_aCommand = ".uno:ArrowShapes.left-right-arrow";
+            m_aSubTbName = "arrowshapes";
         }
         break;
         case SID_DRAWTBX_CS_FLOWCHART :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes.flowchart-internal-storage" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flowchartshapes" ) );
+            m_aCommand = ".uno:FlowChartShapes.flowchart-internal-storage";
+            m_aSubTbName = "flowchartshapes";
         }
         break;
         case SID_DRAWTBX_CS_CALLOUT :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes.round-rectangular-callout" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calloutshapes" ) );
+            m_aCommand = ".uno:CalloutShapes.round-rectangular-callout";
+            m_aSubTbName = "calloutshapes";
         }
         break;
         case SID_DRAWTBX_CS_STAR :
         {
-            m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes.star5" ) );
-            m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "starshapes" ) );
+            m_aCommand = ".uno:StarShapes.star5";
+            m_aSubTbName = "starshapes";
         }
         break;
     }
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 34e9a95..ac134b8 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -1214,19 +1214,19 @@ void SvxBmpMask::SetAccessibleNames (void)
     String sSourceColorN;
 
     sSourceColorN = sSourceColor;
-    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
+    sSourceColorN.AppendAscii (" 1");
     aCbx1.SetAccessibleName (sSourceColorN);
 
     sSourceColorN = sSourceColor;
-    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
+    sSourceColorN.AppendAscii (" 2");
     aCbx2.SetAccessibleName (sSourceColorN);
 
     sSourceColorN = sSourceColor;
-    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
+    sSourceColorN.AppendAscii (" 3");
     aCbx3.SetAccessibleName (sSourceColorN);
 
     sSourceColorN = sSourceColor;
-    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
+    sSourceColorN.AppendAscii (" 4");
     aCbx4.SetAccessibleName (sSourceColorN);
 }
 
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 4b1cd74..6c112e0 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -130,9 +130,9 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
                 }
 
                 // build filterdescription
-                aStrPlugName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "  (" ) );
+                aStrPlugName.AppendAscii( "  (" );
                 aStrPlugName.Append( aStrPlugExtension );
-                aStrPlugName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
+                aStrPlugName.AppendAscii( ")" );
 
                 // use a own description for the video-formate avi, mov and mpeg
                 // the descriptions of these MIME-types are not very meaningful
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index 0063cc1..e0c581a 100644
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
@@ -201,7 +201,7 @@ namespace svx{
 
         bool ErrorRepSendDialog::SendReport()
         {
-            rtl::OUString sSubEnvVar(RTL_CONSTASCII_USTRINGPARAM("ERRORREPORT_SUBJECT"));
+            rtl::OUString sSubEnvVar("ERRORREPORT_SUBJECT");
             rtl::OUString strSubject(GetDocType());
             osl_setEnvironment(sSubEnvVar.pData, strSubject.pData);
 
@@ -216,16 +216,14 @@ namespace svx{
                 OSL_VERIFY(nWritten == static_cast<size_t>(strUTF8.getLength()));
                 fclose( fp );
 
-                rtl::OUString sBodyEnvVar(RTL_CONSTASCII_USTRINGPARAM("ERRORREPORT_BODYFILE"));
+                rtl::OUString sBodyEnvVar("ERRORREPORT_BODYFILE");
                 rtl::OUString strBodyFile(rtl::OStringToOUString(rtl::OString(szBodyFile),
                     osl_getThreadTextEncoding()));
                 osl_setEnvironment(sBodyEnvVar.pData, strBodyFile.pData);
             }
 
             int ret = -1;
-            rtl::OUString path1(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "$BRAND_BASE_DIR/program/crashrep"));
+            rtl::OUString path1("$BRAND_BASE_DIR/program/crashrep");
             rtl::Bootstrap::expandMacros(path1);
             rtl::OString path2;
             if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
@@ -237,7 +235,7 @@ namespace svx{
             {
                 rtl::OStringBuffer cmd;
                 tools::appendUnixShellWord(&cmd, path2);
-                cmd.append(RTL_CONSTASCII_STRINGPARAM(" -debug -load -send -noui"));
+                cmd.append(" -debug -load -send -noui");
                 ret = system(cmd.getStr());
             }
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 0371a66b..6b29f4d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2248,7 +2248,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
         const SearchAttrItem& rItem = pList->GetObject(i);
 
         if ( rStr.Len() )
-            rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+            rStr.AppendAscii( ", " );
 
         if ( !IsInvalidItem( rItem.pItem ) )
         {
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 42179ab..38cdd3a 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -304,9 +304,9 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                     }
                     Sequence< PropertyValue > aProperties(2);
                     PropertyValue* pProperties = aProperties.getArray();
-                    pProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
+                    pProperties[0].Name = rtl::OUString("NumberingType");
                     pProperties[0].Value <<= aNumberingTypes[i];
-                    pProperties[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
+                    pProperties[1].Name = rtl::OUString("Value");
                     pProperties[1].Value <<= (sal_Int32)1;
                     try
                     {
@@ -319,7 +319,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
                     aLeft.Y() -= (pDev->GetTextHeight()/2);
                     if(!sPrefixes[i].isEmpty() &&
-                        !sPrefixes[i].equalsAsciiL(" ", 1) &&
+                        sPrefixes[i] != " " &&
                         sPrefixes[i].getStr()[0] != 0)
                     {
                         pVDev->SetFont(aFont);
commit 088af31770f6f5b6106988d544d57800c0946911
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Thu Jan 24 15:14:44 2013 +0100

    remove duplicate code block
    
    Change-Id: If25874a36a65d4f3fcb2ef1fa9b09fa9878dda01

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 5348692..b9e77b0 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -867,29 +867,6 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
 
-    // Width line start
-    if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
-    {
-        XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
-        pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
-        if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
-        {
-            rAttrs.Put( aItem );
-            bModified = sal_True;
-        }
-    }
-    // Width line end
-    if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
-    {
-        XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
-        pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
-        if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
-        {
-            rAttrs.Put( aItem );
-            bModified = sal_True;
-        }
-    }
-
     // Transparency
     sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
     if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().toInt32() )
commit 2dab78ee2199d70b951aee86b80aab4374cc7c4f
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Thu Jan 24 15:12:43 2013 +0100

    Change GetSavedValue() to return OUString
    
    removed temporarily added OUString(...GetSavedValue()...) constructs again
    
    Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 024e140..cc4fde8 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 cca9402..a41c945 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 21278cf..5a1438b 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 9bccdd0..c21db1d 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 48e120f..e5c43f7 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 14d3a19..918a11f 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 afad498..1151fb5 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 960eaa3..3eb3c00 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 a5b199e..fd3829d 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 782f63a..64d26c5 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 bbe0783..1d3694b 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 084986f..4050e8d 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 daaf17e..81bdbb3 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 7eb2911..32e0448 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 08d15d6..eb31902 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 9fb4d89..07d7267 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 fbd083b..5348692 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 6108aaa..4718ec5 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 7213cdc..c0fa6c2 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 2076a1c..925ac9e 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 ef5cd57..b4150ef 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 f979b51..05d5485 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 fcdb61c..46840d8 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 45831a6..f79cab6 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 2e10878..c571a11 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 5205c7e..cb69741 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 4173f7d..227227b 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 14b7b88..55963e2 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 f36e4a6..cb7b49c 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 8e13cde..5882498 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()) ||

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list