diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:21:27 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 14:21:27 +0000 |
| commit | 81dd4e12cccfdc5fc0f715f2373f3804aa89b616 (patch) | |
| tree | 300dfebb9480b09ee3ea54445af376c5a1605b88 /svx/source | |
| parent | c0f92c25dacc041283b1f9fe25926655d68ca184 (diff) | |
INTEGRATION: CWS dba24c (1.60.110); FILE MERGED
2007/09/05 07:56:14 fs 1.60.110.1: #i80879# no semicolon-separated strings anymore
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 80c6c91f78a5..589d2cc86f22 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fmgridcl.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: hr $ $Date: 2007-06-27 18:08:12 $ + * last change: $Author: ihi $ $Date: 2007-11-21 15:21:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -682,9 +682,11 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) if (bDateNTimeCol) { - String sPostfix(SVX_RES(RID_STR_DATETIME_LABELPOSTFIX)); - xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName + ::rtl::OUString(sPostfix.GetToken(1, ';')))); - xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName + ::rtl::OUString(sPostfix.GetToken(0, ';')))); + String sTimePostfix( SVX_RES( RID_STR_POSTFIX_TIME ) ); + xCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sTimePostfix ) ) ); + + String sDatePostfix( SVX_RES( RID_STR_POSTFIX_DATE ) ); + xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sDatePostfix ) ) ); } else xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName)); @@ -725,11 +727,15 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) if (bDateNTimeCol) { String sRealName,sPurePostfix; - String sPostfix(SVX_RES(RID_STR_DATETIME_LABELPOSTFIX)); - for (xub_StrLen i=0; i<2; ++i) + String aPostfix[] = { + String( SVX_RES( RID_STR_POSTFIX_DATE ) ), + String( SVX_RES( RID_STR_POSTFIX_TIME ) ) + }; + + for ( size_t i=0; i<2; ++i ) { - sPurePostfix = sPostfix.GetToken(i, ';'); + sPurePostfix = aPostfix[i]; sPurePostfix.EraseLeadingChars(' '); sPurePostfix.EraseLeadingChars('('); sPurePostfix.EraseTrailingChars(')'); |