diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 15:31:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 15:31:03 +0000 |
| commit | 20fa7678ba7c4af209518b40a2b4ca9bbb7c9710 (patch) | |
| tree | ad8dbf7fe579cb8432baef8e0a1a5aa7ac86d225 /sc/source/filter/excel/xehelper.cxx | |
| parent | 44e1a31c8428e27fc7071ed46eea414ff65c44f9 (diff) | |
#i26291#: resolve merge conflicts with CWS dr20
Diffstat (limited to 'sc/source/filter/excel/xehelper.cxx')
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 09b826c5e180..878f7317b41a 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xehelper.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2004-09-08 15:34:40 $ + * last change: $Author: hr $ $Date: 2004-09-08 16:31:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -484,16 +484,16 @@ XclExpStringRef XclExpStringHelper::CreateString( return xString; } -XclExpStringPtr XclExpStringHelper::CreateString( +XclExpStringRef XclExpStringHelper::CreateString( const XclExpRoot& rRoot, const EditTextObject& rEditObj, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { - XclExpStringPtr pString; + XclExpStringRef pString; EditEngine& rEE = rRoot.GetDrawEditEngine(); BOOL bOldUpdateMode = rEE.GetUpdateMode(); rEE.SetUpdateMode( TRUE ); rEE.SetText( rEditObj); - pString = lclCreateString( rRoot, rEE, nFlags, nMaxLen, false ); + pString = lclCreateString( rRoot, rEE, 0, nFlags, nMaxLen ); rEE.SetUpdateMode( bOldUpdateMode ); if( !pString->IsEmpty() ) { |