[Libreoffice-commits] core.git: vcl/source

Fridrich Å trba fridrich.strba at bluewin.ch
Thu Mar 7 05:04:19 PST 2013


 vcl/source/control/field2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81b3adfcf22f53951f071596e7a0c81b47fb47ea
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 7 14:03:00 2013 +0100

    Oops, this is a conflict resolution problem
    
    Change-Id: I809de78066859a6b340ae5382d7f546c2db61f17

diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 1bfcd06..c6cc613 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 )


More information about the Libreoffice-commits mailing list