diff options
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 90 |
1 files changed, 44 insertions, 46 deletions
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 9729fe2d4b97..f76f9e6d6282 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -374,84 +374,83 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) return aLines.makeStringAndClear(); } -#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ), v ) ) void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rValues ) { std::vector< std::pair< OUString, Any > > aUserData; - aUserData.addValue( sUNO_View_GridIsVisible, makeAny( IsGridVisible() ) ); - aUserData.addValue( sUNO_View_GridIsFront, makeAny( IsGridFront() ) ); - aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( IsGridSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( IsBordSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( IsHlplSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( IsOFrmSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( IsOPntSnap() ) ); + aUserData.emplace_back( sUNO_View_GridIsVisible, makeAny( IsGridVisible() ) ); + aUserData.emplace_back( sUNO_View_GridIsFront, makeAny( IsGridFront() ) ); + aUserData.emplace_back( sUNO_View_IsSnapToGrid, makeAny( IsGridSnap() ) ); + aUserData.emplace_back( sUNO_View_IsSnapToPageMargins, makeAny( IsBordSnap() ) ); + aUserData.emplace_back( sUNO_View_IsSnapToSnapLines, makeAny( IsHlplSnap() ) ); + aUserData.emplace_back( sUNO_View_IsSnapToObjectFrame, makeAny( IsOFrmSnap() ) ); + aUserData.emplace_back( sUNO_View_IsSnapToObjectPoints, makeAny( IsOPntSnap() ) ); - aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( IsPlusHandlesAlwaysVisible() ) ); - aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( IsFrameDragSingles() ) ); + aUserData.emplace_back( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( IsPlusHandlesAlwaysVisible() ) ); + aUserData.emplace_back( sUNO_View_IsFrameDragSingles, makeAny( IsFrameDragSingles() ) ); - aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle()) ) ); - aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( IsEliminatePolyPoints() ) ); + aUserData.emplace_back( sUNO_View_EliminatePolyPointLimitAngle, makeAny( static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle()) ) ); + aUserData.emplace_back( sUNO_View_IsEliminatePolyPoints, makeAny( IsEliminatePolyPoints() ) ); if ( officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::get() ) { SdrLayerAdmin& rLayerAdmin = getSdrModelFromSdrView().GetLayerAdmin(); Any aAny; rLayerAdmin.QueryValue(GetVisibleLayers(), aAny); - aUserData.addValue( sUNO_View_VisibleLayers, aAny ); + aUserData.emplace_back( sUNO_View_VisibleLayers, aAny ); rLayerAdmin.QueryValue(GetPrintableLayers(), aAny); - aUserData.addValue( sUNO_View_PrintableLayers, aAny ); + aUserData.emplace_back( sUNO_View_PrintableLayers, aAny ); rLayerAdmin.QueryValue(GetLockedLayers(), aAny); - aUserData.addValue( sUNO_View_LockedLayers, aAny ); + aUserData.emplace_back( sUNO_View_LockedLayers, aAny ); } - aUserData.addValue( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) ); - aUserData.addValue( sUNO_View_NoColors, makeAny( IsNoColors() ) ); + aUserData.emplace_back( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) ); + aUserData.emplace_back( sUNO_View_NoColors, makeAny( IsNoColors() ) ); if( GetStandardHelpLines().GetCount() ) - aUserData.addValue( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) ); + aUserData.emplace_back( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) ); if( GetNotesHelpLines().GetCount() ) - aUserData.addValue( sUNO_View_SnapLinesNotes, makeAny( createHelpLinesString( GetNotesHelpLines() ) ) ); + aUserData.emplace_back( sUNO_View_SnapLinesNotes, makeAny( createHelpLinesString( GetNotesHelpLines() ) ) ); if( GetHandoutHelpLines().GetCount() ) - aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); + aUserData.emplace_back( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); - aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( HasRuler() ) ); - aUserData.addValue( sUNO_View_PageKind, makeAny( static_cast<sal_Int16>(GetPageKind()) ) ); - aUserData.addValue( sUNO_View_SelectedPage, makeAny( static_cast<sal_Int16>(GetSelectedPage()) ) ); - aUserData.addValue( sUNO_View_IsLayerMode, makeAny( IsLayerMode() ) ); + aUserData.emplace_back( sUNO_View_RulerIsVisible, makeAny( HasRuler() ) ); + aUserData.emplace_back( sUNO_View_PageKind, makeAny( static_cast<sal_Int16>(GetPageKind()) ) ); + aUserData.emplace_back( sUNO_View_SelectedPage, makeAny( static_cast<sal_Int16>(GetSelectedPage()) ) ); + aUserData.emplace_back( sUNO_View_IsLayerMode, makeAny( IsLayerMode() ) ); - aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( IsDoubleClickTextEdit() ) ); - aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( IsClickChangeRotation() ) ); + aUserData.emplace_back( sUNO_View_IsDoubleClickTextEdit, makeAny( IsDoubleClickTextEdit() ) ); + aUserData.emplace_back( sUNO_View_IsClickChangeRotation, makeAny( IsClickChangeRotation() ) ); - aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( static_cast<sal_Int16>(GetSlidesPerRow()) ) ); - aUserData.addValue( sUNO_View_EditMode, makeAny( static_cast<sal_Int32>(GetViewShEditMode()) ) ); - // aUserData.addValue( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Standard ) ) ); - // aUserData.addValue( sUNO_View_EditModeNotes, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Notes ) ) ); - // aUserData.addValue( sUNO_View_EditModeHandout, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Handout ) ) ); + aUserData.emplace_back( sUNO_View_SlidesPerRow, makeAny( static_cast<sal_Int16>(GetSlidesPerRow()) ) ); + aUserData.emplace_back( sUNO_View_EditMode, makeAny( static_cast<sal_Int32>(GetViewShEditMode()) ) ); + // aUserData.emplace_back( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Standard ) ) ); + // aUserData.emplace_back( sUNO_View_EditModeNotes, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Notes ) ) ); + // aUserData.emplace_back( sUNO_View_EditModeHandout, makeAny( (sal_Int32)GetViewShEditMode( PageKind::Handout ) ) ); { const ::tools::Rectangle aVisArea = GetVisArea(); - aUserData.addValue( sUNO_View_VisibleAreaTop, makeAny( static_cast<sal_Int32>(aVisArea.Top()) ) ); - aUserData.addValue( sUNO_View_VisibleAreaLeft, makeAny( static_cast<sal_Int32>(aVisArea.Left()) ) ); - aUserData.addValue( sUNO_View_VisibleAreaWidth, makeAny( static_cast<sal_Int32>(aVisArea.GetWidth()) ) ); - aUserData.addValue( sUNO_View_VisibleAreaHeight, makeAny( static_cast<sal_Int32>(aVisArea.GetHeight()) ) ); + aUserData.emplace_back( sUNO_View_VisibleAreaTop, makeAny( static_cast<sal_Int32>(aVisArea.Top()) ) ); + aUserData.emplace_back( sUNO_View_VisibleAreaLeft, makeAny( static_cast<sal_Int32>(aVisArea.Left()) ) ); + aUserData.emplace_back( sUNO_View_VisibleAreaWidth, makeAny( static_cast<sal_Int32>(aVisArea.GetWidth()) ) ); + aUserData.emplace_back( sUNO_View_VisibleAreaHeight, makeAny( static_cast<sal_Int32>(aVisArea.GetHeight()) ) ); } - aUserData.addValue( sUNO_View_GridCoarseWidth, makeAny( static_cast<sal_Int32>(GetGridCoarse().Width()) ) ); - aUserData.addValue( sUNO_View_GridCoarseHeight, makeAny( static_cast<sal_Int32>(GetGridCoarse().Height()) ) ); - aUserData.addValue( sUNO_View_GridFineWidth, makeAny( static_cast<sal_Int32>(GetGridFine().Width()) ) ); - aUserData.addValue( sUNO_View_GridFineHeight, makeAny( static_cast<sal_Int32>(GetGridFine().Height()) ) ); - aUserData.addValue( sUNO_View_GridSnapWidthXNumerator, makeAny( GetSnapGridWidthX().GetNumerator() ) ); - aUserData.addValue( sUNO_View_GridSnapWidthXDenominator, makeAny( GetSnapGridWidthX().GetDenominator() ) ); - aUserData.addValue( sUNO_View_GridSnapWidthYNumerator, makeAny( GetSnapGridWidthY().GetNumerator() ) ); - aUserData.addValue( sUNO_View_GridSnapWidthYDenominator, makeAny( GetSnapGridWidthY().GetDenominator() ) ); - aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( IsAngleSnapEnabled() ) ); - aUserData.addValue( sUNO_View_SnapAngle, makeAny( static_cast<sal_Int32>(GetSnapAngle()) ) ); + aUserData.emplace_back( sUNO_View_GridCoarseWidth, makeAny( static_cast<sal_Int32>(GetGridCoarse().Width()) ) ); + aUserData.emplace_back( sUNO_View_GridCoarseHeight, makeAny( static_cast<sal_Int32>(GetGridCoarse().Height()) ) ); + aUserData.emplace_back( sUNO_View_GridFineWidth, makeAny( static_cast<sal_Int32>(GetGridFine().Width()) ) ); + aUserData.emplace_back( sUNO_View_GridFineHeight, makeAny( static_cast<sal_Int32>(GetGridFine().Height()) ) ); + aUserData.emplace_back( sUNO_View_GridSnapWidthXNumerator, makeAny( GetSnapGridWidthX().GetNumerator() ) ); + aUserData.emplace_back( sUNO_View_GridSnapWidthXDenominator, makeAny( GetSnapGridWidthX().GetDenominator() ) ); + aUserData.emplace_back( sUNO_View_GridSnapWidthYNumerator, makeAny( GetSnapGridWidthY().GetNumerator() ) ); + aUserData.emplace_back( sUNO_View_GridSnapWidthYDenominator, makeAny( GetSnapGridWidthY().GetDenominator() ) ); + aUserData.emplace_back( sUNO_View_IsAngleSnapEnabled, makeAny( IsAngleSnapEnabled() ) ); + aUserData.emplace_back( sUNO_View_SnapAngle, makeAny( static_cast<sal_Int32>(GetSnapAngle()) ) ); const sal_Int32 nOldLength = rValues.getLength(); rValues.realloc( nOldLength + aUserData.size() ); @@ -465,7 +464,6 @@ void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert ++pValue; } } -#undef addValue static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& rHelpLines ) { |