diff options
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 18 | ||||
-rw-r--r-- | sd/source/ui/animations/STLPropertySet.hxx | 10 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/motionpathtag.hxx | 12 |
12 files changed, 37 insertions, 37 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index ee0435ecf8eb..6d9e6a4349ff 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -484,7 +484,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } -CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< css::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) , mpPane( pPane ) , mrTargets( rTargets ) diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index d7fc0e20631d..6a97e323f8f3 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -39,7 +39,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< css::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); virtual ~CustomAnimationCreateDialog(); virtual void dispose() override; @@ -58,7 +58,7 @@ private: private: VclPtr<CustomAnimationPane> mpPane; - const std::vector< ::com::sun::star::uno::Any >& mrTargets; + const std::vector< css::uno::Any >& mrTargets; double mfDuration; bool mbIsPreview; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 70004faa5350..9103e73bce61 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1045,7 +1045,7 @@ private: VclPtr<MetricField> mpMFTextDelay; VclPtr<FixedText> mpFTTextDelay; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; + css::uno::Reference< css::media::XPlayer > mxPlayer; }; CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 757153b5ebe0..672120df4206 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -100,15 +100,15 @@ public: explicit PropertySubControl( sal_Int32 nType ) : mnType( nType ) {} virtual ~PropertySubControl(); - virtual ::com::sun::star::uno::Any getValue() = 0; - virtual void setValue( const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId ) = 0; + virtual css::uno::Any getValue() = 0; + virtual void setValue( const css::uno::Any& rValue, const OUString& rPresetId ) = 0; virtual Control* getControl() = 0; static PropertySubControl* create( sal_Int32 nType, vcl::Window* pParent, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const OUString& rPresetId, const Link<LinkParamNone*,void>& rModifyHdl ); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 55287fb2f054..fb4d0f36265d 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -111,7 +111,7 @@ private: Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1]; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape; + css::uno::Reference< css::drawing::XShape > mxLastTargetShape; sal_Int32 mnLastGroupId; SvTreeListEntry* mpLastParentEntry; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8797c2e08913..54495818874c 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -696,7 +696,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, while( aIter != aEnd ) { CustomAnimationEffectPtr pEffect( (*aIter++) ); - if( pEffect.get() && pEffect->getPresetClass() == ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH ) + if( pEffect.get() && pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH ) { rtl::Reference< MotionPathTag > xMotionPathTag; // first try to find if there is already a tag for this @@ -1034,10 +1034,10 @@ static bool hasVisibleShape( const Reference< XShape >& xShape ) FillStyle eFillStyle; xSet->getPropertyValue( sFillStyle ) >>= eFillStyle; - ::com::sun::star::drawing::LineStyle eLineStyle; + css::drawing::LineStyle eLineStyle; xSet->getPropertyValue( sLineStyle ) >>= eLineStyle; - return eFillStyle != FillStyle_NONE || eLineStyle != ::com::sun::star::drawing::LineStyle_NONE; + return eFillStyle != FillStyle_NONE || eLineStyle != css::drawing::LineStyle_NONE; } } catch( Exception& ) @@ -2202,7 +2202,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode ) { Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ); - Sequence< ::com::sun::star::beans::NamedValue > aUserData + Sequence< css::beans::NamedValue > aUserData { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } }; xRoot->setUserData( aUserData ); xRoot->appendChild( xAnimationNode ); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0144c549cf74..f1a51d802677 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -77,7 +77,7 @@ public: void onChangeSpeed(); // methods - void preview( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode ); + void preview( const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode ); void remove( CustomAnimationEffectPtr& pEffect ); // Control @@ -107,13 +107,13 @@ private: void moveSelection( bool bUp ); void onPreview( bool bForcePreview ); - void createPath( PathKind eKind, std::vector< ::com::sun::star::uno::Any >& rTargets, double fDuration ); + void createPath( PathKind eKind, std::vector< css::uno::Any >& rTargets, double fDuration ); STLPropertySet* createSelectionSet(); void changeSelection( STLPropertySet* pResultSet, STLPropertySet* pOldSet ); - static ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); - bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); + static css::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); + bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const css::uno::Any& rValue ); void UpdateLook(); DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void ); @@ -153,14 +153,14 @@ private: Size maMinSize; - EffectSequence maListSelection; - ::com::sun::star::uno::Any maViewSelection; + EffectSequence maListSelection; + css::uno::Any maViewSelection; MainSequencePtr mpMainSequence; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxCurrentPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::drawing::XDrawPage > mxCurrentPage; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::frame::XModel > mxModel; /** The mpCustomAnimationPresets is initialized either on demand or after a short time after the construction of a new object of this diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx index 4cc95e0ffca9..10606534f720 100644 --- a/sd/source/ui/animations/STLPropertySet.hxx +++ b/sd/source/ui/animations/STLPropertySet.hxx @@ -34,12 +34,12 @@ const sal_Int32 STLPropertyState_AMBIGUOUS = 3; struct STLPropertyMapEntry { - ::com::sun::star::uno::Any maValue; + css::uno::Any maValue; sal_Int32 mnState; STLPropertyMapEntry() : mnState( STLPropertyState_AMBIGUOUS ) {} - STLPropertyMapEntry( ::com::sun::star::uno::Any aValue, sal_Int32 nState = STLPropertyState_DEFAULT ) + STLPropertyMapEntry( css::uno::Any aValue, sal_Int32 nState = STLPropertyState_DEFAULT ) : maValue( aValue ), mnState( nState ) {} }; @@ -54,9 +54,9 @@ public: STLPropertySet(); ~STLPropertySet(); - void setPropertyDefaultValue( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ); - void setPropertyValue( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT ); - ::com::sun::star::uno::Any getPropertyValue( sal_Int32 nHandle ) const; + void setPropertyDefaultValue( sal_Int32 nHandle, const css::uno::Any& rValue ); + void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT ); + css::uno::Any getPropertyValue( sal_Int32 nHandle ) const; sal_Int32 getPropertyState( sal_Int32 nHandle ) const; void setPropertyState( sal_Int32 nHandle, sal_Int32 nState ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 21df5d071fe4..b3c845c0d027 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -890,7 +890,7 @@ void SlideTransitionPane::playCurrentEffect() if( mxView.is() ) { - Reference< ::com::sun::star::animations::XAnimationNode > xNode; + Reference< css::animations::XAnimationNode > xNode; SlideShow::StartPreview( mrBase, mxView->getCurrentPage(), xNode ); } } diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 41ac9bd4c603..69e714d7be6d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -114,8 +114,8 @@ private: VclPtr<PushButton> mpPB_PLAY; VclPtr<CheckBox> mpCB_AUTO_PREVIEW; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::drawing::XDrawView > mxView; + css::uno::Reference< css::frame::XModel > mxModel; bool mbHasSelection; bool mbUpdatingControls; diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index cf4dca489ae8..3e03f32a67a5 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -881,7 +881,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mpPathObj ) { - ::com::sun::star::awt::Point aPos; + css::awt::Point aPos; if (mxOrigin.is()) aPos = mxOrigin->getPosition(); if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) ) @@ -1199,7 +1199,7 @@ void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (R Dispose(); } -Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) throw (RuntimeException, std::exception) { if( aType == cppu::UnoType<XChangesListener>::get() ) return Any( Reference< XChangesListener >( this ) ); diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index a44c9c95b719..2c9deecbdb39 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -35,7 +35,7 @@ class View; class CustomAnimationPane; /// Base class for all functions. -class MotionPathTag : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public ::com::sun::star::util::XChangesListener +class MotionPathTag : public SmartTag, public IPolyPolygonEditorController, public SfxListener, public css::util::XChangesListener { public: MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ); @@ -85,9 +85,9 @@ public: bool OnMove( const KeyEvent& rKEvt ); // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; @@ -104,9 +104,9 @@ private: CustomAnimationPane& mrPane; CustomAnimationEffectPtr mpEffect; ::basegfx::B2DPolyPolygon mxPolyPoly; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxOrigin; + css::uno::Reference< css::drawing::XShape > mxOrigin; SdrPathObj* mpPathObj; - ::com::sun::star::awt::Point maOriginPos; + css::awt::Point maOriginPos; SdrMark* mpMark; OUString msLastPath; bool mbInUpdatePath; |