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

[Noel Grandin]

 include/rsc/rsc-vcl-shared-types.hxx |    2 +-
 vcl/source/control/field2.cxx        |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 544bd60be20d1abe195f51fc9906cdef2c8489dd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date:   Thu Feb 16 09:49:23 2017 +0200

    remove unused F_100TH_SEC from TimeFieldFormat enum
    
    Change-Id: I04b27ea7ede9dca6ca41ac910ac97a878788f2e0

diff --git a/include/rsc/rsc-vcl-shared-types.hxx 
b/include/rsc/rsc-vcl-shared-types.hxx
index 3e23887..1091e64 100644
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <o3tl/typed_flags_set.hxx>
 
-enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_100TH_SEC, F_SEC_CS 
};
+enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS };
 
 enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
                    SAVEAS, PRINT, CLOSE, QUIT,
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index cab30fd..dd7acf7 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1930,7 +1930,6 @@ static bool ImplTimeProcessKeyInput( Edit*, const 
KeyEvent& rKEvt,
              (rLocaleDataWrapper.getTimePM().indexOf(cChar) != -1) ||
              // Accept AM/PM:
              (cChar == 'a') || (cChar == 'A') || (cChar == 'm') || (cChar == 
'M') || (cChar == 'p') || (cChar == 'P') ||
-             ((eFormat == TimeFieldFormat::F_100TH_SEC) && 
string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) ||
              ((eFormat == TimeFieldFormat::F_SEC_CS) && 
string::equals(rLocaleDataWrapper.getTime100SecSep(), cChar)) ||
              (bDuration && (cChar == '-')) )
             return false;
@@ -2185,8 +2184,6 @@ bool TimeFormatter::ImplTimeReformat( const OUString& 
rStr, OUString& rOutStr )
     bool b100Sec = false;
     if ( meFormat != TimeFieldFormat::F_NONE )
         bSecond = true;
-    if ( meFormat == TimeFieldFormat::F_100TH_SEC )
-        b100Sec = true;
 
     if ( meFormat == TimeFieldFormat::F_SEC_CS )
     {
@@ -2412,7 +2409,7 @@ void TimeFormatter::ImplSetUserTime( const tools::Time& 
rNewTime, Selection* pNe
         bool b100Sec = false;
         if ( meFormat != TimeFieldFormat::F_NONE )
             bSec = true;
-        if ( meFormat == TimeFieldFormat::F_100TH_SEC || meFormat == 
TimeFieldFormat::F_SEC_CS )
+        if ( meFormat == TimeFieldFormat::F_SEC_CS )
             b100Sec = true;
         if ( meFormat == TimeFieldFormat::F_SEC_CS )
         {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits