diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2023-01-26 09:17:56 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-03-08 19:17:11 +0000 |
| commit | 5308d68a7cc0a4b38216438150adba2ac62e2bbe (patch) | |
| tree | d19fa457f17fbb0ecb792c2b7557dc161178e450 /include | |
| parent | 1c7b700179afda772af0f004e7ba497ba42fd8fc (diff) | |
tdf#149756 tdf#152545 PPTX import: position of standard connector - part2
and add new compatibility option "ConnectorUseSnapRect".
Standard connectors (bentConnector3, bentConnector4, bentConnector5)
are improved. MSO calculates the edge track differently, so have
to add "ConnectorUseSnapRect" compatibility option:
- For PPTX file format, it is set to true and use the snap rectangle
- For ODP format, it is set to false by default and use the bounding
rectangle.
Follow-up to commit eec48130271188cab63665acedbabf1ff5e850a2
"tdf#148926 tdf#151678 PPTX import: position of standard
connector - part1" (bentConnector2)
Change-Id: Icca84708d6e10d44ebf7262415d055ce9cfc157d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146162
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148480
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svdmodel.hxx | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 36017132e83d..72ce51ef6476 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -137,6 +137,7 @@ public: CustomShapePropertiesPtr& getCustomShapeProperties(){ return mpCustomShapePropertiesPtr; } OUString& getConnectorName() { return msConnectorName; } + std::vector<OUString>& getConnectorAdjustments() { return maConnectorAdjustmentList; }; ConnectorShapePropertiesList& getConnectorShapeProperties() { return maConnectorShapePropertiesList; } void setConnectorShape(bool bConnector) { mbConnector = bConnector; } bool isConnectorShape() const { return mbConnector; } @@ -330,6 +331,8 @@ protected: css::awt::Size maChSize; // only used for group shapes css::awt::Point maChPosition; // only used for group shapes + std::vector<OUString> maConnectorAdjustmentList; // only used for connector shapes + TextBodyPtr mpTextBody; LinePropertiesPtr mpLinePropertiesPtr; LinePropertiesPtr mpShapeRefLinePropPtr; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index b5d93fa53eb7..853f76570c1c 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -579,6 +579,10 @@ public: void SetLegacySingleLineFontwork(bool bEnabled); bool IsLegacySingleLineFontwork() const; + // tdf#149756 compatibility flag + void SetConnectorUseSnapRect(bool bEnabled); + bool IsConnectorUseSnapRect() const; + void ReformatAllTextObjects(); std::unique_ptr<SdrOutliner> createOutliner( OutlinerMode nOutlinerMode ); |