[Libreoffice-commits] .: 2 commits - extensions/source svx/source

[Libreoffice Gerrit user]

 extensions/source/nsplugin/source/so_main.cxx |    6 +++---
 svx/source/xoutdev/xattr.cxx                  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 658467e3e10b88a07b6c0c326eec8d35b6cfb338
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 30 14:44:56 2013 +0100

    Revert "WaE: declaration of nWhich shadows a member of ´this´"
    
    This reverts commit 984ac8a7b4af06147a113845899ec918d5934921.
    
    Problem was fixed already by 9ad661e5740142a95893e91e4c138caee2abe7c2

diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 0651587..3607d5c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3169,8 +3169,8 @@ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
 *************************************************************************/
 
 XFillGradientItem::XFillGradientItem(const OUString& rName,
-                                   const XGradient& rTheGradient, sal_uInt16 nWhich_)
-    : NameOrIndex(nWhich_, rName)
+                                   const XGradient& rTheGradient, sal_uInt16 nWhich)
+    : NameOrIndex(nWhich, rName)
     , aGradient(rTheGradient)
 {
 }
commit abfd688a7d57ada10072bd876b9a85f709ea4007
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 30 14:43:46 2013 +0100

    extensions: fix wrongly converted OUString literals
    
    Change-Id: I23594fe715fbd8d34ea5d938bde963a17dffb296

diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index 5d46e35..054fd77 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -321,9 +321,9 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
 
         // arguments
         OUString args [] = {
-                "--nologo",
-                "--nodefault",
-                "--nolockcheck",
+                OUString("--nologo"),
+                OUString("--nodefault"),
+                OUString("--nolockcheck"),
                 sConnectStartString,
         };