Kaydet (Commit) 0e585562 authored tarafından Noel Grandin's avatar Noel Grandin

convert EPathType to scoped enum

and drop unused values

Change-Id: I0ba498d66702fb4bb4ff23fb4c42783fc1c83f75
Reviewed-on: https://gerrit.libreoffice.org/63907
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst c9d4adb3
......@@ -6,14 +6,6 @@ canvas/source/cairo/cairo_canvashelper.hxx:216
enum cairocanvas::CanvasHelper::ColorType LINE_COLOR
canvas/source/cairo/cairo_canvashelper.hxx:216
enum cairocanvas::CanvasHelper::ColorType FILL_COLOR
cui/source/inc/hldoctp.hxx:54
enum SvxHyperlinkDocTp::EPathType Type_Unknown
cui/source/inc/hldoctp.hxx:55
enum SvxHyperlinkDocTp::EPathType Type_File
cui/source/inc/hldoctp.hxx:56
enum SvxHyperlinkDocTp::EPathType Type_ExistsDir
cui/source/inc/hldoctp.hxx:56
enum SvxHyperlinkDocTp::EPathType Type_Dir
drawinglayer/source/tools/emfpbrush.hxx:32
enum emfplushelper::EmfPlusHatchStyle HatchStyleVertical
drawinglayer/source/tools/emfpbrush.hxx:33
......
......@@ -233,7 +233,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void)
{
if ( GetPathType ( maStrURL ) == Type_ExistsFile ||
if ( GetPathType ( maStrURL ) == EPathType::ExistsFile ||
maStrURL.isEmpty() ||
maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ||
maStrURL.startsWith( sHash ) )
......@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void)
IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void)
{
if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
if ( IsMarkWndVisible() && ( GetPathType( maStrURL )== EPathType::ExistsFile ||
maStrURL.isEmpty() ||
maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) )
{
......@@ -347,9 +347,9 @@ SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rS
INetURLObject aURL( rStrPath, INetProtocol::File );
if( aURL.HasError() )
return Type_Invalid;
return EPathType::Invalid;
else
return Type_ExistsFile;
return EPathType::ExistsFile;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -51,9 +51,7 @@ private:
DECL_LINK( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout
enum EPathType { Type_Unknown, Type_Invalid,
Type_ExistsFile, Type_File,
Type_ExistsDir, Type_Dir };
enum class EPathType { Invalid, ExistsFile };
static EPathType GetPathType ( const OUString& rStrPath );
void FillDlgFields(const OUString& rStrURL) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment