diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-16 22:34:50 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-09-17 09:10:18 +0200 |
| commit | 1ebb77fd17b417d92ab48fcef56a0230c5750de2 (patch) | |
| tree | 6f36c8b63ada04af4dfe4acaefb32d57995565fd /sd | |
| parent | 47543560311038191fd7ae901031da6c40b697b1 (diff) | |
SOSAW080: Derive SdrObjGroup from SdrObjList
Also simplify parent/child relationships, get rid
of double data (SdrPage/Parent infos in SdrObjects,
also in SdrObjList). This is all not needed - when a
SdrObject is inserted to a SdrPage, get SdrPage by
traveling over parents (no double info, member as soon
as inserted, ...).
More cleanups/reworks included, will need some more
cleanups, too.
Stabilizing: SetRectsDirty/DefaultStyleSheet
Had to correct the SetRectsDirty stuff for 3D due to
going down the hierarchy while the 2D implementation
goes the other direction -> endless loops. Added special
handling for 3D stuff for now (will be chnaged again when
SnapRect is no longer needed at SdrObject level).
Also had to adapt how the DefaultStyleSheet is set at
incarnated SdrObjects - better: their properties. Since
we now always have a SdrModel, it is possible to correctly
initialize with the correct default StyleSheet from that
SdrModel.
This needs to be done after ForceDefaultAttributes and in a
way that again deletes Items that are set in the StyleSheet.
This leads to an error in CppunitTest_sd_import_tests where
I checked tdf100491 - it is okay and thus I change the control
instance of the imported, XML-dumped file.
The less hard attributes, the better for Styles in general.
Cleanup of comments for last two commits
Corrected SvxShape::getParent()
Needed to get the direct parent, so test for SdrObject
first (to get SdrObjGroup/E3DScene), for SdrPage second
Fixed CppunitTest_sc_subsequent_export_test
Several problems arose. The used SdrCaptionObj was
Cloned, but the clone not inserted to a SdrPage. This
leads to not being able to access a UNO API imlementation
of the SdrPage (SvxPage) on lower levels.
It worked before due to SdrObject having a SdrPage*
additionally to being added to a SdrPage - this is exactly
the main cleanup this change does.
Looked for why it is cloned, could see no reasons. The
SdrCaptionObj exists during all im/export, not difference
to other SdrObjects (that do not get cloned). It is not
changed in any way. It *might* be to suppress a crash that
happened due to UNO API Service emfio/emfio not being
available in the UnitTest scenario. Interestingly it
did not crash with the cloned SdrCaptionObj, but the
Graphic exported was probably wrong.
Fixed by no longer Cloning the SdrCaptionObj and adding
emfio/emfio UNO API Service.
d139f821a5b39535a3e7b9c6261df7e18f8ae8ac
910e7f4bc628a715fda7545dffaf3369d5e76ea0
ca1de01b723051e09ac37d7ec7bba978beea41c5
3a76da1471dfe75e69847f64a6a3519ad21c8c9c
Change-Id: I986586e326b563acebf00d931a7084c6eb09e5f8
Reviewed-on: https://gerrit.libreoffice.org/54689
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/60535
Tested-by: Jenkins
Diffstat (limited to 'sd')
42 files changed, 186 insertions, 193 deletions
diff --git a/sd/qa/unit/data/xml/tdf100491_0.xml b/sd/qa/unit/data/xml/tdf100491_0.xml index 0c250e6fc840..7e9c39007f0a 100644..100755 --- a/sd/qa/unit/data/xml/tdf100491_0.xml +++ b/sd/qa/unit/data/xml/tdf100491_0.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="3680" positionY="2451" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 3" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="3680" positionY="2451" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 3" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -35,7 +35,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4324" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 4" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="4324" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 4" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -70,7 +70,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4947" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 5" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="4947" positionY="2449" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 5" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -105,7 +105,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="9401" positionY="2435" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 6" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="9401" positionY="2435" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 6" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -140,7 +140,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10043" positionY="2433" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 7" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="10043" positionY="2433" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 7" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -175,7 +175,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10669" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 8" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="10669" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 8" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -210,7 +210,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12466" positionY="2433" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 9" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="12466" positionY="2433" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 9" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -245,7 +245,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13107" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 10" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="13107" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 10" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -280,7 +280,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13731" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 11" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="13731" positionY="2431" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 11" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -315,7 +315,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="15872" positionY="2431" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 12" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="15872" positionY="2431" sizeX="6" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 12" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -350,7 +350,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="16513" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 13" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="16513" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 13" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -385,7 +385,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="17137" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 14" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="17137" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 14" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -420,7 +420,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="17772" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 15" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="17772" positionY="2430" sizeX="5" sizeY="2988" type="com.sun.star.drawing.LineShape" name="Straight Connector 15" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -455,7 +455,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="6549" positionY="2438" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 16" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="6549" positionY="2438" sizeX="6" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 16" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -490,7 +490,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="7193" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 17" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="7193" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 17" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> @@ -525,7 +525,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="7816" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 18" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="7816" positionY="2435" sizeX="5" sizeY="2990" type="com.sun.star.drawing.LineShape" name="Straight Connector 18" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart> <pointSequence> diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index b87b46d75523..98896e618c3e 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -91,8 +91,8 @@ namespace sd // create a dictionary to map source to cloned shapes if( pSourcePage && pTargetPage ) { - SdrObjListIter aSourceIter( *pSourcePage, SdrIterMode::DeepWithGroups ); - SdrObjListIter aTargetIter( *pTargetPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aSourceIter( pSourcePage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aTargetIter( pTargetPage, SdrIterMode::DeepWithGroups ); while( aSourceIter.IsMore() && aTargetIter.IsMore() ) { diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 1473358706fc..0b18595be1de 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1543,7 +1543,7 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() ); if( pObj ) { - SdrPage* pPage = pObj->GetPage(); + SdrPage* pPage = pObj->getSdrPageFromSdrObject(); if( pPage ) { const Size aPageSize( pPage->GetSize() ); @@ -1583,7 +1583,7 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj aPolyPoly.transform(basegfx::utils::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); - SdrPage* pPage = pObj->GetPage(); + SdrPage* pPage = pObj->getSdrPageFromSdrObject(); if( pPage ) { const Size aPageSize( pPage->GetSize() ); diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 305ca6e9a585..6fd8671755fa 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -406,14 +406,34 @@ EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSequence, static bool implIsInsideGroup( SdrObject const * pObj ) { - return pObj && pObj->getParentOfSdrObject() && pObj->getParentOfSdrObject()->GetUpList(); + // TTTT for current state of transition, SdrObject has a parent* + // to a SdrObjList. That may be a SdrPage or a SdrObjGroup, both + // are already derived from SdrObjList. To finally check, use + // the method 'getSdrObjectFromSdrObjList' - if it's not a SdrPage, + // it will return SdrObjGroup or E3dScene -> SdrObject. + // For future states, test for SdrObject. Trying to get the SdrPage + // will in the future depend on the Object(this) to be inserted to a + // SdrPage, regardless of e.g. being a group member. + if(nullptr == pObj) + { + return false; + } + + SdrObjList* pSdrObjList(pObj->getParentOfSdrObject()); + + if(nullptr == pSdrObjList) + { + return false; + } + + return (nullptr != pSdrObjList->getSdrObjectFromSdrObjList()); } void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEffect ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); @@ -432,7 +452,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets(); CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( aPresetId ) ); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); if( pPreset.get() && pMainSequence.get() ) { @@ -487,7 +507,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff { CustomAnimationEffectPtr pEffect( new CustomAnimationEffect( xNode ) ); pEffect->setTarget( makeAny( xShape ) ); - SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); const bool bManual = (pPage == nullptr) || (pPage->GetPresChange() == PRESCHANGE_MANUAL); if( !bManual ) pEffect->setNodeType( EffectNodeType::AFTER_PREVIOUS ); @@ -535,7 +555,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) OUString aPresetSubType; SdrObject* pObj = pShape->GetSdrObject(); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); if( pMainSequence.get() ) { @@ -573,9 +593,9 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect eEffect ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); @@ -603,7 +623,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect // create an effect from this preset CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( aPresetId ) ); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); if( pPreset.get() && pMainSequence.get() ) { @@ -652,7 +672,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect pShapeEffect->setDuration( 0.1 ); pMainSequence->append( pShapeEffect ); - SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); if( pPage && pPage->GetPresChange() != PRESCHANGE_MANUAL ) pShapeEffect->setNodeType( EffectNodeType::AFTER_PREVIOUS ); } @@ -661,7 +681,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect if( pShapeEffect.get() ) { - SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); const bool bManual = (pPage == nullptr) || (pPage->GetPresChange() == PRESCHANGE_MANUAL); // now create effects for each paragraph @@ -717,7 +737,7 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) SdrObject* pObj = pShape->GetSdrObject(); if( pObj ) { - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); if( pMainSequence.get() ) { @@ -800,9 +820,9 @@ double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed ) void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); @@ -811,7 +831,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed double fDuration = ConvertAnimationSpeed( eSpeed ); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -836,7 +856,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -876,16 +896,16 @@ AnimationSpeed EffectMigration::ConvertDuration( double fDuration ) void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); if( implIsInsideGroup( pObj ) ) return; - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -914,9 +934,9 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) if( pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - if( pObj && pObj->GetPage() ) + if( pObj && pObj->getSdrPageFromSdrObject() ) { - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; @@ -940,16 +960,16 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); if( implIsInsideGroup( pObj ) ) return; - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -981,9 +1001,9 @@ bool EffectMigration::GetDimHide( SvxShape* pShape ) if( pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - if( pObj && pObj->GetPage() ) + if( pObj && pObj->getSdrPageFromSdrObject() ) { - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -1007,9 +1027,9 @@ bool EffectMigration::GetDimHide( SvxShape* pShape ) void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) { - DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(), + DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->getSdrPageFromSdrObject(), "sd::EffectMigration::SetAnimationEffect(), invalid argument!" ); - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); @@ -1021,7 +1041,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) if( bDimPrevious ) aColor <<= COL_LIGHTGRAY; - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -1051,9 +1071,9 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape ) if( pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - if( pObj && pObj->GetPage() ) + if( pObj && pObj->getSdrPageFromSdrObject() ) { - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -1077,11 +1097,11 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape ) void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos ) { - if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->GetPage() ) + if( !pShape || !pShape->GetSdrObject() || !pShape->GetSdrObject()->getSdrPageFromSdrObject() ) return; SdrObject* pObj = pShape->GetSdrObject(); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); EffectSequence& rSequence = pMainSequence->getSequence(); sal_Int32 nPos; @@ -1173,7 +1193,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape ) sal_Int32 nPos = -1, nFound = -1; SdrObject* pObj = pShape->GetSdrObject(); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); EffectSequence& rSequence = pMainSequence->getSequence(); @@ -1208,7 +1228,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const if( pInfo ) { SdrObject* pObj = pShape->GetSdrObject(); - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -1248,9 +1268,9 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) if( pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - if( pObj && pObj->GetPage() ) + if( pObj && pObj->getSdrPageFromSdrObject() ) { - sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); const Reference< XShape > xShape( pShape ); @@ -1286,7 +1306,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj const * pPa if( pObj ) { const Reference< XShape > xShape( pShape ); - SdPage* pPage = dynamic_cast< SdPage* >(pPathObj->GetPage()); + SdPage* pPage = dynamic_cast< SdPage* >(pPathObj->getSdrPageFromSdrObject()); if( pPage ) { std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 1a38fb080e99..e8c9b312d99f 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -88,7 +88,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const while (nPage < nMaxPages && !pObjFound) { pPage = static_cast<const SdPage*>( GetPage(nPage) ); - SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups); + SdrObjListIter aIter(pPage, SdrIterMode::DeepWithGroups); while (aIter.IsMore() && !pObjFound) { @@ -113,7 +113,7 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const while (nPage < nMaxMasterPages && !pObjFound) { pPage = static_cast<const SdPage*>( GetMasterPage(nPage) ); - SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups); + SdrObjListIter aIter(pPage, SdrIterMode::DeepWithGroups); while (aIter.IsMore() && !pObjFound) { diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 631796dde2ae..81312b1933f3 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1027,7 +1027,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( pBMView->EndListening(*pBookmarkDoc); } - pPage = pObj->GetPage(); + pPage = pObj->getSdrPageFromSdrObject(); if (pPage->IsMasterPage()) { diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b886954196a2..21561130de0a 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -789,7 +789,7 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling) // Fill OnlineSpelling list void SdDrawDocument::FillOnlineSpellingList(SdPage const * pPage) { - SdrObjListIter aIter(*pPage, SdrIterMode::Flat); + SdrObjListIter aIter(pPage, SdrIterMode::Flat); while (aIter.IsMore()) { @@ -806,8 +806,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage const * pPage) else if (pObj->GetObjIdentifier() == OBJ_GRUP) { // Found a group object - SdrObjListIter aGroupIter(*static_cast<SdrObjGroup*>(pObj)->GetSubList(), - SdrIterMode::DeepNoGroups); + SdrObjListIter aGroupIter(static_cast< SdrObjGroup* >(pObj)->GetSubList(), SdrIterMode::DeepNoGroups); bool bSubTextObjFound = false; @@ -847,8 +846,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl, Timer *, void) else if (pObj->GetObjIdentifier() == OBJ_GRUP) { // Found a group object - SdrObjListIter aGroupIter(*static_cast<SdrObjGroup*>(pObj)->GetSubList(), - SdrIterMode::DeepNoGroups); + SdrObjListIter aGroupIter(static_cast< SdrObjGroup* >(pObj)->GetSubList(), SdrIterMode::DeepNoGroups); while (aGroupIter.IsMore()) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 96835106736d..377b01ab78f7 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -664,7 +664,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const slides masterpage */ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const { - OUString aStyleName( mpPage->GetLayoutName() ); + OUString aStyleName( GetLayoutName() ); const OUString aSep( SD_LT_SEPARATOR ); sal_Int32 nIndex = aStyleName.indexOf(aSep); if( nIndex != -1 ) @@ -2826,7 +2826,7 @@ bool SdPage::checkVisibility( if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_TEXT ) ) { - const SdPage* pCheckPage = dynamic_cast< const SdPage* >(pObj->GetPage()); + const SdPage* pCheckPage = dynamic_cast< const SdPage* >(pObj->getSdrPageFromSdrObject()); if( pCheckPage ) { @@ -2873,7 +2873,7 @@ bool SdPage::checkVisibility( // i63977, do not print SdrpageObjs from master pages if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_PAGE ) ) { - if( pObj->GetPage() && pObj->GetPage()->IsMasterPage() ) + if( pObj->getSdrPageFromSdrObject() && pObj->getSdrPageFromSdrObject()->IsMasterPage() ) return false; } @@ -2953,7 +2953,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, if( eLayout == AUTOLAYOUT_NONE ) { // use layout from handout master - SdrObjListIter aShapeIter (rHandoutMaster); + SdrObjListIter aShapeIter(&rHandoutMaster); std::vector< ::tools::Rectangle > vSlidesAreas; while ( aShapeIter.IsMore() ) diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index ee1f75059709..15ba777f578c 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -391,8 +391,8 @@ void SdPage::lateInit(const SdPage& rSrcPage) rSrcPage.cloneAnimations(*this); // fix user calls for duplicated slide - SdrObjListIter aSourceIter( rSrcPage, SdrIterMode::DeepWithGroups ); - SdrObjListIter aTargetIter( *this, SdrIterMode::DeepWithGroups ); + SdrObjListIter aSourceIter( &rSrcPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aTargetIter( this, SdrIterMode::DeepWithGroups ); while( aSourceIter.IsMore() && aTargetIter.IsMore() ) { @@ -477,7 +477,7 @@ void SdPage::getAlienAttributes( css::uno::Any& rAttributes ) void SdPage::RemoveEmptyPresentationObjects() { - SdrObjListIter aShapeIter( *this, SdrIterMode::DeepWithGroups ); + SdrObjListIter aShapeIter( this, SdrIterMode::DeepWithGroups ); SdrObject* pShape; for( pShape = aShapeIter.Next(); pShape; pShape = aShapeIter.Next() ) diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index d8db1329af56..9a342680ae76 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -45,7 +45,7 @@ ViewShellId SdUndoAction::GetViewShellId() const UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject ) { - SdPage* pPage = dynamic_cast< SdPage* >( rObject.GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( rObject.getSdrPageFromSdrObject() ); if( pPage ) { if( pPage->IsPresObj(&rObject) ) @@ -177,7 +177,7 @@ UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText ) , mbNewEmptyPresObj(false) , mxSdrObject( &rObject ) { - SdPage* pPage = dynamic_cast< SdPage* >( rObject.GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( rObject.getSdrPageFromSdrObject() ); if( pPage && pPage->hasAnimationNode() ) { css::uno::Reference< css::drawing::XShape > xShape( rObject.getUnoShape(), css::uno::UNO_QUERY ); @@ -254,7 +254,7 @@ UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) : SdrUndoObj(rObject) , meOldKind(PRESOBJ_NONE) , meNewKind(PRESOBJ_NONE) -, mxPage( static_cast<SdPage*>(rObject.GetPage()) ) +, mxPage( static_cast<SdPage*>(rObject.getSdrPageFromSdrObject()) ) , mxSdrObject( &rObject ) { DBG_ASSERT( mxPage.is(), "sd::UndoObjectPresentationKind::UndoObjectPresentationKind(), does not work for shapes without a slide!" ); @@ -307,7 +307,7 @@ void UndoAutoLayoutPosAndSize::Redo() UndoGeoObject::UndoGeoObject( SdrObject& rNewObj ) : SdrUndoGeoObj( rNewObj ) -, mxPage( static_cast<SdPage*>(rNewObj.GetPage()) ) +, mxPage( static_cast<SdPage*>(rNewObj.getSdrPageFromSdrObject()) ) , mxSdrObject( &rNewObj ) { } @@ -348,7 +348,7 @@ void UndoGeoObject::Redo() UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) : SdrUndoAttrObj( rObject, bStyleSheet1, bSaveText ) -, mxPage( static_cast<SdPage*>(rObject.GetPage()) ) +, mxPage( static_cast<SdPage*>(rObject.getSdrPageFromSdrObject()) ) , mxSdrObject( &rObject ) { } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index f3dc165fabda..7dd92d1d7558 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1294,7 +1294,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj const * pTableObje void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup const * pObjectGroup, SdrOutliner* pOutliner, const Color& rBackgroundColor, bool bHeadLine) { - SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(), SdrIterMode::DeepNoGroups); + SdrObjListIter aGroupIterator(pObjectGroup->GetSubList(), SdrIterMode::DeepNoGroups); while (aGroupIterator.IsMore()) { SdrObject* pCurrentObject = aGroupIterator.Next(); @@ -1560,7 +1560,7 @@ bool HtmlExport::CreateHtmlForPresPages() while (!bMasterDone) { // sal_True = backwards - SdrObjListIter aIter(*pPage, SdrIterMode::DeepWithGroups, true); + SdrObjListIter aIter(pPage, SdrIterMode::DeepWithGroups, true); SdrObject* pObject = aIter.Next(); while (pObject) @@ -1727,7 +1727,7 @@ bool HtmlExport::CreateHtmlForPresPages() // is the bookmark a object? pObj = mpDoc->GetObj( aURL ); if (pObj) - nPgNum = pObj->GetPage()->GetPageNum(); + nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum(); } if (nPgNum != SDRPAGE_NOTFOUND) { @@ -1813,7 +1813,7 @@ bool HtmlExport::CreateHtmlForPresPages() // is the bookmark a object? pObj = mpDoc->GetObj(pInfo->GetBookmark()); if (pObj) - nPgNum = pObj->GetPage()->GetPageNum(); + nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum(); } if( SDRPAGE_NOTFOUND != nPgNum ) diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index d90cf8d5ad49..2f5b5baf65f4 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -549,7 +549,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) if( !HasEffect() ) return; - if( !pObj || !pObj->GetPage() ) + if( !pObj || !pObj->getSdrPageFromSdrObject() ) { OSL_FAIL("no valid SdrObject or page found for ppt import"); return; @@ -561,7 +561,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) OSL_FAIL("no XShape interface found for ppt import"); return; } - ::sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence(); + ::sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject())->getMainSequence(); if( !pMainSequence.get() ) { OSL_FAIL("no MainSequence found for ppt import"); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 262abd6f399d..cb0e17d450b5 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1841,7 +1841,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations tAnimationVector aAnimationsOnThisPage; // add effects from page in correct order - SdrObjListIter aSdrIter( *pPage, SdrIterMode::Flat ); + SdrObjListIter aSdrIter( pPage, SdrIterMode::Flat ); while ( aSdrIter.IsMore() ) { SdrObject* pObj = aSdrIter.Next(); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index b5189251a276..64b22607ef38 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -321,13 +321,6 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con if (mxOrigin.is()) maOriginPos = mxOrigin->getPosition(); - SdrPage* pPage = mrView.GetSdrPageView()->GetPage(); - if( pPage ) - { - mpPathObj->SetPage( pPage ); - mpPathObj->setParentOfSdrObject( pPage ); - } - XDash aDash( css::drawing::DashStyle_RECT, 1, 80, 1, 80, 80); OUString aEmpty( "?" ); mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) ); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 926bca3600f0..6392abf9bc5d 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -129,7 +129,7 @@ static SdPage* GetCurrentPage( sd::ViewShell const * pViewSh, EditFieldInfo cons if( pTextObj ) { - pPage = dynamic_cast< SdPage* >( pTextObj->GetPage() ); + pPage = dynamic_cast< SdPage* >( pTextObj->getSdrPageFromSdrObject() ); } } diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 5bb95259fcbe..b24674101fb9 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -344,7 +344,7 @@ static bool lcl_HasOnlyControls( SdrModel* pModel ) SdrPage* pPage = pModel->GetPage(0); if (pPage) { - SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepNoGroups ); SdrObject* pObj = aIter.Next(); if ( pObj ) { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 8e225173a95f..99eea6a6a9cd 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -265,7 +265,7 @@ OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , bool isAltT const SdPage* pPage = static_cast<const SdPage*>( mpDoc->GetPage( pageNo ) ); if( pPage->GetPageKind() != PageKind::Standard ) continue; if( pPage->GetName() != ParentName ) continue; - SdrObjListIter aIter( *pPage, SdrIterMode::Flat ); + SdrObjListIter aIter( pPage, SdrIterMode::Flat ); while( aIter.IsMore() ) { pObj = aIter.Next(); @@ -524,7 +524,7 @@ void SdPageObjsTLB::AddShapeList ( pUserData); SdrObjListIter aIter( - rList, + &rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, SdrIterMode::Flat); @@ -641,7 +641,7 @@ bool SdPageObjsTLB::IsEqualToShapeList(SvTreeListEntry*& pEntry, const SdrObjLis pEntry = Next(pEntry); - SdrObjListIter aIter(rList, + SdrObjListIter aIter(&rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, SdrIterMode::Flat); @@ -772,7 +772,7 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) TREELIST_APPEND, reinterpret_cast< void* >( 1 ) ); - SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { @@ -1269,7 +1269,7 @@ TriState SdPageObjsTLB::NotifyMoving( if (pTargetObject != nullptr && pSourceObject != nullptr) { - SdrPage* pObjectList = pSourceObject->GetPage(); + SdrPage* pObjectList = pSourceObject->getSdrPageFromSdrObject(); if (pObjectList != nullptr) { sal_uInt32 nNewPosition; diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 61c8b65ee6b9..fb979fbfafa9 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -767,7 +767,7 @@ void DrawDocShell::GotoBookmark(const OUString& rBookmark) if (pObj) { - nPageNumber = pObj->GetPage()->GetPageNum(); + nPageNumber = pObj->getSdrPageFromSdrObject()->GetPageNum(); } } } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 4a9d7cfe9323..9a01c54095ac 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -282,7 +282,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) sal_uInt16 nCount = mpDoc->GetPageCount(); for ( sal_uInt16 itPage = 0; itPage < nCount && !bLanguageFound; itPage++ ) { - SdrObjListIter aListIter(*mpDoc->GetPage(itPage), SdrIterMode::DeepWithGroups); + SdrObjListIter aListIter(mpDoc->GetPage(itPage), SdrIterMode::DeepWithGroups); while ( aListIter.IsMore() && !bLanguageFound ) { pObj = aListIter.Next(); diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index cad7080afd6b..87ccd670215e 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -171,7 +171,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if( bCreated && maTargets.hasValue() ) { SdrPathObj* pPathObj = dynamic_cast< SdrPathObj* >( mpView->GetSdrPageView()->GetObjList()->GetObj( nCount ) ); - SdPage* pPage = dynamic_cast< SdPage* >( pPathObj ? pPathObj->GetPage() : nullptr ); + SdPage* pPage = dynamic_cast< SdPage* >( pPathObj ? pPathObj->getSdrPageFromSdrObject() : nullptr ); if( pPage ) { std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() ); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 58140974a862..b66f4c1547b8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -385,7 +385,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { - SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + SdPage* pPage = static_cast< SdPage* >(pPickObj->getSdrPageFromSdrObject()); if(pPage && pPage->IsPresObj(pPickObj)) { pPage->InsertPresObj( pOleObj, ePresObjKind ); diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 3a18ec79469d..a8ba3eb89d22 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -208,7 +208,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(pActualPage) { - SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups); + SdrObjListIter aIter(pActualPage, SdrIterMode::DeepNoGroups); while(aIter.IsMore() && !pCandidate) { @@ -840,7 +840,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(pActualPage) { - SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups); + SdrObjListIter aIter(pActualPage, SdrIterMode::DeepNoGroups); while(aIter.IsMore() && !pCandidate) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 93a1c7a96651..ea56b9e4d756 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -331,7 +331,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) // New: double click on selected Group object // enter group if ( ! bSelectionOnly - && pObj->GetPage() == pPV->GetPage()) + && pObj->getSdrPageFromSdrObject() == pPV->GetPage()) bReturn = pPV->EnterGroup(pObj); } } @@ -339,7 +339,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) // #i71727# replaced else here with two possibilities, once the original else (!pObj) // and also ignoring the found object when it's on a masterpage - if(!pObj || (pObj->GetPage() && pObj->GetPage()->IsMasterPage())) + if(!pObj || (pObj->getSdrPageFromSdrObject() && pObj->getSdrPageFromSdrObject()->IsMasterPage())) { if(mpView->IsGroupEntered() && 2 == rMEvt.GetClicks()) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 7402a939c813..8b6d0024b540 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -522,7 +522,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pPage ) { - SdrObjListIter aIter( *pPage ); + SdrObjListIter aIter( pPage ); while( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 3d50a81139e9..f5e797c2d674 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1017,7 +1017,7 @@ void FuText::Deactivate() void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) { SdrPageView* pPV = mpView->GetSdrPageView(); - if( mxTextObj.is() && (mxTextObj->GetPage() == pPV->GetPage()) ) + if( mxTextObj.is() && (mxTextObj->getSdrPageFromSdrObject() == pPV->GetPage()) ) { mpView->SetCurrentObj(OBJ_TEXT); @@ -1150,7 +1150,7 @@ void FuText::DeleteDefaultText() { if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() ) { - SdPage* pPage = static_cast<SdPage*>( mxTextObj->GetPage() ); + SdPage* pPage = static_cast<SdPage*>( mxTextObj->getSdrPageFromSdrObject() ); if (pPage) { diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 0ab2165262e3..d33d4dd25900 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1556,8 +1556,8 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark if( pObj ) { - nPgNum = pObj->GetPage()->GetPageNum(); - bIsMasterPage = pObj->GetPage()->IsMasterPage(); + nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum(); + bIsMasterPage = pObj->getSdrPageFromSdrObject()->IsMasterPage(); } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 2d48bf52f9e6..e31fee0b884d 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -380,7 +380,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent if (rEvent.mpUserData != nullptr) { const SdrObject* pObject = static_cast<const SdrObject*>(rEvent.mpUserData); - HandleShapeModification(pObject->GetPage()); + HandleShapeModification(pObject->getSdrPageFromSdrObject()); } break; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 818cde2f7c57..4e6892574088 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -204,7 +204,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { - SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + SdPage* pPage = static_cast< SdPage* >(pPickObj->getSdrPageFromSdrObject()); if(pPage && pPage->IsPresObj(pPickObj)) { pObj->SetUserCall( pPickObj->GetUserCall() ); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 23717ea3d16b..76f980e0f60c 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -493,7 +493,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected { SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); - if (pObject==nullptr || pObject->GetPage() == nullptr) + if (pObject==nullptr || pObject->getSdrPageFromSdrObject() == nullptr) { // not a SdrObject visualisation (maybe e.g. page) or no page return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( @@ -501,7 +501,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected rDisplayInfo); } - const bool bDoCreateGeometry (pObject->GetPage()->checkVisibility( rOriginal, rDisplayInfo, true)); + const bool bDoCreateGeometry (pObject->getSdrPageFromSdrObject()->checkVisibility( rOriginal, rDisplayInfo, true)); if ( ! bDoCreateGeometry && (pObject->GetObjInventor() != SdrInventor::Default || pObject->GetObjIdentifier() != OBJ_PAGE)) diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 09289a73b976..7eea541fe2fc 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -163,7 +163,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) if( pShape && (pShape->GetSdrObject() != nullptr) ) { SdrObject* pObj = pShape->GetSdrObject(); - pSdrPage = pObj->GetPage(); + pSdrPage = pObj->getSdrPageFromSdrObject(); aObjects.push_back( pObj ); } else @@ -194,9 +194,9 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) if( pSdrPage == nullptr ) { - pSdrPage = pObj->GetPage(); + pSdrPage = pObj->getSdrPageFromSdrObject(); } - else if( pSdrPage != pObj->GetPage() ) + else if( pSdrPage != pObj->getSdrPageFromSdrObject() ) { bOk = false; break; @@ -263,10 +263,10 @@ Any SAL_CALL SdUnoDrawView::getSelection() continue; SdrObject *pObj = pMark->GetMarkedSdrObj(); - if(pObj==nullptr || pObj->GetPage() == nullptr) + if(pObj==nullptr || pObj->getSdrPageFromSdrObject() == nullptr) continue; - Reference< drawing::XDrawPage > xPage( pObj->GetPage()->getUnoPage(), UNO_QUERY); + Reference< drawing::XDrawPage > xPage( pObj->getSdrPageFromSdrObject()->getUnoPage(), UNO_QUERY); if(!xPage.is()) continue; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 2c0c60302a02..416e936c20bc 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1571,7 +1571,7 @@ sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument cons // is the bookmark a object ? pObj = rDoc.GetObj( aBookmark ); if (pObj) - nPgNum = pObj->GetPage()->GetPageNum(); + nPgNum = pObj->getSdrPageFromSdrObject()->GetPageNum(); } if ( nPgNum != SDRPAGE_NOTFOUND ) nPage = ( nPgNum - 1 ) / 2; @@ -1791,9 +1791,9 @@ drawinglayer::primitive2d::Primitive2DContainer ImplRenderPaintProc::createRedir { drawinglayer::primitive2d::Primitive2DContainer xRetval; - if(pObject->GetPage()) + if(pObject->getSdrPageFromSdrObject()) { - if(pObject->GetPage()->checkVisibility(rOriginal, rDisplayInfo, false)) + if(pObject->getSdrPageFromSdrObject()->checkVisibility(rOriginal, rDisplayInfo, false)) { if(IsVisible(pObject) && IsPrintable(pObject)) { @@ -2207,12 +2207,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if( pShape ) { SdrObject* pObj = pShape->GetSdrObject(); - if( pObj && pObj->GetPage() + if( pObj && pObj->getSdrPageFromSdrObject() && aImplRenderPaintProc.IsVisible( pObj ) && aImplRenderPaintProc.IsPrintable( pObj ) ) { if( !pPV ) - pPV = pView->ShowSdrPage( pObj->GetPage() ); + pPV = pView->ShowSdrPage( pObj->getSdrPageFromSdrObject() ); if( pPV ) pView->MarkObj( pObj, pPV ); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 5b0922b148a4..72df58e77918 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -354,7 +354,7 @@ beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& Proper else { SdrObject* pObj = mpShape->GetSdrObject(); - if( pObj == nullptr || ( pObj->GetPage()->IsMasterPage() && pObj->IsEmptyPresObj() ) ) + if( pObj == nullptr || ( pObj->getSdrPageFromSdrObject()->IsMasterPage() && pObj->IsEmptyPresObj() ) ) return beans::PropertyState_DEFAULT_VALUE; return mpShape->_getPropertyState( PropertyName ); @@ -492,7 +492,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c if(bIsAnimation) { SdrObjGroup* pGroup = dynamic_cast< SdrObjGroup* >(pObj); - SdPage* pPage = pGroup ? dynamic_cast< SdPage* >(pGroup->GetPage()) : nullptr; + SdPage* pPage = pGroup ? dynamic_cast< SdPage* >(pGroup->getSdrPageFromSdrObject()) : nullptr; if (pPage) { @@ -872,7 +872,7 @@ bool SdXShape::IsPresObj() const SdrObject* pObj = mpShape->GetSdrObject(); if(pObj) { - SdPage* pPage = dynamic_cast<SdPage* >(pObj->GetPage()); + SdPage* pPage = dynamic_cast<SdPage* >(pObj->getSdrPageFromSdrObject()); if(pPage) return pPage->GetPresObjKind(pObj) != PRESOBJ_NONE; } @@ -908,7 +908,7 @@ OUString SdXShape::GetPlaceholderText() const if( pObj == nullptr ) return OUString(); - SdPage* pPage = dynamic_cast< SdPage* >(pObj->GetPage()); + SdPage* pPage = dynamic_cast< SdPage* >(pObj->getSdrPageFromSdrObject()); DBG_ASSERT( pPage, "no page?" ); if( pPage == nullptr ) return OUString(); @@ -972,7 +972,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) if( pOutliner == nullptr ) break; - SdPage* pPage = dynamic_cast< SdPage* >(pObj->GetPage()); + SdPage* pPage = dynamic_cast< SdPage* >(pObj->getSdrPageFromSdrObject()); DBG_ASSERT( pPage, "no page?" ); if( pPage == nullptr ) break; @@ -1011,7 +1011,7 @@ void SdXShape::SetMasterDepend( bool bDepend ) throw() { if( bDepend ) { - SdPage* pPage = dynamic_cast< SdPage* >(pObj->GetPage()); + SdPage* pPage = dynamic_cast< SdPage* >(pObj->getSdrPageFromSdrObject()); pObj->SetUserCall( pPage ); } else diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 2e9f5dd128d1..77b904c820c5 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -404,24 +404,6 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap if( !aType.startsWith( aPrefix ) ) { SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape ); - if( pObj && ( (pObj->GetObjInventor() != SdrInventor::Default) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) - { - SdDrawDocument& rDoc(static_cast< SdDrawDocument& >(GetPage()->getSdrModelFromSdrPage())); - // #i119287# similar to the code in the SdrObject methods the graphic and ole - // SdrObjects need another default style than the rest, see task. Adding here, too. - // TTTT: Same as for #i119287#: Can be removed in branch aw080 again - const bool bIsSdrGrafObj(dynamic_cast< const SdrGrafObj* >(pObj) != nullptr); - const bool bIsSdrOle2Obj(dynamic_cast< const SdrOle2Obj* >(pObj) != nullptr); - - if(bIsSdrGrafObj || bIsSdrOle2Obj) - { - pObj->NbcSetStyleSheet(rDoc.GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), true); - } - else - { - pObj->NbcSetStyleSheet(rDoc.GetDefaultStyleSheet(), true); - } - } return pObj; } @@ -1902,7 +1884,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements() SdPage* pPage = mpUnoPage->GetPage(); if( pPage != nullptr ) { - SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { @@ -1948,7 +1930,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() SdPage* pPage = mpUnoPage->GetPage(); if( pPage != nullptr ) { - SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); @@ -1965,7 +1947,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() { OUString* pStr = aSeq.getArray(); - SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); @@ -1993,7 +1975,7 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw() if( pPage == nullptr ) return nullptr; - SdrObjListIter aIter( *pPage, SdrIterMode::DeepWithGroups ); + SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups ); while( aIter.IsMore() ) { diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index b94f0713046a..ecb42f830904 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -952,7 +952,7 @@ namespace { // Collect the page objects of the handout master. std::vector<SdrPageObj*> aHandoutPageObjects; - SdrObjListIter aShapeIter (rHandoutPage); + SdrObjListIter aShapeIter (&rHandoutPage); while (aShapeIter.IsMore()) { SdrPageObj* pPageObj = dynamic_cast<SdrPageObj*>(aShapeIter.Next()); @@ -1803,7 +1803,7 @@ private: // Count page shapes. sal_uInt32 nShapeCount (0); - SdrObjListIter aShapeIter (rHandoutPage); + SdrObjListIter aShapeIter (&rHandoutPage); while (aShapeIter.IsMore()) { SdrPageObj* pPageObj = dynamic_cast<SdrPageObj*>(aShapeIter.Next()); diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index c9cc081b7e3a..434f488b463c 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -553,7 +553,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const if (mpObjectIterator != nullptr) { - pIterator->mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward); + pIterator->mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward); // No direct way to set the object iterator to the current object. pIterator->maPosition.mxObject.reset(nullptr); @@ -598,7 +598,7 @@ void ViewIteratorImpl::GotoNextText() SetPage (maPosition.mnPageIndex-1); if (mpPage != nullptr) - mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward); + mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward); if (mpObjectIterator!=nullptr && mpObjectIterator->IsMore()) maPosition.mxObject.reset(mpObjectIterator->Next()); else @@ -650,7 +650,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) // Set up object list iterator. if (mpPage != nullptr) - mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward); + mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward); else mpObjectIterator = nullptr; @@ -677,7 +677,7 @@ void ViewIteratorImpl::Reverse() // Create reversed object list iterator. delete mpObjectIterator; if (mpPage != nullptr) - mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward); + mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward); else mpObjectIterator = nullptr; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 95a4807e43c3..cdb8b2d85112 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -540,7 +540,7 @@ void DrawView::DeleteMarked() SdrObject* pObj = aList.GetMark(nMark)->GetMarkedSdrObj(); if( pObj && !pObj->IsEmptyPresObj() && pObj->GetUserCall() ) { - pPage = static_cast< SdPage* >( pObj->GetPage() ); + pPage = static_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); if (pPage) { PresObjKind ePresObjKind(pPage->GetPresObjKind(pObj)); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 5ac6d84df981..f8aca149a4ae 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -148,7 +148,7 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) GetView()->SdrEndTextEdit(); // look for a new candidate, a successor of pOldObj - SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups); + SdrObjListIter aIter(pActualPage, SdrIterMode::DeepNoGroups); bool bDidVisitOldObject(false); while(aIter.IsMore() && !pCandidate) diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 8b69d3616037..0792f0cc281a 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -655,7 +655,7 @@ void DrawViewShell::FuDeleteSelectedObjects() for (size_t i=0; i < rMarkList.GetMarkCount(); ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - SdPage* pPage = static_cast<SdPage*>(pObj->GetPage()); + SdPage* pPage = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject()); PresObjKind eKind = pPage->GetPresObjKind(pObj); if (eKind == PRESOBJ_FOOTER || eKind == PRESOBJ_HEADER || eKind == PRESOBJ_DATETIME || eKind == PRESOBJ_SLIDENUMBER) @@ -668,7 +668,7 @@ void DrawViewShell::FuDeleteSelectedObjects() { //Unmark object mpDrawView->MarkObj(pObj, mpDrawView->GetSdrPageView(), true); - SdPage* pPage = static_cast<SdPage*>(pObj->GetPage()); + SdPage* pPage = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject()); //remove placeholder from master page pPage->DestroyDefaultPresObj(pPage->GetPresObjKind(pObj)); } @@ -1540,8 +1540,8 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, SdrObjFactory::MakeNewObject( GetView()->getSdrModelFromSdrView(), SdrInventor::FmForm, - OBJ_FM_BUTTON, - mpDrawView->GetSdrPageView()->GetPage())); + OBJ_FM_BUTTON)); //, + //mpDrawView->GetSdrPageView()->GetPage())); Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 835474e79a0f..369c6b42fb0b 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -195,20 +195,20 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); drawinglayer::primitive2d::Primitive2DContainer xRetval; - if(pObject && pObject->GetPage()) + if(pObject && pObject->getSdrPageFromSdrObject()) { - const bool bDoCreateGeometry(pObject->GetPage()->checkVisibility( rOriginal, rDisplayInfo, true )); + const bool bDoCreateGeometry(pObject->getSdrPageFromSdrObject()->checkVisibility( rOriginal, rDisplayInfo, true )); if(!bDoCreateGeometry && !(( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_PAGE )) ) return xRetval; PresObjKind eKind(PRESOBJ_NONE); const bool bSubContentProcessing(rDisplayInfo.GetSubContentActive()); - const bool bIsMasterPageObject(pObject->GetPage()->IsMasterPage()); + const bool bIsMasterPageObject(pObject->getSdrPageFromSdrObject()->IsMasterPage()); const bool bIsPrinting(rOriginal.GetObjectContact().isOutputToPrinter()); const SdrPageView* pPageView = rOriginal.GetObjectContact().TryToGetSdrPageView(); const SdrPage* pVisualizedPage = GetSdrPageFromXDrawPage(rOriginal.GetObjectContact().getViewInformation2D().getVisualizedPage()); - const SdPage* pObjectsSdPage = dynamic_cast< SdPage* >(pObject->GetPage()); + const SdPage* pObjectsSdPage = dynamic_cast< SdPage* >(pObject->getSdrPageFromSdrObject()); const bool bIsInsidePageObj(pPageView && pPageView->GetPage() != pVisualizedPage); // check if we need to draw a placeholder border. Never do it for @@ -554,7 +554,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresOb if ( pObj && ( bCheckPresObjListOnly || pObj->IsEmptyPresObj() || pObj->GetUserCall() ) ) { - pPage = static_cast<SdPage*>( pObj->GetPage() ); + pPage = static_cast<SdPage*>( pObj->getSdrPageFromSdrObject() ); bMasterPage = pPage && pPage->IsMasterPage(); if ( (bMasterPage && bOnMasterPage) || (!bMasterPage && bOnPage) ) @@ -652,7 +652,7 @@ bool View::SdrBeginTextEdit( SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus ) { - SdrPage* pPage = pObj ? pObj->GetPage() : nullptr; + SdrPage* pPage = pObj ? pObj->getSdrPageFromSdrObject() : nullptr; bool bMasterPage = pPage && pPage->IsMasterPage(); GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent( @@ -735,7 +735,7 @@ bool View::SdrBeginTextEdit( if (bMasterPage && bReturn && pOutl) { const SdrTextObj* pTextObj = pOutl->GetTextObj(); - const SdPage* pSdPage = pTextObj ? static_cast<const SdPage*>(pTextObj->GetPage()) : nullptr; + const SdPage* pSdPage = pTextObj ? static_cast<const SdPage*>(pTextObj->getSdrPageFromSdrObject()) : nullptr; const PresObjKind eKind = pSdPage ? pSdPage->GetPresObjKind(const_cast<SdrTextObj*>(pTextObj)) : PRESOBJ_NONE; switch (eKind) { @@ -779,7 +779,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) SdrTextObj* pObj = xObj.get(); if( pObj && pObj->HasText() ) { - SdrPage* pPage = pObj->GetPage(); + SdrPage* pPage = pObj->getSdrPageFromSdrObject(); if( !pPage || !pPage->IsMasterPage() ) pObj->SetEmptyPresObj( false ); } @@ -800,7 +800,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) } - SdPage* pPage = dynamic_cast< SdPage* >( xObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( xObj->getSdrPageFromSdrObject() ); if( pPage ) pPage->onEndTextEdit( xObj.get() ); } @@ -818,7 +818,7 @@ bool View::RestoreDefaultText( SdrTextObj* pTextObj ) { if( !pTextObj->HasText() ) { - SdPage* pPage = dynamic_cast< SdPage* >( pTextObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pTextObj->getSdrPageFromSdrObject() ); if(pPage) { @@ -1068,7 +1068,7 @@ IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, aParam, if( aParam.pPara && pObj ) { - SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); if( pPage ) pPage->onParagraphInserted( aParam.pOutliner, aParam.pPara, pObj ); } @@ -1083,7 +1083,7 @@ IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, aParam, if( aParam.pPara && pObj ) { - SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); + SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() ); if( pPage ) pPage->onParagraphRemoving( aParam.pOutliner, aParam.pPara, pObj ); } @@ -1201,10 +1201,10 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) /* Style Sheet handling */ SdrTextObj* pTextObj = GetTextEditObject(); SdrOutliner* pOutliner = GetTextEditOutliner(); - if( !pOutliner || !pTextObj || !pTextObj->GetPage() ) + if( !pOutliner || !pTextObj || !pTextObj->getSdrPageFromSdrObject() ) return; - SdPage* pPage = static_cast< SdPage* >( pTextObj->GetPage() ); + SdPage* pPage = static_cast< SdPage* >( pTextObj->getSdrPageFromSdrObject() ); const PresObjKind eKind = pPage->GetPresObjKind(pTextObj); // outline kinds are taken care of in Outliner::ImplSetLevelDependentStyleSheet diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 29c3c2bc24a8..45905d242cf9 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -275,7 +275,7 @@ void View::DoPaste (::sd::Window* pWindow) const_cast< OutlinerView* >(pOLV)->PasteSpecial(); SdrObject* pObj = GetTextEditObject(); - SdPage* pPage = static_cast<SdPage*>( pObj ? pObj->GetPage() : nullptr ); + SdPage* pPage = static_cast<SdPage*>( pObj ? pObj->getSdrPageFromSdrObject() : nullptr ); ::Outliner* pOutliner = pOLV->GetOutliner(); if( pOutliner) @@ -405,10 +405,10 @@ void View::DragFinished( sal_Int8 nDropAction ) SdrMark* pM=mpDragSrcMarkList->GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); - if( pObj && pObj->GetPage() ) + if( pObj && pObj->getSdrPageFromSdrObject() ) { const size_t nOrdNum = pObj->GetOrdNumDirect(); - SdrObject* pChkObj = pObj->GetPage()->RemoveObject(nOrdNum); + SdrObject* pChkObj = pObj->getSdrPageFromSdrObject()->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj in RemoveObject()"); } } @@ -538,7 +538,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if (pPickObj && (pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall())) { - SdPage* pPage = static_cast<SdPage*>( pPickObj->GetPage() ); + SdPage* pPage = static_cast<SdPage*>( pPickObj->getSdrPageFromSdrObject() ); if( pPage && pPage->IsMasterPage() ) bIsPresTarget = pPage->IsPresObj( pPickObj ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 4100fe9dfacc..634e59e7ce93 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -646,7 +646,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SdDrawDocument* pWorkModel = const_cast<SdDrawDocument*>(pOwnData->GetWorkDocument()); SdPage* pWorkPage = pWorkModel->GetSdPage( 0, PageKind::Standard ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); // #i120393# Clipboard data uses full object geometry range const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); @@ -816,7 +816,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, { SdrPage* pWorkPage = pModel->GetSdPage( 0, PageKind::Standard ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); if( pOwnData ) { @@ -890,7 +890,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SdDrawDocument* pModel = xDocShRef->GetDoc(); SdPage* pWorkPage = pModel->GetSdPage( 0, PageKind::Standard ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); if( pOwnData ) { @@ -1228,7 +1228,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkModel->GetSdPage( 0, PageKind::Standard ) : pWorkModel->GetPage( 0 ) ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); // #i120393# Clipboard data uses full object geometry range const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); @@ -1260,7 +1260,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkModel->GetSdPage( 0, PageKind::Standard ) : pWorkModel->GetPage( 0 ) ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); // #i120393# Clipboard data uses full object geometry range const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); @@ -1309,7 +1309,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, pWorkModel->GetSdPage( 0, PageKind::Standard ) : pWorkModel->GetPage( 0 ) ); - pWorkPage->SetRectsDirty(); + pWorkPage->SetSdrObjListRectsDirty(); // #i120393# Clipboard data uses full object geometry range const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 9d1cb05ed000..fa9a48ea1a2c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -106,7 +106,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( IsUndoEnabled() ) BegUndo(SdResId(STR_INSERTGRAPHIC)); - SdPage* pPage = static_cast<SdPage*>( pPickObj->GetPage() ); + SdPage* pPage = static_cast<SdPage*>( pPickObj->getSdrPageFromSdrObject() ); if( bIsGraphic ) { @@ -214,7 +214,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( ( mnAction & DND_ACTION_MOVE ) && pPickObj && (pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall()) ) { - SdPage* pP = static_cast< SdPage* >( pPickObj->GetPage() ); + SdPage* pP = static_cast< SdPage* >( pPickObj->getSdrPageFromSdrObject() ); if ( pP && pP->IsMasterPage() ) bIsPresTarget = pP->IsPresObj(pPickObj); @@ -342,7 +342,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM bool bIsPres = false; if( pPickObj ) { - SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + SdPage* pPage = static_cast< SdPage* >(pPickObj->getSdrPageFromSdrObject()); bIsPres = pPage && pPage->IsPresObj(pPickObj); if( bIsPres ) { |