diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-11 14:01:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 08:04:41 +0200 |
| commit | 21842bbb4f36cdd41363f92e498c469097de523e (patch) | |
| tree | c6619687fb384999dfbc2c568fc9a5bfc70f4a44 | |
| parent | f733ca910026daa2232f2e2de3394bd36134dd78 (diff) | |
convert include/formula/formdata.hxx from String to OUString
Change-Id: Ic5543744700a47e796178d664a710c1ea4faada0
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
| -rw-r--r-- | include/formula/formdata.hxx | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index e30fe609daa0..7f54a59255a3 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1903,7 +1903,7 @@ void FormEditData::Reset() aUniqueId=OString(); aSelection.Min()=0; aSelection.Max()=0; - aUndoStr.Erase(); + aUndoStr = ""; } // ----------------------------------------------------------------------------- const FormEditData& FormEditData::operator=( const FormEditData& r ) diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 595ddb63fc5a..d7d60b55d43c 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -36,14 +36,14 @@ public: virtual void SaveValues(); sal_Bool HasParent() const { return pParent != NULL; } - inline sal_uInt16 GetMode() const { return nMode; } + inline sal_uInt16 GetMode() const { return nMode; } inline xub_StrLen GetFStart() const { return nFStart; } - inline sal_uInt16 GetCatSel() const { return nCatSel; } - inline sal_uInt16 GetFuncSel() const { return nFuncSel; } - inline sal_uInt16 GetOffset() const { return nOffset; } - inline sal_uInt16 GetEdFocus() const { return nEdFocus; } - inline const String& GetUndoStr() const { return aUndoStr; } - inline sal_Bool GetMatrixFlag()const{ return bMatrix;} + inline sal_uInt16 GetCatSel() const { return nCatSel; } + inline sal_uInt16 GetFuncSel() const { return nFuncSel; } + inline sal_uInt16 GetOffset() const { return nOffset; } + inline sal_uInt16 GetEdFocus() const { return nEdFocus; } + inline const OUString& GetUndoStr() const { return aUndoStr; } + inline sal_Bool GetMatrixFlag()const{ return bMatrix;} inline OString GetUniqueId()const { return aUniqueId;} inline const Selection& GetSelection()const { return aSelection;} @@ -53,7 +53,7 @@ public: inline void SetFuncSel( sal_uInt16 nNew ) { nFuncSel = nNew; } inline void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; } inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } - inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } + inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(sal_Bool bNew) { bMatrix=bNew;} inline void SetUniqueId(const OString nNew) { aUniqueId=nNew;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} @@ -64,15 +64,15 @@ protected: FormEditData* pParent; // fuer Verschachtelung private: - sal_uInt16 nMode; // enum ScFormulaDlgMode + sal_uInt16 nMode; // enum ScFormulaDlgMode xub_StrLen nFStart; - sal_uInt16 nCatSel; - sal_uInt16 nFuncSel; - sal_uInt16 nOffset; - sal_uInt16 nEdFocus; - String aUndoStr; - sal_Bool bMatrix; - OString aUniqueId; + sal_uInt16 nCatSel; + sal_uInt16 nFuncSel; + sal_uInt16 nOffset; + sal_uInt16 nEdFocus; + OUString aUndoStr; + sal_Bool bMatrix; + OString aUniqueId; Selection aSelection; }; |