diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/cmdid.h | 3 | ||||
| -rw-r--r-- | sw/sdi/_viewsh.sdi | 2 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 17 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/swruler.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view0.cxx | 4 |
6 files changed, 6 insertions, 24 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 0b2662a3089d..e626bbb93458 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -173,8 +173,7 @@ #define FN_SET_MODOPT_TBLNUMFMT (FN_VIEW + 52) /* Number recognition in tables */ #define FN_HSCROLL_METRIC (FN_VIEW + 53) /* Metric horizontal scrollbar */ #define FN_VSCROLL_METRIC (FN_VIEW + 54) /* Metric vertical scrollbar */ -#define FN_VIEW_NOTES (FN_VIEW + 55) - +// 55 is free #define FN_NAVIGATION_POPUP (FN_VIEW + 56) /* Navigation Popup */ #define FN_SCROLL_PREV (FN_VIEW + 57) /* uno:ScrollToPrevious */ #define FN_SCROLL_NEXT (FN_VIEW + 58) /* uno:ScrollToNext */ diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index 97e5c6eab343..76e691dc35e0 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -789,7 +789,7 @@ interface BaseTextEditView Export = FALSE; ] - FN_VIEW_NOTES + SID_TOGGLE_NOTES [ ExecMethod = ExecViewOptions ; StateMethod = StateViewOptions ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index aa5d898eb18a..0146294d4ed6 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5349,23 +5349,6 @@ SfxUInt16Item ShowMultiplePages FN_SHOW_MULTIPLE_PAGES ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] -SfxBoolItem ShowAnnotations FN_VIEW_NOTES - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = TRUE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = GID_OPTIONS; -] SfxBoolItem ShowHiddenParagraphs FN_VIEW_HIDDEN_PARA diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 6f49708864d2..2651538f6f82 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -497,7 +497,7 @@ void SwPostItMgr::Focus(SfxBroadcaster& rBC) { if (!mpWrtShell->GetViewOptions()->IsPostIts()) { - SfxRequest aRequest(mpView->GetViewFrame(),FN_VIEW_NOTES); + SfxRequest aRequest(mpView->GetViewFrame(), SID_TOGGLE_NOTES); mpView->ExecViewOptions(aRequest); } diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 2ed26d26f061..1a1c1ef5dee9 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -237,7 +237,7 @@ void SwCommentRuler::MouseButtonDown( const MouseEvent& rMEvt ) // Toggle notes visibility SwView &rView = mpSwWin->GetView(); - SfxRequest aRequest( rView.GetViewFrame(), FN_VIEW_NOTES ); + SfxRequest aRequest( rView.GetViewFrame(), SID_TOGGLE_NOTES ); rView.ExecViewOptions( aRequest ); // It is inside comment control, so update help text diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 791af4811fb2..78daaedce1c3 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -267,7 +267,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet) aBool.SetValue( pOpt->IsViewMetaChars() ); break; case FN_VIEW_TABLEGRID: aBool.SetValue( SwViewOption::IsTableBoundaries() ); break; - case FN_VIEW_NOTES: + case SID_TOGGLE_NOTES: { aBool.SetValue( pOpt->IsPostIts()); if (!GetPostItMgr()->HasNotes()) @@ -413,7 +413,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->setBrowseMode( bFlag ); break; - case FN_VIEW_NOTES: + case SID_TOGGLE_NOTES: if ( STATE_TOGGLE == eState ) bFlag = !pOpt->IsPostIts(); |