summaryrefslogtreecommitdiff
path: root/sw/source/core/doc
diff options
context:
space:
mode:
authorArmin Le Grand (Allotropia) <Armin.Le.Grand@me.com>2022-01-18 17:43:16 +0100
committerArmin Le Grand <Armin.Le.Grand@me.com>2022-01-24 14:55:26 +0100
commit310d196d7df37921e71f500869fca68cf00797d5 (patch)
tree7f7470c6398135d58d4074d3da519726a8fdf958 /sw/source/core/doc
parent54cda94175f372695c55576817e3ae14655598ea (diff)
tdf#122995 Trigger Chart refresh directly in UpdateCharts for SW
For OLE/Charts in SW we do not (yet) have a refresh mechanism or embedding of the primitive represetation, so this needs to be done locally here (simple solution). To have the Chart already invalidated at the next repaint, I needed to add a 'immediate' mode to InvalidateTable. Note: The text there claiming that the framework should do this is correct, but as long as the mechanism is incomplete (VC/VOC/OC in SW) direct refresh is needed. Change-Id: I3c845b3ec46fbb494e7bce163cfe105145421450 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128572 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit d769e75de28a1afbb1df31b48840626cb35ed7ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128810 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/core/doc')
-rw-r--r--sw/source/core/doc/docchart.cxx23
1 files changed, 22 insertions, 1 deletions
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 693f16886468..27d94c09a242 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -107,9 +107,30 @@ void SwDoc::UpdateCharts_( const SwTable& rTable, SwViewShell const & rVSh ) con
aName == pONd->GetChartTableName() &&
pONd->getLayoutFrame( rVSh.GetLayout() ) )
{
+ // tdf#122995 for OLE/Charts in SW we do not (yet) have a refresh
+ // mechanism or embedding of the primitive representation, so this
+ // needs to be done locally here (simplest solution).
+ bool bImmediateMode(false);
+
+ if(pONd->IsChart())
+ {
+ // refresh to trigger repaint
+ const SwRect aChartRect(pONd->FindLayoutRect());
+ if(!aChartRect.IsEmpty())
+ const_cast<SwViewShell &>(rVSh).InvalidateWindows(aChartRect);
+
+ // forced refresh of the chart's primitive representation
+ pONd->GetOLEObj().resetBufferedData();
+
+ // InvalidateTable using the Immediate-Mode, else the chart will
+ // not yet know that it is invalidated at the next repaint and create
+ // the same graphical representation again
+ bImmediateMode = true;
+ }
+
SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
if (pPCD)
- pPCD->InvalidateTable( &rTable );
+ pPCD->InvalidateTable( &rTable, bImmediateMode );
// following this the framework will now take care of repainting
// the chart or it's replacement image...
}