[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann]

 sal/osl/w32/file_url.cxx |    6 +-----
 sal/osl/w32/file_url.hxx |    1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 48e4bf5de26cdbfc654050247b7c7d0c50168caf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 12 15:59:32 2017 +0200

    Remove unused VALIDATEPATH_ALLOW_WILDCARDS
    
    Change-Id: Ia006d66df7bf90e6b4da327cd1bcb06968cc72f6
    Reviewed-on: https://gerrit.libreoffice.org/37720
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 84f8bb612b32..2858a1fd5909 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -99,13 +99,9 @@ static bool IsValidFilePathComponent(
                     break;
                 }
                 break;
-                /* '?' and '*' are valid wildcards but not valid file name characters */
+                /* The following characters are reserved */
             case '?':
             case '*':
-                if ( dwFlags & VALIDATEPATH_ALLOW_WILDCARDS )
-                    break;
-                SAL_FALLTHROUGH;
-                /* The following characters are reserved */
             case '<':
             case '>':
             case '\"':
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index 39bbc99b309c..7a3dc5c074b6 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -46,7 +46,6 @@
 #define PATHTYPE_IS_LONGPATH                0x0400
 
 #define VALIDATEPATH_NORMAL                 0x0000
-#define VALIDATEPATH_ALLOW_WILDCARDS        0x0001
 #define VALIDATEPATH_ALLOW_ELLIPSE          0x0002
 #define VALIDATEPATH_ALLOW_RELATIVE         0x0004
 #define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010