yyyyy

Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548

5 files changed, 20 insertions, 27 deletions

diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 947eb15bcdb9..f31041077304 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -41,20 +41,20 @@ static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
 
 #define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
 
-#define ROOTNODE_START                                  OUString("Office.Common/Print/Option")
-#define ROOTNODE_PRINTOPTION                            OUString("org.openoffice.Office.Common/Print/Option")
-
-#define PROPERTYNAME_REDUCETRANSPARENCY                 OUString("ReduceTransparency")
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            OUString("ReducedTransparencyMode")
-#define PROPERTYNAME_REDUCEGRADIENTS                    OUString("ReduceGradients")
-#define PROPERTYNAME_REDUCEDGRADIENTMODE                OUString("ReducedGradientMode")
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           OUString("ReducedGradientStepCount")
-#define PROPERTYNAME_REDUCEBITMAPS                      OUString("ReduceBitmaps")
-#define PROPERTYNAME_REDUCEDBITMAPMODE                  OUString("ReducedBitmapMode")
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            OUString("ReducedBitmapResolution")
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  OUString("ReducedBitmapIncludesTransparency")
-#define PROPERTYNAME_CONVERTTOGREYSCALES                OUString("ConvertToGreyscales")
-#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT        OUString("PDFAsStandardPrintJobFormat")
+#define ROOTNODE_START                                  "Office.Common/Print/Option"
+#define ROOTNODE_PRINTOPTION                            "org.openoffice.Office.Common/Print/Option"
+
+#define PROPERTYNAME_REDUCETRANSPARENCY                 "ReduceTransparency"
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            "ReducedTransparencyMode"
+#define PROPERTYNAME_REDUCEGRADIENTS                    "ReduceGradients"
+#define PROPERTYNAME_REDUCEDGRADIENTMODE                "ReducedGradientMode"
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           "ReducedGradientStepCount"
+#define PROPERTYNAME_REDUCEBITMAPS                      "ReduceBitmaps"
+#define PROPERTYNAME_REDUCEDBITMAPMODE                  "ReducedBitmapMode"
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            "ReducedBitmapResolution"
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  "ReducedBitmapIncludesTransparency"
+#define PROPERTYNAME_CONVERTTOGREYSCALES                "ConvertToGreyscales"
+#define PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT        "PDFAsStandardPrintJobFormat"
 
 using namespace ::utl;
 using namespace ::osl;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 98b01730fb76..8ae8b16dc467 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -659,9 +659,7 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu()
                 {
                     Reference< XCommandInfo > aCommands = aCnt.getCommands();
                     if ( aCommands.is() )
-                        bEnableDelete
-                            = aCommands->hasCommandByName(
-                                OUString( "delete" ) );
+                        bEnableDelete = aCommands->hasCommandByName( "delete" );
                     else
                         bEnableDelete = false;
                 }
@@ -678,9 +676,7 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu()
                     Reference< XPropertySetInfo > aProps = aCnt.getProperties();
                     if ( aProps.is() )
                     {
-                        Property aProp
-                            = aProps->getPropertyByName(
-                                OUString( "Title" ) );
+                        Property aProp = aProps->getPropertyByName("Title");
                         bEnableRename
                             = !( aProp.Attributes & PropertyAttribute::READONLY );
                     }
@@ -762,9 +758,7 @@ void ViewTabListBox_Impl::DeleteEntries()
             ::ucbhelper::Content aCnt( aURL, mxCmdEnv, comphelper::getProcessComponentContext() );
             Reference< XCommandInfo > aCommands = aCnt.getCommands();
             if ( aCommands.is() )
-                canDelete
-                    = aCommands->hasCommandByName(
-                        OUString( "delete" ) );
+                canDelete = aCommands->hasCommandByName( "delete" );
             else
                 canDelete = false;
         }
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 31d1d60fdcce..1e6afc1c1558 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -116,8 +116,7 @@ IMPL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, p, void )
                 xWindow->setVisible( sal_False );
 
                 // reparent the window
-                xWinPeer->setProperty( OUString( "PluginParent" ),
-                                        uno::makeAny( (sal_Int64) 0 ) );
+                xWinPeer->setProperty( "PluginParent", uno::makeAny( (sal_Int64) 0 ) );
 
                 vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow )
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 0b4fe2d5e8e6..8ea50c2f015f 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -914,7 +914,7 @@ OUString EmbeddedObjectRef::GetChartType()
                                 if( xProp.is())
                                 {
                                     bool bCurrent = false;
-                                    if( xProp->getPropertyValue( OUString("SwapXAndYAxis") ) >>= bCurrent )
+                                    if( xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bCurrent )
                                     {
                                         if (bCurrent)
                                             Style += "Bars";
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 6a811ca3c266..92f653bdf184 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -147,7 +147,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(Runti
 
     try
     {
-        setPropertyValue(OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle));
+        setPropertyValue(UNODIALOG_PROPERTY_TITLE, makeAny(_rTitle));
     }
     catch(RuntimeException&)
     {