summaryrefslogtreecommitdiff
path: root/svx/inc/sdr
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-30 14:59:47 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-31 12:56:21 +0000
commit4530451d40470bf5359645de0c142ddf9dc329b6 (patch)
tree8b57614e9316685a8178d9d61795932c3e705d45 /svx/inc/sdr
parentbd332c2a335b34e209fe2b7fdfb669c855325636 (diff)
com::sun::star->css in svx
Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c Reviewed-on: https://gerrit.libreoffice.org/19690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/inc/sdr')
-rw-r--r--svx/inc/sdr/contact/viewcontactofunocontrol.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx6
-rw-r--r--svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index bc11faf8a35b..a2d8d3173d13 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -66,8 +66,8 @@ namespace sdr { namespace contact {
/** retrieves a temporary XControl instance, whose parent is the given window
@seealso SdrUnoObj::GetTemporaryControlForWindow
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
- getTemporaryControlForWindow( const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const;
+ css::uno::Reference< css::awt::XControl >
+ getTemporaryControlForWindow( const vcl::Window& _rWindow, css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer ) const;
protected:
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) override;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 395baf04ce79..a6b82841e1c2 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -55,16 +55,16 @@ namespace sdr { namespace contact {
ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
/// returns the ->XControl instance belonging to the instance, creates it if necessary
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+ css::uno::Reference< css::awt::XControl >
getControl();
/** retrieves a temporary XControl instance, whose parent is the given device
@seealso SdrUnoObj::GetTemporaryControlForWindow
*/
- static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+ static css::uno::Reference< css::awt::XControl >
getTemporaryControlForWindow(
const vcl::Window& _rWindow,
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer,
+ css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer,
const SdrUnoObj& _rUnoObject
);
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index 1cb5edf1ab6e..eced60a7849a 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer
// is not given or different, the decomposition needs to be potentially removed
// for supporting e.g. page number change on MasterPage objects or the different
// field renderings in SubGeometry and MasterPage node
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxLastVisualizingPage;
+ css::uno::Reference< css::drawing::XDrawPage > mxLastVisualizingPage;
// remember last PageNumber for which a decomposition was made. This is only used
// when mbContainsPageField is true, else it is 0