summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2011-09-01 00:19:40 -0400
committerKohei Yoshida <kohei.yoshida@suse.com>2011-09-02 02:00:40 -0400
commit2c00fc5206b7fe7c4aba85a4d9a41a75ec432d4a (patch)
treebc100117d5dfd22fa70bbc12dd34dae899dede53 /svtools
parentf71bd7314a06975763a6d16a1a137e78771e9324 (diff)
No macros for the com::sun::star::foo.
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/embedhlp.hxx20
-rw-r--r--svtools/source/misc/embedhlp.cxx8
2 files changed, 12 insertions, 16 deletions
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index bbd7c31f0a82..45ce3b98f9eb 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -38,10 +38,6 @@
#include <tools/mapunit.hxx>
#include <rtl/ustring.hxx>
-#define NS_UNO ::com::sun::star::uno
-#define NS_EMBED ::com::sun::star::embed
-#define NS_IO ::com::sun::star::io
-
namespace comphelper
{
class EmbeddedObjectContainer;
@@ -56,7 +52,7 @@ namespace svt
class SVT_DLLPUBLIC EmbeddedObjectRef
{
EmbeddedObjectRef_Impl* mpImp;
- NS_UNO::Reference < NS_EMBED::XEmbeddedObject > mxObj;
+ ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > mxObj;
SVT_DLLPRIVATE SvStream* GetGraphicStream( sal_Bool bUpdate ) const;
/* SVT_DLLPRIVATE */ void GetReplacement( sal_Bool bUpdate );
@@ -65,20 +61,20 @@ namespace svt
EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& );
public:
- const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& operator ->() const { return mxObj; }
- const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& GetObject() const { return mxObj; }
+ const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& operator ->() const { return mxObj; }
+ const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& GetObject() const { return mxObj; }
static void DrawPaintReplacement( const Rectangle &rRect, const String &rText, OutputDevice *pOut );
static void DrawShading( const Rectangle &rRect, OutputDevice *pOut );
- static sal_Bool TryRunningState( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& );
+ static sal_Bool TryRunningState( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
static void SetGraphicToContainer( const Graphic& rGraphic,
comphelper::EmbeddedObjectContainer& aContainer,
const ::rtl::OUString& aName,
const ::rtl::OUString& aMediaType );
- static NS_UNO::Reference< NS_IO::XInputStream > GetGraphicReplacementStream(
+ static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetGraphicReplacementStream(
sal_Int64 nViewAspect,
- const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >&,
+ const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&,
::rtl::OUString* pMediaType )
throw();
@@ -86,10 +82,10 @@ namespace svt
EmbeddedObjectRef();
// assign a previously default constructed object
- void Assign( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& xObj, sal_Int64 nAspect );
+ void Assign( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
// create object for a certain view aspect
- EmbeddedObjectRef( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& xObj, sal_Int64 nAspect );
+ EmbeddedObjectRef( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
~EmbeddedObjectRef();
EmbeddedObjectRef( const EmbeddedObjectRef& );
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 8bba1be66c0b..1fd2d15054ab 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -261,7 +261,7 @@ EmbeddedObjectRef::EmbeddedObjectRef()
Construct_Impl();
}
-EmbeddedObjectRef::EmbeddedObjectRef( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& xObj, sal_Int64 nAspect )
+EmbeddedObjectRef::EmbeddedObjectRef( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
{
Construct_Impl();
mpImp->nViewAspect = nAspect;
@@ -297,7 +297,7 @@ EmbeddedObjectRef::~EmbeddedObjectRef()
delete mpImp;
}
-void EmbeddedObjectRef::Assign( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& xObj, sal_Int64 nAspect )
+void EmbeddedObjectRef::Assign( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
{
DBG_ASSERT( !mxObj.is(), "Never assign an already assigned object!" );
@@ -309,7 +309,7 @@ void EmbeddedObjectRef::Assign( const NS_UNO::Reference < NS_EMBED::XEmbeddedObj
//#i103460#
if ( IsChart() )
{
- ::com::sun::star::uno::Reference < ::com::sun::star::chart2::XDefaultSizeTransmitter > xSizeTransmitter( xObj, uno::UNO_QUERY );
+ uno::Reference < chart2::XDefaultSizeTransmitter > xSizeTransmitter( xObj, uno::UNO_QUERY );
DBG_ASSERT( xSizeTransmitter.is(), "Object does not support XDefaultSizeTransmitter -> will cause #i103460#!" );
if( xSizeTransmitter.is() )
xSizeTransmitter->setDefaultSize( mpImp->aDefaultSizeForChart_In_100TH_MM );
@@ -801,7 +801,7 @@ void EmbeddedObjectRef::SetDefaultSizeForChart( const Size& rSizeIn_100TH_MM )
mpImp->aDefaultSizeForChart_In_100TH_MM = awt::Size( rSizeIn_100TH_MM.getWidth(), rSizeIn_100TH_MM.getHeight() );
- ::com::sun::star::uno::Reference < ::com::sun::star::chart2::XDefaultSizeTransmitter > xSizeTransmitter( mxObj, uno::UNO_QUERY );
+ uno::Reference < chart2::XDefaultSizeTransmitter > xSizeTransmitter( mxObj, uno::UNO_QUERY );
DBG_ASSERT( xSizeTransmitter.is(), "Object does not support XDefaultSizeTransmitter -> will cause #i103460#!" );
if( xSizeTransmitter.is() )
xSizeTransmitter->setDefaultSize( mpImp->aDefaultSizeForChart_In_100TH_MM );