diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-07 14:03:00 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-07 14:03:58 +0100 |
| commit | 81b3adfcf22f53951f071596e7a0c81b47fb47ea (patch) | |
| tree | 0fe0f21526bdfdd85494bb503ed47ef7c4d45400 /vcl | |
| parent | d1273b428e60a3bd20fe57400e21dbb605879fb3 (diff) | |
Oops, this is a conflict resolution problem
Change-Id: I809de78066859a6b340ae5382d7f546c2db61f17
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/field2.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 1bfcd06b40de..c6cc613ab9d8 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2748,7 +2748,7 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect aStr = OUString::number( n ); aStr += ImplGetLocaleDataWrapper().getTime100SecSep(); if ( aNewTime.Get100Sec() < 10 ) - aStr += '0'; + aStr += "0"; aStr += OUString::number( aNewTime.Get100Sec() ); } else if ( mbDuration ) |