diff options
| -rw-r--r-- | sw/inc/cellatr.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/attr/cellatr.cxx | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 1ae2135dadcc..3a71cb24c2f0 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CELLATR_HXX -#define _CELLATR_HXX +#ifndef CELLATR_HXX +#define CELLATR_HXX #include <svl/intitem.hxx> #include <svl/zforlist.hxx> @@ -26,6 +26,8 @@ #include "format.hxx" #include "cellfml.hxx" +namespace rtl { class OUString; } + class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item { sal_Bool bAuto; ///< automatically given flag @@ -54,7 +56,7 @@ class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula // can only be TableBoxFormat public: - SwTblBoxFormula( const String& rFormula ); + SwTblBoxFormula( const OUString& rFormula ); ~SwTblBoxFormula() {}; // "pure virtual methods" of SfxPoolItem diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index c34ee343c571..43de12c3a5ca 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -27,6 +27,7 @@ #include <node.hxx> #include <rolbck.hxx> #include <rtl/math.hxx> +#include <rtl/ustring.hxx> #include <switerator.hxx> #include <swtable.hxx> @@ -55,7 +56,7 @@ SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const // SwTblBoxFormula // ----------------- -SwTblBoxFormula::SwTblBoxFormula( const String& rFormula ) +SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula ) : SfxPoolItem( RES_BOXATR_FORMULA ), SwTableFormula( rFormula ), pDefinedIn( 0 ) @@ -186,7 +187,7 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue ) { // create pointers from box names BoxNmToPtr( rCalcPara.pTbl ); - String sFml( MakeFormula( rCalcPara )); + const OUString sFml( MakeFormula( rCalcPara )); if( !rCalcPara.rCalc.IsCalcError() ) rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble(); else |