[Libreoffice-commits] core.git: 2 commits - cui/source icon-themes/galaxy icon-themes/tango officecfg/registry sw/inc sw/sdi sw/uiconfig
Jan Holesovsky
kendy at collabora.com
Thu Dec 18 12:51:13 PST 2014
cui/source/dialogs/SpellDialog.cxx | 10 +++++++---
dev/null |binary
icon-themes/galaxy/cmd/lc_accepttrackedchange.png |binary
icon-themes/galaxy/cmd/lc_rejecttrackedchange.png |binary
icon-themes/galaxy/cmd/sc_accepttrackedchange.png |binary
icon-themes/galaxy/cmd/sc_rejecttrackedchange.png |binary
icon-themes/tango/cmd/lc_accepttrackedchange.png |binary
icon-themes/tango/cmd/lc_rejecttrackedchange.png |binary
icon-themes/tango/cmd/sc_accepttrackedchange.png |binary
icon-themes/tango/cmd/sc_rejecttrackedchange.png |binary
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 4 ++--
sw/inc/swcommands.h | 4 ++--
sw/sdi/swriter.sdi | 4 ++--
sw/uiconfig/swriter/toolbar/changes.xml | 4 ++--
14 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 72ee6012b056c50957e160f0ebf2b828b324db3e
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Dec 17 08:49:44 2014 +0100
Typo: .uno:*TracedChange -> .uno:*TrackedChange.
Change-Id: I173728b9f800b6a9c6e81d496a268b4e42cf4db9
diff --git a/icon-themes/galaxy/cmd/lc_accepttracedchange.png b/icon-themes/galaxy/cmd/lc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/lc_accepttracedchange.png
rename to icon-themes/galaxy/cmd/lc_accepttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/lc_rejecttracedchange.png b/icon-themes/galaxy/cmd/lc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/lc_rejecttracedchange.png
rename to icon-themes/galaxy/cmd/lc_rejecttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/sc_accepttracedchange.png b/icon-themes/galaxy/cmd/sc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/sc_accepttracedchange.png
rename to icon-themes/galaxy/cmd/sc_accepttrackedchange.png
diff --git a/icon-themes/galaxy/cmd/sc_rejecttracedchange.png b/icon-themes/galaxy/cmd/sc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/galaxy/cmd/sc_rejecttracedchange.png
rename to icon-themes/galaxy/cmd/sc_rejecttrackedchange.png
diff --git a/icon-themes/tango/cmd/lc_accepttracedchange.png b/icon-themes/tango/cmd/lc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/lc_accepttracedchange.png
rename to icon-themes/tango/cmd/lc_accepttrackedchange.png
diff --git a/icon-themes/tango/cmd/lc_rejecttracedchange.png b/icon-themes/tango/cmd/lc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/lc_rejecttracedchange.png
rename to icon-themes/tango/cmd/lc_rejecttrackedchange.png
diff --git a/icon-themes/tango/cmd/sc_accepttracedchange.png b/icon-themes/tango/cmd/sc_accepttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/sc_accepttracedchange.png
rename to icon-themes/tango/cmd/sc_accepttrackedchange.png
diff --git a/icon-themes/tango/cmd/sc_rejecttracedchange.png b/icon-themes/tango/cmd/sc_rejecttrackedchange.png
similarity index 100%
rename from icon-themes/tango/cmd/sc_rejecttracedchange.png
rename to icon-themes/tango/cmd/sc_rejecttrackedchange.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7cc0a7f..d49d502 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -164,7 +164,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:RejectTracedChange" oor:op="replace">
+ <node oor:name=".uno:RejectTrackedChange" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Reject Change</value>
</prop>
@@ -172,7 +172,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:AcceptTracedChange" oor:op="replace">
+ <node oor:name=".uno:AcceptTrackedChange" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Accept Change</value>
</prop>
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 0d7aadd..5f85b51 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -122,8 +122,8 @@
#define CMD_FN_HIDE_NOTE ".uno:HideNote"
#define CMD_FN_HIDE_NOTE_AUTHOR ".uno:HideAuthor"
#define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes"
-#define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTracedChange"
-#define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTracedChange"
+#define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTrackedChange"
+#define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTrackedChange"
#define CMD_FN_REDLINE_NEXT_CHANGE ".uno:NextTrackedChange"
#define CMD_FN_REDLINE_PREV_CHANGE ".uno:PreviousTrackedChange"
#define CMD_FN_REMOVE_HYPERLINK ".uno:RemoveHyperlink"
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 2ca2c08..7e4cd2b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -9799,7 +9799,7 @@ SfxBoolItem SpellingAndGrammarDialog FN_SPELL_GRAMMAR_DIALOG
GroupId = GID_EDIT;
]
-SfxVoidItem AcceptTracedChange FN_REDLINE_ACCEPT_DIRECT
+SfxVoidItem AcceptTrackedChange FN_REDLINE_ACCEPT_DIRECT
[
/* flags: */
AutoUpdate = FALSE,
@@ -9824,7 +9824,7 @@ SfxVoidItem AcceptTracedChange FN_REDLINE_ACCEPT_DIRECT
GroupId = GID_EDIT;
]
-SfxVoidItem RejectTracedChange FN_REDLINE_REJECT_DIRECT
+SfxVoidItem RejectTrackedChange FN_REDLINE_REJECT_DIRECT
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml
index dc89387..47bad1f 100644
--- a/sw/uiconfig/swriter/toolbar/changes.xml
+++ b/sw/uiconfig/swriter/toolbar/changes.xml
@@ -23,8 +23,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviousTrackedChange" toolbar:text="Previous"/>
<toolbar:toolbaritem xlink:href=".uno:NextTrackedChange" toolbar:text="Next"/>
- <toolbar:toolbaritem xlink:href=".uno:AcceptTracedChange" toolbar:text="Accept" toolbar:helpid="10625"/>
- <toolbar:toolbaritem xlink:href=".uno:RejectTracedChange" toolbar:text="Reject" toolbar:helpid="10626"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChange" toolbar:text="Accept" toolbar:helpid="10625"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectTrackedChange" toolbar:text="Reject" toolbar:helpid="10626"/>
<toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges" toolbar:text="List" toolbar:helpid="10622"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:CommentChangeTracking" toolbar:text="Comment" toolbar:helpid="10625"/>
commit 08e0a79aeba6fd41cbb51de3be48659619f27206
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Dec 18 21:42:13 2014 +0100
spell dialog: Make [Close] work in protected documents with editable fields.
We have to call ToggleChildWindow directly; calling SfxDispatcher's Execute()
does not work here when we are in a document with protected section - in that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).
Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a589bab..2aba722 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,9 +736,13 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
bool SpellDialog::Close()
{
- GetBindings().GetDispatcher()->
- Execute(rParent.GetType(),
- SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
+ // We have to call ToggleChildWindow directly; calling SfxDispatcher's
+ // Execute() does not work here when we are in a document with protected
+ // section - in that case, the cursor can move from the editable field to
+ // the protected area, and the slots get disabled because of
+ // SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+ SfxViewFrame::Current()->ToggleChildWindow(rParent.GetType());
+
return true;
}
More information about the Libreoffice-commits
mailing list