summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorGulsah Kose <gulsah.1004@gmail.com>2016-01-03 19:49:54 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2016-01-05 21:39:21 +0000
commit1949cc74b929e13799686b22b450ded8dbf4c064 (patch)
treeabc7d4c463f7f7264d6ec42a03f60981090a9206 /sw
parentd929e3a6b478b0bc02aa90ba326aab79353a7799 (diff)
tdf#90187 Added uno command for track changes bar.
v2: Solved dimmed button problem and changed controller class for listen trackchangesbar button. Change-Id: I5a921ad9bb6c8e53d3043e86492d0923a998f3d2 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21064 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/cmdid.h1
-rw-r--r--sw/sdi/_viewsh.sdi5
-rw-r--r--sw/sdi/swriter.sdi24
-rw-r--r--sw/source/uibase/app/swmodule.cxx1
-rw-r--r--sw/uiconfig/swriter/toolbar/standardbar.xml1
5 files changed, 32 insertions, 0 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd0ce77edbf0..acb112b13669 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -701,6 +701,7 @@
#define FN_SELECTION_MODE_DEFAULT (FN_SELECTION + 90) /* use default selection mode - not block mode */
#define FN_SELECTION_MODE_BLOCK (FN_SELECTION + 91) /* switch on block selection */
#define SID_JUMP_TO_SPECIFIC_PAGE (FN_SELECTION + 92)
+#define SID_TRACK_CHANGES_BAR (FN_SELECTION + 93) /* shows/hides track changes bar */
// QUERY-Block
#define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 78deb1fd17ab..58573f4b1930 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -803,6 +803,11 @@ interface BaseTextEditView
StateMethod = StateViewOptions ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_TRACK_CHANGES_BAR
+ [
+ ExecMethod = ExecViewOptions ;
+ StateMethod = StateViewOptions ;
+ ]
}
interface GlobalContents
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a80d38caa026..f43ed50ef1f8 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -91,6 +91,30 @@ SfxBoolItem TrackChanges FN_REDLINE_ON
GroupId = GID_EDIT;
]
+SfxAllEnumItem TrackChangesBar SID_TRACK_CHANGES_BAR
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
+]
+
SfxVoidItem AddAllUnknownWords FN_ADD_UNKNOWN
()
[
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 2e868648ecd2..0f3af657eddf 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -286,6 +286,7 @@ void SwDLL::RegisterControls()
SwModule* pMod = SW_MOD();
SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
+ SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod );
SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
SwTbxFieldCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod );
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index b917956080b4..2b69d33659a0 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -69,6 +69,7 @@
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation" toolbar:helpid="20329"/>
<toolbar:toolbaritem xlink:href=".uno:ShowTrackedChanges" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TrackChanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:TrackChangesBar"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:helpid="11002"/>