diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/uiview/srcview.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewsrch.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 48989d5b3ce0..bb5696ccc5ae 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::util::SearchOptions; #define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW ) -#define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL)) +#define SRC_SEARCHOPTIONS (SearchOptionFlags::ALL & ~SearchOptionFlags(SearchOptionFlags::FORMAT|SearchOptionFlags::FAMILIES|SearchOptionFlags::SEARCHALL)) // Printing margins -> like Basic - Ide #define LMARGPRN 1700 @@ -458,11 +458,11 @@ void SwSrcView::GetState(SfxItemSet& rSet) break; case SID_SEARCH_OPTIONS: { - sal_uInt16 nOpt = SRC_SEARCHOPTIONS; + SearchOptionFlags nOpt = SRC_SEARCHOPTIONS; if(GetDocShell()->IsReadOnly()) - nOpt &= ~(SEARCH_OPTIONS_REPLACE|SEARCH_OPTIONS_REPLACE_ALL); + nOpt &= ~SearchOptionFlags(SearchOptionFlags::REPLACE|SearchOptionFlags::REPLACE_ALL); - rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, nOpt) ); + rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, static_cast<sal_uInt16>(nOpt) ) ); } break; case SID_SEARCH_ITEM: diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 8ed5c40b764c..e23c53c30194 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -798,11 +798,11 @@ void SwView::StateSearch(SfxItemSet &rSet) { case SID_SEARCH_OPTIONS: { - sal_uInt16 nOpt = 0xFFFF; + SearchOptionFlags nOpt = SearchOptionFlags::ALL; if( GetDocShell()->IsReadOnly() ) - nOpt &= ~( SEARCH_OPTIONS_REPLACE | - SEARCH_OPTIONS_REPLACE_ALL ); - rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, nOpt)); + nOpt &= ~SearchOptionFlags( SearchOptionFlags::REPLACE | + SearchOptionFlags::REPLACE_ALL ); + rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, static_cast<sal_uInt16>(nOpt) )); } break; case SID_SEARCH_ITEM: |