diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-07 00:11:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-07 00:13:42 +0100 |
| commit | 9dbe5a576330b7fadd8838249d07aafe548a4ee2 (patch) | |
| tree | c30e21b3566afcb2713789bb963d2787c5f8a60e /sw | |
| parent | fdo#74474: sw: fix Label wizard document creation (diff) | |
| download | core-9dbe5a576330b7fadd8838249d07aafe548a4ee2.tar.gz core-9dbe5a576330b7fadd8838249d07aafe548a4ee2.zip | |
fdo#74474: sw: fix Label wizard document creation harder
The function ReplacePoint() was changed to return a value but not all
call sites were adapted.
(regression from 263153842741d7ce21cc0bf1c5296a55a1138024)
Change-Id: I33efd9ce61611e025dfc76047187826aa0f8dd84
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/bastyp/calc.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/app/appenv.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 9843a2769e39..d44681618dde 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -512,8 +512,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins ) } // At this point the "real" case variable has to be used - OUString sTmpName( rStr ); - ::ReplacePoint( sTmpName ); + OUString const sTmpName( ::ReplacePoint(rStr) ); if( !ins ) { diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index b068661a7053..67519b0ad7f9 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -114,7 +114,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& r sal_uInt16 nCnt = comphelper::string::getTokenCount(sDBName, '.'); if (nCnt >= 3) { - ::ReplacePoint(sDBName, true); + sDBName = ::ReplacePoint(sDBName, true); SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh ); rFldMgr.InsertFld( aData ); sRet = sDBName; |