commit 4f684749432a9811e9d13d34a3f44143acb0f5b1
author Noel Grandin <noel@peralex.com> Tue Sep 17 12:26:40 2013 +0200
committer Noel Grandin <noel@peralex.com> Thu Sep 19 10:14:14 2013 +0200
tree 7d6350759092a33804b479a7db5de15ffa7db1b9
parent d1649c52fe915724d40bc8a9d1ce3ccb3916f3c7

convert sc/inc/paramisc.hxx from String to OUString

Change-Id: Ie712bd654c9aa1556757340bad6d720b9416b02c

sc/inc/paramisc.hxx

diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx
index a4da3f6..425bb19 100644
--- a/sc/inc/paramisc.hxx
+++ b/sc/inc/paramisc.hxx
@@ -23,23 +23,21 @@
#include "address.hxx"
#include <tools/solar.h>

class String;

struct ScSolveParam
{
    ScAddress   aRefFormulaCell;
    ScAddress   aRefVariableCell;
    String*     pStrTargetVal;
    OUString*   pStrTargetVal;

    ScSolveParam();
    ScSolveParam( const ScSolveParam& r );
    ScSolveParam( const ScAddress&  rFormulaCell,
                  const ScAddress&  rVariableCell,
                  const String& rTargetValStr );
                  const OUString& rTargetValStr );
    ~ScSolveParam();

    ScSolveParam&   operator=   ( const ScSolveParam& r );
    sal_Bool            operator==  ( const ScSolveParam& r ) const;
    sal_Bool        operator==  ( const ScSolveParam& r ) const;
};

struct ScTabOpParam
@@ -60,7 +58,7 @@ struct ScTabOpParam
    ~ScTabOpParam() {};

    ScTabOpParam&   operator=       ( const ScTabOpParam& r );
    sal_Bool            operator==      ( const ScTabOpParam& r ) const;
    sal_Bool        operator==      ( const ScTabOpParam& r ) const;
};

#endif // SC_PARAMISC_HXX

sc/source/core/data/global2.cxx

diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 64c3622..bf8b8c9 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -234,7 +234,7 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r )
    :   aRefFormulaCell ( r.aRefFormulaCell ),
        aRefVariableCell( r.aRefVariableCell ),
        pStrTargetVal   ( r.pStrTargetVal
                            ? new String(*r.pStrTargetVal)
                            ? new OUString(*r.pStrTargetVal)
                            : NULL )
{
}
@@ -243,10 +243,10 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r )

ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell,
                            const ScAddress& rVariableCell,
                            const String&   rTargetValStr )
                            const OUString&   rTargetValStr )
    :   aRefFormulaCell ( rFormulaCell ),
        aRefVariableCell( rVariableCell ),
        pStrTargetVal   ( new String(rTargetValStr) )
        pStrTargetVal   ( new OUString(rTargetValStr) )
{
}

@@ -266,7 +266,7 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r )
    aRefFormulaCell  = r.aRefFormulaCell;
    aRefVariableCell = r.aRefVariableCell;
    pStrTargetVal    = r.pStrTargetVal
                            ? new String(*r.pStrTargetVal)
                            ? new OUString(*r.pStrTargetVal)
                            : NULL;
    return *this;
}