include/svx/svxids.hrc | 1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5 --
sc/sdi/docsh.sdi | 2 +
sc/source/ui/docshell/docsh3.cxx | 5 ++
sc/source/ui/docshell/docsh4.cxx | 5 ++
sc/source/ui/inc/docsh.hxx | 1
svx/sdi/svx.sdi | 16
+++++++++
sw/inc/cmdid.h | 4 --
sw/sdi/_viewsh.sdi | 2 -
sw/sdi/swriter.sdi | 17
----------
sw/sdi/viewsh.sdi | 2 -
sw/source/uibase/uiview/pview.cxx | 2 -
sw/source/uibase/uiview/view2.cxx | 2 -
14 files changed, 40 insertions(+), 29 deletions(-)
New commits:
commit b524e70db6f01ed8bfe5dddb0401f8d1622c2d24
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Jan 13 13:50:39 2021 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 21 08:53:20 2021 +0100
Bring uno:RefreshView to Calc
Allow refreshing the document layout via UNO slot
Change-Id: I956bb884b1fb4231b1f617c4aa5a80ff9a45ec92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109269
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6c5ae5c13117..e9abb5be0672 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -652,6 +652,7 @@ class SfxStringItem;
#define SID_FM_SHOW_DATANAVIGATOR ( SID_SVX_START + 773 )
#define SID_FM_DATANAVIGATOR_CONTROL ( SID_SVX_START + 774 )
#define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 )
+#define SID_REFRESH_VIEW ( SID_SVX_START + 776 )
// CAUTION! Range <855 .. 855> used by EditEngine (!)
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 4143da531483..f0fa6e973d3e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5712,6 +5712,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:RefreshView" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Refresh document layout</value>
+ </prop>
+ </node>
<node oor:name=".uno:RecSearch" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Find Record...</value>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 286f44343fa9..dc37904c7c89 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2373,11 +2373,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:RefreshView" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Restore View</value>
- </prop>
- </node>
<node oor:name=".uno:JumpToEndOfDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Directly to Document End</value>
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index fdb22acf3e0c..0ec807cf6d73 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -75,6 +75,8 @@ interface TableDocument
SID_SHARE_DOC [ ExecMethod = Execute; StateMethod = GetState; ]
SID_NOTEBOOKBAR [ ExecMethod = Execute; StateMethod = GetState; ]
SID_LANGUAGE_STATUS [ ExecMethod = Execute; StateMethod = GetState; ]
+
+ SID_REFRESH_VIEW [ ExecMethod = Execute; StateMethod = GetState; ]
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 028e24dc9bf8..303cefe1ee43 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -177,6 +177,11 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges,
PaintPartFlags nPart, sa
}
}
+void ScDocShell::PostPaintAll()
+{
+ PostPaint(0, 0, 0, MAXCOL, MAXROW, MAXTAB, PaintPartFlags::All);
+}
+
void ScDocShell::PostPaintGridAll()
{
PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PaintPartFlags::Grid );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 853de4150c5b..52a44126539d 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1252,6 +1252,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
}
break;
+ case SID_REFRESH_VIEW:
+ {
+ PostPaintGridAll();
+ }
+ break;
default:
{
// small (?) hack -> forwarding of the slots to TabViewShell
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 5b990f24e6a6..c81e40fcaf11 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -322,6 +322,7 @@ public:
void PostPaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
void PostPaintCell( const ScAddress& rPos );
+ void PostPaintAll();
void PostPaintGridAll();
void PostPaintExtras();
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index d9be1425c8f4..e3b2599732a3 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6985,6 +6985,22 @@ SfxVoidItem RefreshFormControl
SID_FM_REFRESH_FORM_CONTROL
GroupId = SfxGroupId::Table;
]
+SfxVoidItem RefreshView SID_REFRESH_VIEW
+()
+[
+ AutoUpdate = FALSE,
+ FastCall = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::View;
+]
SfxVoidItem RemoveFilterSort SID_FM_REMOVE_FILTER_SORT
()
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index a5cc561f8a6f..8301b15f1047 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -143,9 +143,7 @@
#define FN_REDLINE_ACCEPT_ALL (FN_EDIT2 + 43) /* Redlining Accept
All*/
#define FN_REDLINE_REJECT_ALL (FN_EDIT2 + 44) /* Redlining Reject
All*/
-// Region: Edit
-#define FN_REFRESH_VIEW (FN_VIEW + 1) /* Refresh/Redraw */
-
+// Region: View
#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw wrapping dlg */
#define FN_RULER (FN_VIEW + 11) /* Horizontal ruler */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index d61142d9bfde..5f41a6bb94e4 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -18,7 +18,7 @@
interface BaseTextEditView
{
- FN_REFRESH_VIEW // status(final|play)
+ SID_REFRESH_VIEW // status(final|play)
[
ExecMethod = Execute ;
]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index d0e618229b12..ea1d59b17464 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -4729,23 +4729,6 @@ SfxBoolItem ProtectTraceChangeMode FN_REDLINE_PROTECT
GroupId = SfxGroupId::Edit;
]
-SfxVoidItem RefreshView FN_REFRESH_VIEW
-()
-[
- AutoUpdate = FALSE,
- FastCall = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = SfxGroupId::View;
-]
-
SfxVoidItem RemoveBullets FN_NUM_BULLET_OFF
()
[
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 9980f21153cd..9dae6ad632d0 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -288,7 +288,7 @@ interface TextPrintPreview
ExecMethod = Execute;
StateMethod = GetState;
]
- FN_REFRESH_VIEW // status(final|play)
+ SID_REFRESH_VIEW // status(final|play)
[
StateMethod = GetState ;
]
diff --git a/sw/source/uibase/uiview/pview.cxx
b/sw/source/uibase/uiview/pview.cxx
index d0c2cbbbf0a3..86c8b0034b2d 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -680,7 +680,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
switch(rReq.GetSlot())
{
- case FN_REFRESH_VIEW:
+ case SID_REFRESH_VIEW:
case FN_STAT_PAGE:
case FN_STAT_ZOOM:
break;
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 8ab119113225..0522426bb5d8 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -530,7 +530,7 @@ void SwView::Execute(SfxRequest &rReq)
case FN_EDIT_LINK_DLG:
EditLinkDlg();
break;
- case FN_REFRESH_VIEW:
+ case SID_REFRESH_VIEW:
GetEditWin().Invalidate();
m_pWrtShell->Reformat();
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
