[Libreoffice-commits] core.git: sd/inc sd/qa sd/source sd/workben
Noel Grandin
noel at peralex.com
Thu Oct 29 07:50:53 UTC 2015
sd/inc/CustomAnimationCloner.hxx | 4
sd/inc/CustomAnimationEffect.hxx | 158 +-
sd/inc/CustomAnimationPreset.hxx | 8
sd/inc/EffectMigration.hxx | 24
sd/inc/TransitionPreset.hxx | 4
sd/inc/animations.hxx | 6
sd/inc/anminfo.hxx | 28
sd/inc/cusshow.hxx | 6
sd/inc/drawdoc.hxx | 31
sd/inc/pglink.hxx | 2
sd/inc/sdabstdlg.hxx | 4
sd/inc/sdattr.hxx | 2
sd/inc/sdfilter.hxx | 8
sd/inc/sdmod.hxx | 4
sd/inc/sdpage.hxx | 26
sd/inc/stlpool.hxx | 40
sd/inc/stlsheet.hxx | 62 -
sd/inc/textapi.hxx | 4
sd/inc/undoanim.hxx | 2
sd/qa/unit/export-tests.cxx | 6
sd/qa/unit/import-tests.cxx | 10
sd/source/core/CustomAnimationCloner.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 62 -
sd/source/core/EffectMigration.cxx | 2
sd/source/core/TransitionPreset.cxx | 2
sd/source/core/anminfo.cxx | 4
sd/source/core/annotations/Annotation.cxx | 14
sd/source/core/annotations/AnnotationEnumeration.cxx | 4
sd/source/core/cusshow.cxx | 2
sd/source/core/drawdoc.cxx | 14
sd/source/core/drawdoc4.cxx | 20
sd/source/core/pglink.cxx | 2
sd/source/core/sdpage.cxx | 8
sd/source/core/sdpage2.cxx | 6
sd/source/core/sdpage_animations.cxx | 4
sd/source/core/stlpool.cxx | 4
sd/source/core/text/textapi.cxx | 2
sd/source/core/undo/undoobjects.cxx | 4
sd/source/core/undoanim.cxx | 4
sd/source/filter/eppt/eppt.cxx | 80 -
sd/source/filter/eppt/eppt.hxx | 50
sd/source/filter/eppt/epptbase.hxx | 88 -
sd/source/filter/eppt/epptooxml.hxx | 26
sd/source/filter/eppt/epptso.cxx | 535 ++++------
sd/source/filter/eppt/grouptable.hxx | 10
sd/source/filter/eppt/pptexanimations.cxx | 64 -
sd/source/filter/eppt/pptexanimations.hxx | 74 -
sd/source/filter/eppt/pptexsoundcollection.cxx | 8
sd/source/filter/eppt/pptx-epptbase.cxx | 41
sd/source/filter/eppt/pptx-grouptable.cxx | 2
sd/source/filter/eppt/pptx-stylesheet.cxx | 40
sd/source/filter/eppt/pptx-text.cxx | 147 +-
sd/source/filter/eppt/text.hxx | 56 -
sd/source/filter/grf/sdgrffilter.cxx | 16
sd/source/filter/html/HtmlOptionsDialog.cxx | 22
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/html/htmlex.hxx | 4
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/html/sdhtmlfilter.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 2
sd/source/filter/ppt/ppt97animations.hxx | 4
sd/source/filter/ppt/pptanimations.hxx | 482 ++++-----
sd/source/filter/ppt/pptin.cxx | 106 -
sd/source/filter/ppt/pptin.hxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 32
sd/source/filter/ppt/pptinanimations.hxx | 66 -
sd/source/filter/sdpptwrp.cxx | 4
sd/source/filter/xml/sdxmlwrp.cxx | 71 -
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 56 -
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 30
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 14
sd/source/ui/accessibility/AccessiblePageShape.cxx | 28
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 8
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 8
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 6
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 10
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 6
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2
sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.hxx | 6
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 8
sd/source/ui/animations/CustomAnimationPane.hxx | 18
sd/source/ui/animations/STLPropertySet.hxx | 10
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/animations/SlideTransitionPane.hxx | 4
sd/source/ui/animations/motionpathtag.cxx | 4
sd/source/ui/animations/motionpathtag.hxx | 12
sd/source/ui/annotations/annotationmanager.cxx | 16
sd/source/ui/annotations/annotationmanagerimpl.hxx | 22
sd/source/ui/annotations/annotationwindow.hxx | 8
sd/source/ui/app/optsitem.cxx | 2
sd/source/ui/app/sddll.cxx | 2
sd/source/ui/app/sdmod1.cxx | 6
sd/source/ui/app/sdxfer.cxx | 16
sd/source/ui/controller/slidelayoutcontroller.cxx | 12
sd/source/ui/controller/slidelayoutcontroller.hxx | 6
sd/source/ui/dlg/TemplateScanner.cxx | 18
sd/source/ui/dlg/dlgass.cxx | 8
sd/source/ui/dlg/filedlg.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 4
sd/source/ui/dlg/sddlgfact.hxx | 4
sd/source/ui/dlg/sdtreelb.cxx | 12
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 4
sd/source/ui/docshell/docshel4.cxx | 20
sd/source/ui/framework/configuration/ChangeRequestQueue.hxx | 3
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 9
sd/source/ui/framework/configuration/Configuration.cxx | 14
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 8
sd/source/ui/framework/configuration/ConfigurationClassifier.hxx | 34
sd/source/ui/framework/configuration/ConfigurationController.cxx | 9
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx | 10
sd/source/ui/framework/configuration/ConfigurationTracer.hxx | 9
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 4
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx | 17
sd/source/ui/framework/configuration/ResourceId.cxx | 10
sd/source/ui/framework/configuration/UpdateRequest.hxx | 13
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 6
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 6
sd/source/ui/framework/factories/BasicToolBarFactory.hxx | 8
sd/source/ui/framework/factories/BasicViewFactory.cxx | 6
sd/source/ui/framework/factories/ChildWindowPane.hxx | 15
sd/source/ui/framework/factories/FrameWindowPane.hxx | 5
sd/source/ui/framework/factories/FullScreenPane.cxx | 2
sd/source/ui/framework/factories/FullScreenPane.hxx | 4
sd/source/ui/framework/factories/PresentationFactory.cxx | 10
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/framework/module/CenterViewFocusModule.hxx | 17
sd/source/ui/framework/module/ModuleController.cxx | 6
sd/source/ui/framework/module/ResourceManager.hxx | 24
sd/source/ui/framework/tools/FrameworkHelper.cxx | 6
sd/source/ui/func/bulmaper.cxx | 6
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconcs.cxx | 10
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 141 +-
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 66 -
sd/source/ui/inc/AccessibleOutlineView.hxx | 38
sd/source/ui/inc/AccessiblePageShape.hxx | 38
sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx | 8
sd/source/ui/inc/AccessiblePresentationOLEShape.hxx | 8
sd/source/ui/inc/AccessiblePresentationShape.hxx | 6
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 109 --
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 143 +-
sd/source/ui/inc/DocumentRenderer.hxx | 2
sd/source/ui/inc/DrawController.hxx | 104 -
sd/source/ui/inc/DrawDocShell.hxx | 4
sd/source/ui/inc/DrawSubController.hxx | 14
sd/source/ui/inc/DrawViewShell.hxx | 17
sd/source/ui/inc/FrameView.hxx | 4
sd/source/ui/inc/OutlineViewShell.hxx | 7
sd/source/ui/inc/SdUnoDrawView.hxx | 16
sd/source/ui/inc/SdUnoOutlineView.hxx | 6
sd/source/ui/inc/SdUnoSlideView.hxx | 24
sd/source/ui/inc/SlideSorter.hxx | 4
sd/source/ui/inc/SlideSorterViewShell.hxx | 5
sd/source/ui/inc/TemplateScanner.hxx | 10
sd/source/ui/inc/View.hxx | 9
sd/source/ui/inc/ViewShell.hxx | 9
sd/source/ui/inc/ViewShellBase.hxx | 8
sd/source/ui/inc/ViewTabBar.hxx | 89 -
sd/source/ui/inc/Window.hxx | 3
sd/source/ui/inc/diactrl.hxx | 4
sd/source/ui/inc/dlgass.hxx | 2
sd/source/ui/inc/framework/Configuration.hxx | 55 -
sd/source/ui/inc/framework/DrawModule.hxx | 2
sd/source/ui/inc/framework/ImpressModule.hxx | 2
sd/source/ui/inc/framework/Pane.hxx | 33
sd/source/ui/inc/framework/PresentationModule.hxx | 2
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 73 -
sd/source/ui/inc/fuconbez.hxx | 2
sd/source/ui/inc/fusel.hxx | 4
sd/source/ui/inc/gluectrl.hxx | 4
sd/source/ui/inc/optsitem.hxx | 47
sd/source/ui/inc/pubdlg.hxx | 2
sd/source/ui/inc/sdtreelb.hxx | 18
sd/source/ui/inc/sdxfer.hxx | 18
sd/source/ui/inc/slideshow.hxx | 46
sd/source/ui/inc/taskpane/TitleBar.hxx | 6
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 3
sd/source/ui/inc/tools/PropertySet.hxx | 4
sd/source/ui/inc/tools/SlotStateListener.hxx | 29
sd/source/ui/inc/tpaction.hxx | 8
sd/source/ui/inc/unoaprms.hxx | 36
sd/source/ui/inc/unomodel.hxx | 216 ++--
sd/source/ui/inc/unopage.hxx | 196 +--
sd/source/ui/inc/unosrch.hxx | 68 -
sd/source/ui/presenter/PresenterCanvas.cxx | 6
sd/source/ui/presenter/PresenterHelper.cxx | 8
sd/source/ui/presenter/PresenterPreviewCache.cxx | 10
sd/source/ui/presenter/PresenterTextView.cxx | 14
sd/source/ui/presenter/SlideRenderer.cxx | 8
sd/source/ui/remotecontrol/Listener.cxx | 4
sd/source/ui/remotecontrol/Listener.hxx | 5
sd/source/ui/remotecontrol/Receiver.cxx | 4
sd/source/ui/sidebar/MasterPageContainer.cxx | 4
sd/source/ui/sidebar/PanelFactory.cxx | 6
sd/source/ui/slideshow/PaneHider.hxx | 4
sd/source/ui/slideshow/showwin.cxx | 5
sd/source/ui/slideshow/showwindow.hxx | 3
sd/source/ui/slideshow/slideshow.cxx | 6
sd/source/ui/slideshow/slideshowimpl.cxx | 28
sd/source/ui/slideshow/slideshowimpl.hxx | 8
sd/source/ui/slideshow/slideshowviewimpl.cxx | 4
sd/source/ui/slideshow/slideshowviewimpl.hxx | 112 +-
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 4
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 5
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 6
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 4
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.cxx | 4
sd/source/ui/slidesorter/controller/SlsListener.hxx | 34
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 2
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 4
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 8
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 14
sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 2
sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 2
sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 2
sd/source/ui/table/TableDesignPane.hxx | 10
sd/source/ui/tools/EventMultiplexer.cxx | 50
sd/source/ui/tools/PreviewRenderer.cxx | 6
sd/source/ui/tools/PropertySet.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 22
sd/source/ui/unoidl/SdUnoDrawView.cxx | 10
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 28
sd/source/ui/unoidl/UnoDocumentSettings.hxx | 2
sd/source/ui/unoidl/randomnode.cxx | 8
sd/source/ui/unoidl/sddetect.cxx | 6
sd/source/ui/unoidl/unocpres.hxx | 72 -
sd/source/ui/unoidl/unohelp.hxx | 2
sd/source/ui/unoidl/unolayer.cxx | 8
sd/source/ui/unoidl/unolayer.hxx | 92 -
sd/source/ui/unoidl/unomodel.cxx | 20
sd/source/ui/unoidl/unomodule.cxx | 6
sd/source/ui/unoidl/unoobj.cxx | 104 -
sd/source/ui/unoidl/unoobj.hxx | 46
sd/source/ui/unoidl/unopage.cxx | 26
sd/source/ui/unoidl/unopback.cxx | 8
sd/source/ui/unoidl/unopback.hxx | 36
sd/source/ui/unoidl/unosrch.cxx | 50
sd/source/ui/unoidl/unowcntr.hxx | 8
sd/source/ui/view/DocumentRenderer.cxx | 2
sd/source/ui/view/GraphicViewShellBase.cxx | 2
sd/source/ui/view/ImpressViewShellBase.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/PresentationViewShellBase.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 10
sd/source/ui/view/ViewTabBar.cxx | 26
sd/source/ui/view/drtxtob.cxx | 8
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/drviews2.cxx | 8
sd/source/ui/view/drviews3.cxx | 4
sd/source/ui/view/drviews5.cxx | 20
sd/source/ui/view/drviews8.cxx | 10
sd/source/ui/view/drviews9.cxx | 4
sd/source/ui/view/frmview.cxx | 6
sd/source/ui/view/outlnvsh.cxx | 16
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview2.cxx | 12
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/sdwindow.cxx | 5
sd/source/ui/view/viewshel.cxx | 8
sd/workben/custompanel/ctp_panel.hxx | 30
270 files changed, 3026 insertions(+), 3215 deletions(-)
New commits:
commit a2795356608c9de3679ccd3076c7df14cb549d8b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 28 12:01:32 2015 +0200
com::sun::star->css in sd
Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4
diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index f59d6df..7127f37 100644
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
@@ -26,8 +26,8 @@ class SdPage;
namespace sd
{
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > Clone(
- const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSourceNode,
+ css::uno::Reference< css::animations::XAnimationNode > Clone(
+ const css::uno::Reference< css::animations::XAnimationNode >& xSourceNode,
const SdPage* pSource = 0, const SdPage* pTarget = 0 );
}
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f3eff30..f6dbd18 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -57,12 +57,12 @@ class SD_DLLPUBLIC CustomAnimationEffect
friend class EffectSequenceHelper;
public:
- CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+ CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
virtual ~CustomAnimationEffect();
- SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& getNode() const { return mxNode; }
- SAL_DLLPRIVATE void setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- SAL_DLLPRIVATE void replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAnimationNode >& getNode() const { return mxNode; }
+ SAL_DLLPRIVATE void setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE void replaceNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE CustomAnimationEffectPtr clone() const;
@@ -71,39 +71,39 @@ public:
SAL_DLLPRIVATE const OUString& getPresetSubType() const { return maPresetSubType; }
SAL_DLLPRIVATE const OUString& getProperty() const { return maProperty; }
- SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return mnPresetClass; }
- SAL_DLLPRIVATE void setPresetClass( sal_Int16 nPresetClass );
+ SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return mnPresetClass; }
+ SAL_DLLPRIVATE void setPresetClass( sal_Int16 nPresetClass );
SAL_DLLPRIVATE sal_Int16 getNodeType() const { return mnNodeType; }
- void setNodeType( sal_Int16 nNodeType );
+ void setNodeType( sal_Int16 nNodeType );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getRepeatCount() const;
- SAL_DLLPRIVATE void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
+ SAL_DLLPRIVATE css::uno::Any getRepeatCount() const;
+ SAL_DLLPRIVATE void setRepeatCount( const css::uno::Any& rRepeatCount );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getEnd() const;
- SAL_DLLPRIVATE void setEnd( const ::com::sun::star::uno::Any& rEnd );
+ SAL_DLLPRIVATE css::uno::Any getEnd() const;
+ SAL_DLLPRIVATE void setEnd( const css::uno::Any& rEnd );
SAL_DLLPRIVATE sal_Int16 getFill() const;
SAL_DLLPRIVATE void setFill( sal_Int16 nFill );
SAL_DLLPRIVATE double getBegin() const { return mfBegin; }
- void setBegin( double fBegin );
+ void setBegin( double fBegin );
SAL_DLLPRIVATE double getDuration() const { return mfDuration; }
- void setDuration( double fDuration );
+ void setDuration( double fDuration );
SAL_DLLPRIVATE double getAbsoluteDuration() const { return mfAbsoluteDuration; }
SAL_DLLPRIVATE sal_Int16 getIterateType() const { return mnIterateType; }
- void setIterateType( sal_Int16 nIterateType );
+ void setIterateType( sal_Int16 nIterateType );
SAL_DLLPRIVATE double getIterateInterval() const { return mfIterateInterval; }
- void setIterateInterval( double fIterateInterval );
+ void setIterateInterval( double fIterateInterval );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getTarget() const { return maTarget; }
- void setTarget( const ::com::sun::star::uno::Any& rTarget );
+ SAL_DLLPRIVATE css::uno::Any getTarget() const { return maTarget; }
+ void setTarget( const css::uno::Any& rTarget );
- SAL_DLLPRIVATE bool hasAfterEffect() const { return mbHasAfterEffect; }
+ SAL_DLLPRIVATE bool hasAfterEffect() const { return mbHasAfterEffect; }
SAL_DLLPRIVATE void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
SAL_DLLPRIVATE css::uno::Any getDimColor() const { return maDimColor; }
@@ -114,7 +114,7 @@ public:
SAL_DLLPRIVATE sal_Int32 getParaDepth() const { return mnParaDepth; }
- SAL_DLLPRIVATE bool hasText() const { return mbHasText; }
+ SAL_DLLPRIVATE bool hasText() const { return mbHasText; }
SAL_DLLPRIVATE sal_Int16 getCommand() const { return mnCommand; }
@@ -124,23 +124,23 @@ public:
SAL_DLLPRIVATE double getDecelerate() const { return mfDecelerate; }
SAL_DLLPRIVATE void setDecelerate( double fDecelerate );
- SAL_DLLPRIVATE bool getAutoReverse() const { return mbAutoReverse; }
+ SAL_DLLPRIVATE bool getAutoReverse() const { return mbAutoReverse; }
SAL_DLLPRIVATE void setAutoReverse( bool bAutoReverse );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
- SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+ SAL_DLLPRIVATE css::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
+ SAL_DLLPRIVATE bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const css::uno::Any& rValue );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
- SAL_DLLPRIVATE bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+ SAL_DLLPRIVATE css::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
+ SAL_DLLPRIVATE bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const css::uno::Any& rValue );
- SAL_DLLPRIVATE ::com::sun::star::uno::Any getColor( sal_Int32 nIndex );
- SAL_DLLPRIVATE void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
+ SAL_DLLPRIVATE css::uno::Any getColor( sal_Int32 nIndex );
+ SAL_DLLPRIVATE void setColor( sal_Int32 nIndex, const css::uno::Any& rColor );
SAL_DLLPRIVATE sal_Int32 getGroupId() const { return mnGroupId; }
SAL_DLLPRIVATE void setGroupId( sal_Int32 nGroupId );
SAL_DLLPRIVATE sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
- void setTargetSubItem( sal_Int16 nSubItem );
+ void setTargetSubItem( sal_Int16 nSubItem );
SAL_DLLPRIVATE OUString getPath() const;
SAL_DLLPRIVATE void setPath( const OUString& rPath );
@@ -148,22 +148,22 @@ public:
SAL_DLLPRIVATE bool checkForText();
SAL_DLLPRIVATE bool calculateIterateDuration();
- SAL_DLLPRIVATE void setAudio( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& xAudio );
+ SAL_DLLPRIVATE void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
SAL_DLLPRIVATE bool getStopAudio() const;
void setStopAudio();
- void createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume = 1.0 );
+ void createAudio( const css::uno::Any& rSource, double fVolume = 1.0 );
SAL_DLLPRIVATE void removeAudio();
- SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; }
+ SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
SAL_DLLPRIVATE EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
// helper
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception);
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetShape() const;
+ SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const throw (css::uno::Exception);
+ SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTargetShape() const;
// static helpers
- SAL_DLLPRIVATE static sal_Int32 get_node_type( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const ::com::sun::star::uno::Any& aTarget, sal_Int16 nIterateType );
+ SAL_DLLPRIVATE static sal_Int32 get_node_type( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE static sal_Int32 getNumberOfSubitems( const css::uno::Any& aTarget, sal_Int16 nIterateType );
SAL_DLLPRIVATE SdrPathObj* createSdrPathObjFromPath();
SAL_DLLPRIVATE void updateSdrPathObjFromPath( SdrPathObj& rPathObj );
@@ -174,9 +174,9 @@ protected:
private:
sal_Int16 mnNodeType;
- OUString maPresetId;
- OUString maPresetSubType;
- OUString maProperty;
+ OUString maPresetId;
+ OUString maPresetSubType;
+ OUString maProperty;
sal_Int16 mnPresetClass;
double mfBegin;
double mfDuration; // this is the maximum duration of the subeffects
@@ -185,29 +185,29 @@ private:
sal_Int16 mnIterateType;
double mfIterateInterval;
sal_Int32 mnParaDepth;
- bool mbHasText;
+ bool mbHasText;
double mfAcceleration;
double mfDecelerate;
- bool mbAutoReverse;
+ bool mbAutoReverse;
sal_Int16 mnTargetSubItem;
sal_Int16 mnCommand;
EffectSequenceHelper* mpEffectSequence;
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio;
- ::com::sun::star::uno::Any maTarget;
+ css::uno::Reference< css::animations::XAnimationNode > mxNode;
+ css::uno::Reference< css::animations::XAudio > mxAudio;
+ css::uno::Any maTarget;
bool mbHasAfterEffect;
- ::com::sun::star::uno::Any maDimColor;
+ css::uno::Any maDimColor;
bool mbAfterEffectOnNextEffect;
};
struct stl_CustomAnimationEffect_search_node_predict
{
- stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode );
+ stl_CustomAnimationEffect_search_node_predict( const css::uno::Reference< css::animations::XAnimationNode >& xSearchNode );
bool operator()( CustomAnimationEffectPtr pEffect ) const;
- const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& mxSearchNode;
+ const css::uno::Reference< css::animations::XAnimationNode >& mxSearchNode;
};
enum ESequenceHint { EFFECT_EDITED, EFFECT_REMOVED, EFFECT_ADDED };
@@ -229,7 +229,7 @@ class CustomAnimationTextGroup
friend class EffectSequenceHelper;
public:
- CustomAnimationTextGroup( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rTarget, sal_Int32 nGroupId );
+ CustomAnimationTextGroup( const css::uno::Reference< css::drawing::XShape >& rTarget, sal_Int32 nGroupId );
void reset();
void addEffect( CustomAnimationEffectPtr& pEffect );
@@ -245,7 +245,7 @@ public:
private:
EffectSequence maEffects;
- ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape > maTarget;
+ css::uno::Reference< css::drawing::XShape > maTarget;
enum { PARA_LEVELS = 5 };
@@ -267,32 +267,32 @@ friend class MainSequence;
public:
SAL_DLLPRIVATE EffectSequenceHelper();
- SAL_DLLPRIVATE EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot );
+ SAL_DLLPRIVATE EffectSequenceHelper( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot );
SAL_DLLPRIVATE virtual ~EffectSequenceHelper();
- SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode();
+ SAL_DLLPRIVATE virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode();
- SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
- SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 );
+ SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const css::uno::Any& rTarget, double fDuration = -1.0 );
+ SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration = -1.0 );
void append( const CustomAnimationEffectPtr& pEffect );
SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 );
SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 );
SAL_DLLPRIVATE void remove( const CustomAnimationEffectPtr& pEffect );
- SAL_DLLPRIVATE void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- SAL_DLLPRIVATE void createEffectsequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- SAL_DLLPRIVATE void processAfterEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- SAL_DLLPRIVATE void createEffects( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE void create( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE void createEffectsequence( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE void processAfterEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
+ SAL_DLLPRIVATE void createEffects( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
SAL_DLLPRIVATE sal_Int32 getCount() const { return sal::static_int_cast< sal_Int32 >( maEffects.size() ); }
- SAL_DLLPRIVATE virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const;
+ SAL_DLLPRIVATE virtual CustomAnimationEffectPtr findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const;
- SAL_DLLPRIVATE virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
- SAL_DLLPRIVATE virtual void insertTextRange( const com::sun::star::uno::Any& aTarget );
- SAL_DLLPRIVATE virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget );
- SAL_DLLPRIVATE virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
- SAL_DLLPRIVATE virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
+ SAL_DLLPRIVATE virtual bool disposeShape( const css::uno::Reference< css::drawing::XShape >& xShape );
+ SAL_DLLPRIVATE virtual void insertTextRange( const css::uno::Any& aTarget );
+ SAL_DLLPRIVATE virtual void disposeTextRange( const css::uno::Any& aTarget );
+ SAL_DLLPRIVATE virtual bool hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape );
+ SAL_DLLPRIVATE virtual void onTextChanged( const css::uno::Reference< css::drawing::XShape >& xShape );
/** this method rebuilds the animation nodes */
SAL_DLLPRIVATE virtual void rebuild();
@@ -317,8 +317,8 @@ public:
SAL_DLLPRIVATE sal_Int32 getSequenceType() const { return mnSequenceType; }
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTriggerShape() const { return mxEventSource; }
- SAL_DLLPRIVATE void setTriggerShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
+ SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTriggerShape() const { return mxEventSource; }
+ SAL_DLLPRIVATE void setTriggerShape( const css::uno::Reference< css::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
SAL_DLLPRIVATE virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const;
SAL_DLLPRIVATE virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const;
@@ -334,12 +334,12 @@ protected:
SAL_DLLPRIVATE void updateTextGroups();
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > mxSequenceRoot;
+ css::uno::Reference< css::animations::XTimeContainer > mxSequenceRoot;
EffectSequence maEffects;
std::list< ISequenceListener* > maListeners;
CustomAnimationTextGroupMap maGroupMap;
sal_Int32 mnSequenceType;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxEventSource;
+ css::uno::Reference< css::drawing::XShape > mxEventSource;
};
class MainSequence;
@@ -350,7 +350,7 @@ friend class MainSequence;
friend class MainSequenceChangeGuard;
public:
- InteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence );
+ InteractiveSequence( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence );
/** this method rebuilds the animation nodes */
virtual void rebuild() override;
@@ -372,28 +372,28 @@ class MainSequence : public EffectSequenceHelper, public ISequenceListener
public:
MainSequence();
- MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
+ MainSequence( const css::uno::Reference< css::animations::XAnimationNode >& xTimingRootNode );
virtual ~MainSequence();
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode() override;
- void reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode );
+ virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode() override;
+ void reset( const css::uno::Reference< css::animations::XAnimationNode >& xTimingRootNode );
/** this method rebuilds the animation nodes */
virtual void rebuild() override;
- virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const override;
+ virtual CustomAnimationEffectPtr findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const override;
- virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
- virtual void insertTextRange( const com::sun::star::uno::Any& aTarget ) override;
- virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget ) override;
- virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
- virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) override;
+ virtual bool disposeShape( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+ virtual void insertTextRange( const css::uno::Any& aTarget ) override;
+ virtual void disposeTextRange( const css::uno::Any& aTarget ) override;
+ virtual bool hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+ virtual void onTextChanged( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
const InteractiveSequenceList& getInteractiveSequenceList() const { return maInteractiveSequenceList; }
virtual void notify_change() override;
- bool setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape );
+ bool setTrigger( const CustomAnimationEffectPtr& pEffect, const css::uno::Reference< css::drawing::XShape >& xTriggerShape );
/** starts a timer that recreates the internal structure from the API core after 1 second */
void startRecreateTimer();
@@ -419,12 +419,12 @@ protected:
void createMainSequence();
virtual void reset() override;
- InteractiveSequencePtr createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape );
+ InteractiveSequencePtr createInteractiveSequence( const css::uno::Reference< css::drawing::XShape >& xShape );
InteractiveSequenceList maInteractiveSequenceList;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener > mxChangesListener;
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer > mxTimingRootNode;
+ css::uno::Reference< css::util::XChangesListener > mxChangesListener;
+ css::uno::Reference< css::animations::XTimeContainer > mxTimingRootNode;
Timer maTimer;
bool mbTimerMode;
bool mbRebuilding;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1f7abce..8c8ef2f 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -47,7 +47,7 @@ public:
void add( CustomAnimationEffectPtr pEffect );
- SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const OUString& rstrSubType );
+ SD_DLLPUBLIC css::uno::Reference< css::animations::XAnimationNode > create( const OUString& rstrSubType );
const OUString& getPresetId() const { return maPresetId; }
const OUString& getLabel() const { return maLabel; }
@@ -96,7 +96,7 @@ public:
static const CustomAnimationPresets& getCustomAnimationPresets();
- SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
+ SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const;
@@ -115,12 +115,12 @@ private:
SAL_DLLPRIVATE void importEffects();
SAL_DLLPRIVATE void importResources();
- SAL_DLLPRIVATE void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap );
+ SAL_DLLPRIVATE void importPresets( const css::uno::Reference< css::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap );
SAL_DLLPRIVATE const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode;
+ css::uno::Reference< css::animations::XAnimationNode > mxRootNode;
EffectDescriptorMap maEffectDiscriptorMap;
UStringMap maEffectNameMap;
UStringMap maPropertyNameMap;
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 62103d0..033e4ed 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -39,21 +39,21 @@ namespace sd {
class EffectMigration
{
public:
- static ::com::sun::star::presentation::AnimationSpeed ConvertDuration( double fDuration );
- static double ConvertAnimationSpeed( ::com::sun::star::presentation::AnimationSpeed eSpeed );
+ static css::presentation::AnimationSpeed ConvertDuration( double fDuration );
+ static double ConvertAnimationSpeed( css::presentation::AnimationSpeed eSpeed );
- static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect );
- static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType );
+ static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, css::presentation::AnimationEffect& rEffect );
+ static bool ConvertAnimationEffect( const css::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType );
- static void SetFadeEffect( SdPage* pPage, ::com::sun::star::presentation::FadeEffect eNewEffect);
- static ::com::sun::star::presentation::FadeEffect GetFadeEffect( const SdPage* pPage );
+ static void SetFadeEffect( SdPage* pPage, css::presentation::FadeEffect eNewEffect);
+ static css::presentation::FadeEffect GetFadeEffect( const SdPage* pPage );
- static void SetAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue );
- static ::com::sun::star::presentation::AnimationEffect GetAnimationEffect( SvxShape* pShape );
- static void SetTextAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue );
- static ::com::sun::star::presentation::AnimationEffect GetTextAnimationEffect( SvxShape* pShape );
- static void SetAnimationSpeed( SvxShape* pShape, ::com::sun::star::presentation::AnimationSpeed eSpeed );
- static ::com::sun::star::presentation::AnimationSpeed GetAnimationSpeed( SvxShape* pShape );
+ static void SetAnimationEffect( SvxShape* pShape, css::presentation::AnimationEffect eValue );
+ static css::presentation::AnimationEffect GetAnimationEffect( SvxShape* pShape );
+ static void SetTextAnimationEffect( SvxShape* pShape, css::presentation::AnimationEffect eValue );
+ static css::presentation::AnimationEffect GetTextAnimationEffect( SvxShape* pShape );
+ static void SetAnimationSpeed( SvxShape* pShape, css::presentation::AnimationSpeed eSpeed );
+ static css::presentation::AnimationSpeed GetAnimationSpeed( SvxShape* pShape );
static void SetDimColor( SvxShape* pShape, sal_Int32 nColor );
static sal_Int32 GetDimColor( SvxShape* pShape );
static void SetDimHide( SvxShape* pShape, bool bDimHide );
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 65fcbee..95416a2 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -57,7 +57,7 @@ public:
const OUString& getPresetId() const { return maPresetId; }
private:
- TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+ TransitionPreset( const css::uno::Reference< css::animations::XAnimationNode >& xNode );
sal_Int16 mnTransition;
sal_Int16 mnSubtype;
@@ -67,7 +67,7 @@ private:
OUString maUIName;
static bool importTransitionsFile( TransitionPresetList& rList,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
+ css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceFactory,
UStringMap& rTransitionNameMap,
const OUString& aFilename );
};
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index a0be770..4d7755f 100644
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
@@ -30,11 +30,11 @@ namespace sd
*/
struct AfterEffectNode
{
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxMaster;
+ css::uno::Reference< css::animations::XAnimationNode > mxNode;
+ css::uno::Reference< css::animations::XAnimationNode > mxMaster;
bool mbOnNextEffect;
- AfterEffectNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xMaster, bool bOnNextEffect )
+ AfterEffectNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xMaster, bool bOnNextEffect )
: mxNode( xNode ), mxMaster( xMaster ), mbOnNextEffect( bOnNextEffect ) {}
};
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 1a77dd0..db2aeb3 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -37,25 +37,25 @@ public:
PresObjKind mePresObjKind;
/* deprecated animation infos */
- ::com::sun::star::presentation::AnimationEffect meEffect; ///< Animation effect
- ::com::sun::star::presentation::AnimationEffect meTextEffect; ///< Animation effect for text content
- ::com::sun::star::presentation::AnimationSpeed meSpeed; ///< Speed of the animation
- bool mbActive; ///< turned on?
- bool mbDimPrevious; ///< Object fade out
- bool mbIsMovie; ///< if group object than it is a sequence of them.
- bool mbDimHide; ///< hide rather than dim
+ css::presentation::AnimationEffect meEffect; ///< Animation effect
+ css::presentation::AnimationEffect meTextEffect; ///< Animation effect for text content
+ css::presentation::AnimationSpeed meSpeed; ///< Speed of the animation
+ bool mbActive; ///< turned on?
+ bool mbDimPrevious; ///< Object fade out
+ bool mbIsMovie; ///< if group object than it is a sequence of them.
+ bool mbDimHide; ///< hide rather than dim
Color maBlueScreen; ///< identifies "background pixels"
Color maDimColor; ///< for fading the object
OUString maSoundFile; ///< Path to the sound file in MS DOS notation
- bool mbSoundOn; ///< Sound on / off
- bool mbPlayFull; ///< play sound completely.
+ bool mbSoundOn; ///< Sound on / off
+ bool mbPlayFull; ///< play sound completely.
SdrPathObj* mpPathObj; ///< The path object
- ::com::sun::star::presentation::ClickAction meClickAction; ///< Action at mouse click
- ::com::sun::star::presentation::AnimationEffect meSecondEffect; ///< for object fading.
- ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; ///< for object fading.
+ css::presentation::ClickAction meClickAction; ///< Action at mouse click
+ css::presentation::AnimationEffect meSecondEffect; ///< for object fading.
+ css::presentation::AnimationSpeed meSecondSpeed; ///< for object fading.
OUString maSecondSoundFile; ///< for object fading.
- bool mbSecondSoundOn; ///< for object fading.
- bool mbSecondPlayFull; ///< for object fading.
+ bool mbSecondSoundOn; ///< for object fading.
+ bool mbSecondPlayFull; ///< for object fading.
sal_uInt16 mnVerb; ///< for OLE object
sal_uLong mnPresOrder;
SdrObject& mrObject;
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 1f40602..11d1e15 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -38,7 +38,7 @@ private:
SdDrawDocument* pDoc;
// this is a weak reference to a possible living api wrapper for this custom show
- ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > mxUnoCustomShow;
+ css::uno::WeakReference< css::uno::XInterface > mxUnoCustomShow;
// forbidden and not implemented
SdCustomShow();
@@ -46,7 +46,7 @@ private:
public:
// single argument ctors shall be explicit
explicit SdCustomShow(SdDrawDocument* pDrawDoc);
- SdCustomShow(SdDrawDocument* pDrawDoc, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xShow );
+ SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > xShow );
virtual ~SdCustomShow();
@@ -68,7 +68,7 @@ public:
SdDrawDocument* GetDoc() const { return pDoc; }
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoCustomShow();
+ css::uno::Reference< css::uno::XInterface > getUnoCustomShow();
};
#endif // INCLUDED_SD_INC_CUSSHOW_HXX
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 63370e0..0b3c1e7 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -163,7 +163,7 @@ private:
sd::PresentationSettings maPresentationSettings;
- ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation;
+ css::uno::Reference< css::presentation::XPresentation2 > mxPresentation;
bool mbNewOrLoadCompleted;
@@ -179,7 +179,7 @@ private:
bool mbAllocDocSh; // => AllocModel()
DocumentType meDocType;
CharClass* mpCharClass;
- ::com::sun::star::lang::Locale* mpLocale;
+ css::lang::Locale* mpLocale;
::std::unique_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher;
::std::unique_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
@@ -194,16 +194,14 @@ private:
DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellEventHdl, EditStatus&, void);
std::vector< OUString > maAnnotationAuthors;
- std::vector<com::sun::star::uno::Reference<
- com::sun::star::xml::dom::XNode> > maLayoutInfo;
+ std::vector<css::uno::Reference< css::xml::dom::XNode> > maLayoutInfo;
- std::vector<com::sun::star::uno::Reference<
- com::sun::star::xml::dom::XNode> > maPresObjectInfo;
+ std::vector<css::uno::Reference< css::xml::dom::XNode> > maPresObjectInfo;
bool mbUseEmbedFonts;
protected:
- SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override;
+ SAL_DLLPRIVATE virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override;
public:
@@ -279,14 +277,13 @@ public:
/// load xml-based impress layout definitions into document
SAL_DLLPRIVATE void InitLayoutVector();
/// return reference to vector of Impress layout definitions
- SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<
- com::sun::star::xml::dom::XNode> >& GetLayoutVector() const
+ SAL_DLLPRIVATE const std::vector<css::uno::Reference< css::xml::dom::XNode> >& GetLayoutVector() const
{ return maLayoutInfo; }
/// load xml-based impress master presentation object definitions into document
SAL_DLLPRIVATE void InitObjectVector();
/// return reference to vector of master presentation object definitions
- SAL_DLLPRIVATE const std::vector<com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
+ SAL_DLLPRIVATE const std::vector<css::uno::Reference<css::xml::dom::XNode> >& GetObjectVector() const { return maPresObjectInfo; }
/** Insert pages into this document
This method inserts whole pages into this document, either
@@ -379,7 +376,7 @@ public:
SAL_DLLPRIVATE const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
SAL_DLLPRIVATE sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
- SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
+ SAL_DLLPRIVATE const css::uno::Reference< css::presentation::XPresentation2 >& getPresentation() const;
SAL_DLLPRIVATE void SetSummationOfParagraphs( bool bOn = true ) { mbSummationOfParagraphs = bOn; }
SAL_DLLPRIVATE bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
@@ -388,9 +385,9 @@ public:
depends on the current printer metrics.
@param nMode
Use <const
- scope="com::sun::star::document::PrinterIndependentLayout">ENABLED</const>
+ scope="css::document::PrinterIndependentLayout">ENABLED</const>
to make formatting printer-independent and <const
- scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
+ scope="css::document::PrinterIndependentLayout">DISABLED</const>
to make formatting depend on the current printer metrics.
*/
SAL_DLLPRIVATE void SetPrinterIndependentLayout (sal_Int32 nMode);
@@ -399,9 +396,9 @@ public:
depends on the current printer metrics.
@return
Use <const
- scope="com::sun::star::document::PrinterIndependentLayout">ENABLED</const>
+ scope="css::document::PrinterIndependentLayout">ENABLED</const>
when formatting is printer-independent and <const
- scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const>
+ scope="css::document::PrinterIndependentLayout">DISABLED</const>
when formatting depends on the current printer metrics.
*/
SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;}
@@ -461,8 +458,8 @@ public:
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false) override;
- ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
- SAL_DLLPRIVATE void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
+ css::text::WritingMode GetDefaultWritingMode() const;
+ SAL_DLLPRIVATE void SetDefaultWritingMode( css::text::WritingMode eMode );
/** replacespOldPage from all custom shows with pNewPage or removes pOldPage from
all custom shows if pNewPage is 0.
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 390bca8..0d42275 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -34,7 +34,7 @@ public:
virtual void Closed() override;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+ const OUString& rMimeType, const css::uno::Any & rValue ) override;
bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 51a4b660..c732d4a 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -82,7 +82,7 @@ public:
virtual OUString GetDocPath() const = 0;
virtual bool GetStartWithFlag() const = 0;
virtual bool IsDocEmpty() const = 0;
- virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() = 0;
+ virtual css::uno::Sequence< css::beans::NamedValue > GetPassword() = 0;
};
class AbstractSdModifyFieldDlg : public VclAbstractDialog
@@ -154,7 +154,7 @@ public:
class AbstractSdPublishingDlg : public VclAbstractDialog
{
public:
- virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) = 0;
+ virtual void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) = 0;
};
class AbstractHeaderFooterDialog : public VclAbstractDialog
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 2acf16b..268db69 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -87,7 +87,7 @@ class DiaEffectItem : public SfxEnumItem
{
public:
TYPEINFO_OVERRIDE();
- DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE );
+ DiaEffectItem( css::presentation::FadeEffect eFade = css::presentation::FadeEffect_NONE );
DiaEffectItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index 6b92935..1a5b57a 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -44,14 +44,14 @@ public:
virtual bool Export() = 0;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+ css::uno::Reference< css::frame::XModel > mxModel;
+ css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
SfxMedium& mrMedium;
::sd::DrawDocShell& mrDocShell;
SdDrawDocument& mrDocument;
- bool mbIsDraw : 1;
- bool mbShowProgress : 1;
+ bool mbIsDraw : 1;
+ bool mbShowProgress : 1;
#ifndef DISABLE_DYNLOADING
static ::osl::Module* OpenLibrary( const OUString& rLibraryName );
#endif
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 6589644..195728e 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -152,8 +152,8 @@ private:
SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
- static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
- static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
+ static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
+ static SfxFrame* CreateFromTemplate( const OUString& rTemplatePath, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
/** The resource container controls the lifetime of some singletons.
*/
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 017e911..624c86d 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -80,7 +80,7 @@ namespace sd {
bool operator==( const HeaderFooterSettings& rSettings ) const;
};
- typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > > AnnotationVector;
+ typedef std::vector< css::uno::Reference< css::office::XAnnotation > > AnnotationVector;
}
namespace sd {
@@ -129,12 +129,12 @@ protected:
sd::AnnotationVector maAnnotations;
/** holds the smil animation sequences for this page */
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
+ css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
/** a helper class to manipulate effects inside the main sequence */
std::shared_ptr< sd::MainSequence > mpMainSequence;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override;
+ virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
SfxItemSet* mpItems;
@@ -214,8 +214,8 @@ public:
void SetSelected(bool bSel) { mbSelected = bSel; }
bool IsSelected() const { return mbSelected; }
- void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
- ::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
+ void SetFadeEffect(css::presentation::FadeEffect eNewEffect);
+ css::presentation::FadeEffect GetFadeEffect() const;
void SetPresChange(PresChange eChange) { mePresChange = eChange; }
PresChange GetPresChange() const { return mePresChange; }
@@ -291,14 +291,14 @@ public:
virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const override;
- bool setAlienAttributes( const com::sun::star::uno::Any& rAttributes );
- void getAlienAttributes( com::sun::star::uno::Any& rAttributes );
+ bool setAlienAttributes( const css::uno::Any& rAttributes );
+ void getAlienAttributes( css::uno::Any& rAttributes );
/** @return the main animation node */
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getAnimationNode() throw (::com::sun::star::uno::RuntimeException);
+ css::uno::Reference< css::animations::XAnimationNode > getAnimationNode() throw (css::uno::RuntimeException);
/** sets the main animation node */
- void setAnimationNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) throw (::com::sun::star::uno::RuntimeException);
+ void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode ) throw (css::uno::RuntimeException);
/// @return a helper class to manipulate effects inside the main sequence
std::shared_ptr< sd::MainSequence > getMainSequence();
@@ -310,7 +310,7 @@ public:
bool hasAnimationNode() const;
/// @return the SdPage implementation for the given XDrawPage or 0 if not available
- static SdPage* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage );
+ static SdPage* getImplementation( const css::uno::Reference< css::drawing::XDrawPage >& xPage );
/** removes all custom animations for the given shape */
void removeAnimations( const SdrObject* pObj );
@@ -368,9 +368,9 @@ public:
*/
bool IsPrecious() const { return mbIsPrecious; }
- void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
- void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 );
- void removeAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
+ void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation );
+ void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex = -1 );
+ void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
sal_Int32 getHash() const;
OString stringify() const;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index d7451cb..9949f63 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -46,10 +46,10 @@ class SvxNumberFormat;
typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap;
typedef ::cppu::ImplInheritanceHelper< SfxStyleSheetPool,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::container::XIndexAccess,
- ::com::sun::star::container::XNameAccess,
- ::com::sun::star::lang::XComponent > SdStyleSheetPoolBase;
+ css::lang::XServiceInfo,
+ css::container::XIndexAccess,
+ css::container::XNameAccess,
+ css::lang::XComponent > SdStyleSheetPoolBase;
class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
{
@@ -95,30 +95,30 @@ public:
static void setDefaultOutlineNumberFormatBulletAndIndent(sal_uInt16 i, SvxNumberFormat &rNumberFormat);
public:
- void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException);
+ void throwIfDisposed() throw(css::uno::RuntimeException);
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
// XIndexAccess
- virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ;
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -142,8 +142,8 @@ private:
SdStyleFamilyRef mxGraphicFamily;
SdStyleFamilyRef mxCellFamily;
SdStyleFamilyMap maStyleFamilyMap;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily;
- OUString msTableFamilyName;
+ css::uno::Reference< css::container::XNameAccess > mxTableFamily;
+ OUString msTableFamilyName;
};
#endif // INCLUDED_SD_INC_STLPOOL_HXX
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index a6f0070..e6f8522 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -44,11 +44,11 @@
class ModifyListenerForewarder;
typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
- ::com::sun::star::beans::XPropertySet,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::beans::XPropertyState,
- ::com::sun::star::util::XModifyBroadcaster,
- ::com::sun::star::lang::XComponent > SdStyleSheetBase ;
+ css::beans::XPropertySet,
+ css::lang::XServiceInfo,
+ css::beans::XPropertyState,
+ css::util::XModifyBroadcaster,
+ css::lang::XComponent > SdStyleSheetBase ;
class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex
{
@@ -87,43 +87,43 @@ public:
virtual void SAL_CALL release( ) throw () override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XNamed
- virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
// XStyle
- virtual sal_Bool SAL_CALL isUserDefined( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isInUse( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getParentStyle( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isUserDefined( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isInUse( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getParentStyle( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XModifyBroadcaster
- virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
void notifyModifyListener();
@@ -136,7 +136,7 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
virtual ~SdStyleSheet();
- void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException);
+ void throwIfDisposed() throw (css::uno::RuntimeException);
void disposing();
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 5844170..466aad0 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -42,13 +42,13 @@ public:
virtual ~TextApiObject() throw();
- void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL dispose() throw(css::uno::RuntimeException);
OutlinerParaObject* CreateText();
void SetText( OutlinerParaObject& rText );
OUString GetText();
- static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& );
+ static TextApiObject* getImplementation( const css::uno::Reference< css::text::XText >& );
private:
TextAPIEditSource* mpSource;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 2e42b9a..9f97a12 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -53,7 +53,7 @@ struct UndoAnimationPathImpl;
class UndoAnimationPath : public SdrUndoAction
{
public:
- UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
+ UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const css::uno::Reference< css::animations::XAnimationNode >& xNode );
virtual ~UndoAnimationPath();
virtual void Undo() override;
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index ee6a416..96ef809 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1246,8 +1246,8 @@ void SdExportTest::testCellLeftAndRightMargin()
sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0));
CPPUNIT_ASSERT( pTableObj );
- uno::Reference< com::sun::star::table::XTable > xTable (pTableObj->getTable(), uno::UNO_QUERY_THROW);
- uno::Reference< com::sun::star::table::XMergeableCell > xCell( xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
+ uno::Reference< css::table::XTable > xTable (pTableObj->getTable(), uno::UNO_QUERY_THROW);
+ uno::Reference< css::table::XMergeableCell > xCell( xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xCellPropSet(xCell, uno::UNO_QUERY_THROW);
uno::Any aLeftMargin = xCellPropSet->getPropertyValue("TextLeftDistance");
@@ -1286,7 +1286,7 @@ void SdExportTest::testTableCellBorder()
table::BorderLine2 aBorderLine;
uno::Reference< table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW);
- uno::Reference< com::sun::star::table::XMergeableCell > xCell(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+ uno::Reference< css::table::XMergeableCell > xCell(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xCellPropSet (xCell, uno::UNO_QUERY_THROW);
xCellPropSet->getPropertyValue("LeftBorder") >>= aBorderLine;
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 763bf07..e05cf4d 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -547,9 +547,9 @@ void SdImportTest::testFdo72998()
SdrObjCustomShape *pObj = dynamic_cast<SdrObjCustomShape *>(pPage->GetObj(2));
CPPUNIT_ASSERT( pObj );
const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
- const ::com::sun::star::uno::Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( OUString( "ViewBox" ) );
+ const css::uno::Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( OUString( "ViewBox" ) );
CPPUNIT_ASSERT_MESSAGE( "Missing ViewBox", pViewBox );
- com::sun::star::awt::Rectangle aViewBox;
+ css::awt::Rectangle aViewBox;
CPPUNIT_ASSERT( (*pViewBox >>= aViewBox ) );
CPPUNIT_ASSERT_MESSAGE( "Width should be zero - for forcing scale to 1", !aViewBox.Width );
CPPUNIT_ASSERT_MESSAGE( "Height should be zero - for forcing scale to 1", !aViewBox.Height );
@@ -635,7 +635,7 @@ void SdImportTest::testFdo64512()
void SdImportTest::testFdo71075()
{
double values[] = { 12.0, 13.0, 14.0 };
- ::com::sun::star::uno::Any aAny;
+ css::uno::Any aAny;
sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"), ODP);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
@@ -1254,8 +1254,8 @@ void SdImportTest::testRowHeight()
sal_Int32 nHeight;
const OUString sHeight("Height");
- uno::Reference< com::sun::star::table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW);
- uno::Reference< com::sun::star::table::XTableRows > xRows( xTable->getRows(), uno::UNO_QUERY_THROW);
+ uno::Reference< css::table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+ uno::Reference< css::table::XTableRows > xRows( xTable->getRows(), uno::UNO_QUERY_THROW);
uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0), uno::UNO_QUERY_THROW );
xRefRow->getPropertyValue( sHeight ) >>= nHeight;
CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight);
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 6bd2308..855a9f7 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -90,7 +90,7 @@ namespace sd
try
{
// clone animation hierarchy
- Reference< ::com::sun::star::util::XCloneable > xClonable( xSourceNode, UNO_QUERY_THROW );
+ Reference< css::util::XCloneable > xClonable( xSourceNode, UNO_QUERY_THROW );
Reference< XAnimationNode > xCloneNode( xClonable->createClone(), UNO_QUERY_THROW );
// create a dictionary to map source to cloned shapes
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d8092bb..32a00d3 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -130,7 +130,7 @@ private:
MainSequence* mpMainSequence;
};
-CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+CustomAnimationEffect::CustomAnimationEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
: mnNodeType(-1),
mnPresetClass(-1),
mfBegin(-1.0),
@@ -153,7 +153,7 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer
setNode( xNode );
}
-void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+void CustomAnimationEffect::setNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
{
mxNode = xNode;
mxAudio.clear();
@@ -629,7 +629,7 @@ bool CustomAnimationEffect::calculateIterateDuration()
return bChange;
}
-void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget )
+void CustomAnimationEffect::setTarget( const css::uno::Any& rTarget )
{
try
{
@@ -818,7 +818,7 @@ void CustomAnimationEffect::setAutoReverse( bool bAutoReverse )
}
}
-void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+void CustomAnimationEffect::replaceNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
{
sal_Int16 nNodeType = mnNodeType;
Any aTarget = maTarget;
@@ -1477,7 +1477,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
return bChanged;
}
-void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume /* = 1.0 */ )
+void CustomAnimationEffect::createAudio( const css::uno::Any& rSource, double fVolume /* = 1.0 */ )
{
DBG_ASSERT( !mxAudio.is(), "sd::CustomAnimationEffect::createAudio(), node already has an audio!" );
@@ -1549,7 +1549,7 @@ void CustomAnimationEffect::removeAudio()
}
-void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animations::XAudio >& xAudio )
+void CustomAnimationEffect::setAudio( const Reference< css::animations::XAudio >& xAudio )
{
if( mxAudio != xAudio ) try
{
@@ -1666,7 +1666,7 @@ EffectSequenceHelper::EffectSequenceHelper()
{
}
-EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot )
+EffectSequenceHelper::EffectSequenceHelper( const css::uno::Reference< css::animations::XTimeContainer >& xSequenceRoot )
: mxSequenceRoot( xSequenceRoot ), mnSequenceType( EffectNodeType::DEFAULT )
{
Reference< XAnimationNode > xNode( mxSequenceRoot, UNO_QUERY_THROW );
@@ -1799,8 +1799,8 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
pEffect->setEffectSequence( this );
pEffect->setTarget( rTarget );
pEffect->setTargetSubItem( nSubItem );
- pEffect->setNodeType( ::com::sun::star::presentation::EffectNodeType::ON_CLICK );
- pEffect->setPresetClass( ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH );
+ pEffect->setNodeType( css::presentation::EffectNodeType::ON_CLICK );
+ pEffect->setPresetClass( css::presentation::EffectPresetClass::MOTIONPATH );
pEffect->setAcceleration( 0.5 );
pEffect->setDecelerate( 0.5 );
pEffect->setFill( AnimationFill::HOLD );
@@ -1987,7 +1987,7 @@ void EffectSequenceHelper::implRebuild()
}
}
-stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode )
+stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const css::uno::Reference< css::animations::XAnimationNode >& xSearchNode )
: mxSearchNode( xSearchNode )
{
}
@@ -2133,7 +2133,7 @@ EffectSequence::iterator EffectSequenceHelper::find( const CustomAnimationEffect
return std::find( maEffects.begin(), maEffects.end(), pEffect );
}
-CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const
+CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const
{
CustomAnimationEffectPtr pEffect;
@@ -2199,7 +2199,7 @@ bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape )
return bChanges;
}
-bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape )
+bool EffectSequenceHelper::hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape )
{
EffectSequence::iterator aIter( maEffects.begin() );
while( aIter != maEffects.end() )
@@ -2212,7 +2212,7 @@ bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com:
return false;
}
-void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTarget )
+void EffectSequenceHelper::insertTextRange( const css::uno::Any& aTarget )
{
bool bChanges = false;
@@ -2232,7 +2232,7 @@ void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTar
rebuild();
}
-void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTarget )
+void EffectSequenceHelper::disposeTextRange( const css::uno::Any& aTarget )
{
ParagraphTarget aParaTarget;
if( !(aTarget >>= aParaTarget ) )
@@ -2829,7 +2829,7 @@ void EffectSequenceHelper::notify_listeners()
std::for_each( maListeners.begin(), maListeners.end(), aFunc );
}
-void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+void EffectSequenceHelper::create( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
{
DBG_ASSERT( xNode.is(), "sd::EffectSequenceHelper::create(), illegal argument" );
@@ -2976,19 +2976,19 @@ class AnimationChangeListener : public cppu::WeakImplHelper< XChangesListener >
public:
explicit AnimationChangeListener( MainSequence* pMainSequence ) : mpMainSequence( pMainSequence ) {}
- virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
private:
MainSequence* mpMainSequence;
};
-void SAL_CALL AnimationChangeListener::changesOccurred( const ::com::sun::star::util::ChangesEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationChangeListener::changesOccurred( const css::util::ChangesEvent& ) throw (RuntimeException, std::exception)
{
if( mpMainSequence )
mpMainSequence->startRecreateTimer();
}
-void SAL_CALL AnimationChangeListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationChangeListener::disposing( const css::lang::EventObject& ) throw (RuntimeException, std::exception)
{
}
@@ -3002,14 +3002,14 @@ MainSequence::MainSequence()
{
if( mxTimingRootNode.is() )
{
- Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ Sequence< css::beans::NamedValue > aUserData
{ { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxTimingRootNode->setUserData( aUserData );
}
init();
}
-MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+MainSequence::MainSequence( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
: mxTimingRootNode( xNode, UNO_QUERY )
, mbTimerMode( false )
, mbRebuilding( false )
@@ -3037,7 +3037,7 @@ void MainSequence::init()
createMainSequence();
}
-void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode )
+void MainSequence::reset( const css::uno::Reference< css::animations::XAnimationNode >& xTimingRootNode )
{
reset();
@@ -3046,7 +3046,7 @@ void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::st
createMainSequence();
}
-Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootNode()
+Reference< css::animations::XAnimationNode > MainSequence::getRootNode()
{
DBG_ASSERT( mnRebuildLockGuard == 0, "MainSequence::getRootNode(), rebuild is locked, is this really what you want?" );
@@ -3089,7 +3089,7 @@ void MainSequence::createMainSequence()
{
mxSequenceRoot = SequenceTimeContainer::create( ::comphelper::getProcessComponentContext() );
- uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ uno::Sequence< css::beans::NamedValue > aUserData
{ { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxSequenceRoot->setUserData( aUserData );
@@ -3140,14 +3140,14 @@ void MainSequence::reset()
}
}
-InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
+InteractiveSequencePtr MainSequence::createInteractiveSequence( const css::uno::Reference< css::drawing::XShape >& xShape )
{
InteractiveSequencePtr pIS;
// create a new interactive sequence container
Reference< XTimeContainer > xISRoot = SequenceTimeContainer::create( ::comphelper::getProcessComponentContext() );
- uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ uno::Sequence< css::beans::NamedValue > aUserData
{ { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE) } };
xISRoot->setUserData( aUserData );
@@ -3162,7 +3162,7 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun
return pIS;
}
-CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const
+CustomAnimationEffectPtr MainSequence::findEffect( const css::uno::Reference< css::animations::XAnimationNode >& xNode ) const
{
CustomAnimationEffectPtr pEffect = EffectSequenceHelper::findEffect( xNode );
@@ -3237,7 +3237,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape )
return bChanges;
}
-bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape )
+bool MainSequence::hasEffect( const css::uno::Reference< css::drawing::XShape >& xShape )
{
if( EffectSequenceHelper::hasEffect( xShape ) )
return true;
@@ -3255,7 +3255,7 @@ bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::st
return false;
}
-void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget )
+void MainSequence::insertTextRange( const css::uno::Any& aTarget )
{
EffectSequenceHelper::insertTextRange( aTarget );
@@ -3266,7 +3266,7 @@ void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget )
}
}
-void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget )
+void MainSequence::disposeTextRange( const css::uno::Any& aTarget )
{
EffectSequenceHelper::disposeTextRange( aTarget );
@@ -3370,7 +3370,7 @@ void MainSequence::notify_change()
notify_listeners();
}
-bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape )
+bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const css::uno::Reference< css::drawing::XShape >& xTriggerShape )
{
EffectSequenceHelper* pOldSequence = pEffect->getEffectSequence();
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index f77f5d4..2912b66 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -161,7 +161,7 @@ cut-through-black cut toBlack
wedge wedge
*/
-void EffectMigration::SetFadeEffect( SdPage* pPage, ::com::sun::star::presentation::FadeEffect eNewEffect)
+void EffectMigration::SetFadeEffect( SdPage* pPage, css::presentation::FadeEffect eNewEffect)
{
deprecated_FadeEffect_conversion_table_entry* pEntry = deprecated_FadeEffect_conversion_table;
while( (pEntry->meFadeEffect != FadeEffect_NONE) && (pEntry->meFadeEffect != eNewEffect) )
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 212b15a..6b63d2f 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -61,7 +61,7 @@ using ::com::sun::star::beans::NamedValue;
namespace sd {
-TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
+TransitionPreset::TransitionPreset( const css::uno::Reference< css::animations::XAnimationNode >& xNode )
{
// first locate preset id
Sequence< NamedValue > aUserData( xNode->getUserData() );
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 39fd126..8ac8418 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -105,7 +105,7 @@ SdrObjUserData* SdAnimationInfo::Clone(SdrObject* pObject) const
void SdAnimationInfo::SetBookmark( const OUString& rBookmark )
{
- if( meClickAction == ::com::sun::star::presentation::ClickAction_BOOKMARK )
+ if( meClickAction == css::presentation::ClickAction_BOOKMARK )
{
OUString sURL("#");
sURL += rBookmark;
@@ -131,7 +131,7 @@ OUString SdAnimationInfo::GetBookmark()
sBookmark = pURLField->GetURL();
}
- if( (meClickAction == ::com::sun::star::presentation::ClickAction_BOOKMARK) && sBookmark.startsWith("#") )
+ if( (meClickAction == css::presentation::ClickAction_BOOKMARK) && sBookmark.startsWith("#") )
sBookmark = sBookmark.copy( 1 );
return sBookmark;
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 3fa6a63..d789e6c 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -65,7 +65,7 @@ public:
virtual void SAL_CALL acquire() throw () override { ::cppu::WeakComponentImplHelper< XAnnotation >::acquire(); }
virtual void SAL_CALL release() throw () override { ::cppu::WeakComponentImplHelper< XAnnotation >::release(); }
- // ::com::sun::star::beans::XPropertySet:
+ // css::beans::XPropertySet:
virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception) override;
virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
@@ -74,12 +74,12 @@ public:
virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
- // ::com::sun::star::office::XAnnotation:
- virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::office::XAnnotation:
+ virtual css::uno::Any SAL_CALL getAnchor() throw (css::uno::RuntimeException, std::exception) override;
virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception) override;
virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception) override;
- virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const ::com::sun::star::geometry::RealSize2D& _size ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::geometry::RealSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSize( const css::geometry::RealSize2D& _size ) throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception) override;
virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception) override;
virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception) override;
@@ -240,7 +240,7 @@ Any SAL_CALL Annotation::getAnchor() throw (RuntimeException, std::exception)
return aRet;
}
-// ::com::sun::star::office::XAnnotation:
+// css::office::XAnnotation:
RealPoint2D SAL_CALL Annotation::getPosition() throw (RuntimeException, std::exception)
{
osl::MutexGuard g(m_aMutex);
@@ -257,7 +257,7 @@ void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (Runt
}
}
-// ::com::sun::star::office::XAnnotation:
+// css::office::XAnnotation:
RealSize2D SAL_CALL Annotation::getSize() throw (RuntimeException, std::exception)
{
osl::MutexGuard g(m_aMutex);
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 1ee21e5..25bb921 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -40,7 +40,7 @@ class AnnotationEnumeration: public ::cppu::WeakImplHelper< css::office::XAnnota
public:
explicit AnnotationEnumeration( const AnnotationVector& rAnnotations );
- // ::com::sun::star::office::XAnnotationEnumeration:
+ // css::office::XAnnotationEnumeration:
virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override;
@@ -62,7 +62,7 @@ AnnotationEnumeration::AnnotationEnumeration( const AnnotationVector& rAnnotatio
maIter = maAnnotations.begin();
}
-// ::com::sun::star::office::XAnnotationEnumeration:
+// css::office::XAnnotationEnumeration:
sal_Bool SAL_CALL AnnotationEnumeration::hasMoreElements() throw (css::uno::RuntimeException, std::exception)
{
return maIter != maAnnotations.end();
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index dd0379d..7eea70f 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -52,7 +52,7 @@ SdCustomShow::SdCustomShow( const SdCustomShow& rShow )
pDoc = rShow.GetDoc();
}
-SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xShow )
+SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > xShow )
: maPages(),
pDoc(pDrawDoc),
mxUnoCustomShow( xShow )
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 4c09e49..988b1f7 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -227,11 +227,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
aLinguConfig.GetOptions( aOptions );
SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage,
- ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
+ css::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
- ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
+ css::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL,
- ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL );
+ css::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL );
if (!comphelper::LibreOfficeKit::isActive())
mbOnlineSpell = aOptions.bIsSpellAuto;
@@ -239,7 +239,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
LanguageType eRealLanguage = MsLangId::getRealLanguage( meLanguage );
LanguageTag aLanguageTag( eRealLanguage);
- mpLocale = new ::com::sun::star::lang::Locale( aLanguageTag.getLocale());
+ mpLocale = new css::lang::Locale( aLanguageTag.getLocale());
mpCharClass = new CharClass( aLanguageTag );
// If the current application language is a language that uses right-to-left text...
@@ -247,7 +247,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
if( MsLangId::isRightToLeft( eRealCTLLanguage ) )
{
// ... then we have to set this as a default
- SetDefaultWritingMode( ::com::sun::star::text::WritingMode_RL_TB );
+ SetDefaultWritingMode( css::text::WritingMode_RL_TB );
}
// for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text
@@ -909,8 +909,8 @@ void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode)
{
switch (nMode)
{
- case ::com::sun::star::document::PrinterIndependentLayout::DISABLED:
- case ::com::sun::star::document::PrinterIndependentLayout::ENABLED:
+ case css::document::PrinterIndependentLayout::DISABLED:
+ case css::document::PrinterIndependentLayout::ENABLED:
// Just store supported modes and inform the doc shell
mnPrinterIndependentLayout = nMode;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index d4fc048..aa76a39 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1234,18 +1234,18 @@ void SdDrawDocument::SetTextDefaults() const
pItemPool->SetPoolDefaultItem( aNumBulletItem );
}
-::com::sun::star::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const
+css::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const
{
const SfxPoolItem* pItem = ( pItemPool ? pItemPool->GetPoolDefaultItem( EE_PARA_WRITINGDIR ) : NULL );
- ::com::sun::star::text::WritingMode eRet = ::com::sun::star::text::WritingMode_LR_TB;
+ css::text::WritingMode eRet = css::text::WritingMode_LR_TB;
if( pItem )
{
switch( static_cast<const SvxFrameDirectionItem&>( *pItem ).GetValue() )
{
- case( FRMDIR_HORI_LEFT_TOP ): eRet = ::com::sun::star::text::WritingMode_LR_TB; break;
- case( FRMDIR_HORI_RIGHT_TOP ): eRet = ::com::sun::star::text::WritingMode_RL_TB; break;
- case( FRMDIR_VERT_TOP_RIGHT ): eRet = ::com::sun::star::text::WritingMode_TB_RL; break;
+ case( FRMDIR_HORI_LEFT_TOP ): eRet = css::text::WritingMode_LR_TB; break;
+ case( FRMDIR_HORI_RIGHT_TOP ): eRet = css::text::WritingMode_RL_TB; break;
+ case( FRMDIR_VERT_TOP_RIGHT ): eRet = css::text::WritingMode_TB_RL; break;
default:
OSL_FAIL( "Frame direction not supported yet" );
@@ -1256,16 +1256,16 @@ void SdDrawDocument::SetTextDefaults() const
return eRet;
}
-void SdDrawDocument::SetDefaultWritingMode(::com::sun::star::text::WritingMode eMode )
+void SdDrawDocument::SetDefaultWritingMode(css::text::WritingMode eMode )
{
if( pItemPool )
{
SvxFrameDirection nVal;
switch( eMode )
{
- case ::com::sun::star::text::WritingMode_LR_TB: nVal = FRMDIR_HORI_LEFT_TOP; break;
- case ::com::sun::star::text::WritingMode_RL_TB: nVal = FRMDIR_HORI_RIGHT_TOP; break;
- case ::com::sun::star::text::WritingMode_TB_RL: nVal = FRMDIR_VERT_TOP_RIGHT; break;
+ case css::text::WritingMode_LR_TB: nVal = FRMDIR_HORI_LEFT_TOP; break;
+ case css::text::WritingMode_RL_TB: nVal = FRMDIR_HORI_RIGHT_TOP; break;
+ case css::text::WritingMode_TB_RL: nVal = FRMDIR_VERT_TOP_RIGHT; break;
default:
OSL_FAIL( "Frame direction not supported yet" );
return;
@@ -1276,7 +1276,7 @@ void SdDrawDocument::SetDefaultWritingMode(::com::sun::star::text::WritingMode e
SvxAdjustItem aAdjust( SVX_ADJUST_LEFT, EE_PARA_JUST );
- if( eMode == ::com::sun::star::text::WritingMode_RL_TB )
+ if( eMode == css::text::WritingMode_RL_TB )
aAdjust.SetEnumValue( SVX_ADJUST_RIGHT );
pItemPool->SetPoolDefaultItem( aAdjust );
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index b4f2a67..a817967 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -55,7 +55,7 @@ SdPageLink::~SdPageLink()
\************************************************************************/
::sfx2::SvBaseLink::UpdateResult SdPageLink::DataChanged(
- const OUString&, const ::com::sun::star::uno::Any& )
+ const OUString&, const css::uno::Any& )
{
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>( pPage->GetModel() );
sfx2::LinkManager* pLinkManager = pDoc!=NULL ? pDoc->GetLinkManager() : NULL;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 768e8aa..12a53e5 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2681,11 +2681,11 @@ uno::Reference< uno::XInterface > SdPage::createUnoPage()
}
/** returns the SdPage implementation for the given XDrawPage or 0 if not available */
-SdPage* SdPage::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage )
+SdPage* SdPage::getImplementation( const css::uno::Reference< css::drawing::XDrawPage >& xPage )
{
try
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUnoTunnel( xPage, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XUnoTunnel > xUnoTunnel( xPage, css::uno::UNO_QUERY );
if( xUnoTunnel.is() )
{
SvxDrawPage* pUnoPage = reinterpret_cast<SvxDrawPage*>(sal::static_int_cast<sal_uIntPtr>(xUnoTunnel->getSomething( SvxDrawPage::getUnoTunnelId()) ) );
@@ -2693,7 +2693,7 @@ SdPage* SdPage::getImplementation( const ::com::sun::star::uno::Reference< ::com
return static_cast< SdPage* >( pUnoPage->GetSdrPage() );
}
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL("sd::SdPage::getImplementation(), exception caught!" );
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list