From 025604bbfa093ec4c29280793d2230e3cc3534d7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 Nov 2016 16:05:22 +0200 Subject: replace URLLOAD constants with o3tl::typed_flags Change-Id: Ief6cb3dfc53da8cbae0feded9e215905c7a8459c --- sw/source/uibase/docvw/romenu.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sw/source/uibase/docvw/romenu.cxx') diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 11a4e301e8ae..482d7949a08e 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -265,12 +265,13 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId ) TransferDataContainer* pClipCntnr = nullptr; sal_uInt16 nExecId = USHRT_MAX; - sal_uInt16 nFilter = USHRT_MAX; + bool bFilterSet = false; + LoadUrlFlags nFilter; switch( nId ) { case SID_WIN_FULLSCREEN : nExecId = SID_WIN_FULLSCREEN; break; - case MN_READONLY_OPENURL: nFilter = URLLOAD_NOFILTER; break; - case MN_READONLY_OPENURLNEW: nFilter = URLLOAD_NEWVIEW; break; + case MN_READONLY_OPENURL: nFilter = LoadUrlFlags::NONE; bFilterSet = true; break; + case MN_READONLY_OPENURLNEW: nFilter = LoadUrlFlags::NewView; bFilterSet = true; break; case MN_READONLY_COPY: nExecId = SID_COPY; break; case MN_READONLY_EDITDOC: nExecId = SID_EDITDOC; break; @@ -327,7 +328,7 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId ) } if( USHRT_MAX != nExecId ) rDis.GetBindings()->Execute( nExecId ); - if( USHRT_MAX != nFilter ) + if( bFilterSet ) ::LoadURL(rSh, sURL, nFilter, sTargetFrameName); if( pClipCntnr ) -- cgit