summaryrefslogtreecommitdiff
path: root/include/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-23 09:07:12 +0200
committerNoel Grandin <noel@peralex.com>2015-10-23 10:48:50 +0200
commitc06e2fcc2c03c4b6353bd9a1e282c36de872d777 (patch)
tree69cdc7e4bf9d658b108d2a71a8d9ed41c518ed0d /include/sot
parenta1ff0745cc4f78777e8dba1e7bb52d18386d7394 (diff)
com::sun::star->css in include/sot to include/typelib
Change-Id: I9cd92b53370a6b6018d2f7c648890f9c014a27de
Diffstat (limited to 'include/sot')
-rw-r--r--include/sot/exchange.hxx18
-rw-r--r--include/sot/sotdata.hxx2
-rw-r--r--include/sot/stg.hxx6
-rw-r--r--include/sot/storage.hxx8
4 files changed, 17 insertions, 17 deletions
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index a42e8368215d..4d9285beeff3 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer {
} } } }
-struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor
+struct DataFlavorEx : public css::datatransfer::DataFlavor
{
SotClipboardFormatId mnSotId;
};
@@ -54,11 +54,11 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec
// actions
#define EXCHG_ACTION_MASK ((sal_uInt16)0x00FF)
-#define EXCHG_INOUT_ACTION_NONE ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE)
+#define EXCHG_INOUT_ACTION_NONE ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_NONE)
#define EXCHG_IN_ACTION_DEFAULT EXCHG_INOUT_ACTION_NONE
-#define EXCHG_IN_ACTION_MOVE ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE)
-#define EXCHG_IN_ACTION_COPY ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY)
-#define EXCHG_IN_ACTION_LINK ((sal_uInt16)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK)
+#define EXCHG_IN_ACTION_MOVE ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_MOVE)
+#define EXCHG_IN_ACTION_COPY ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_COPY)
+#define EXCHG_IN_ACTION_LINK ((sal_uInt16)css::datatransfer::dnd::DNDConstants::ACTION_LINK)
#define EXCHG_OUT_ACTION_INSERT_OBJ ((sal_uInt16)17)
#define EXCHG_OUT_ACTION_INSERT_BOOKMARK ((sal_uInt16)18)
#define EXCHG_OUT_ACTION_INSERT_FILE ((sal_uInt16)20)
@@ -122,13 +122,13 @@ class SvGlobalName;
class SOT_DLLPUBLIC SotExchange
{
public:
- static SotClipboardFormatId RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static SotClipboardFormatId RegisterFormat( const css::datatransfer::DataFlavor& rFlavor );
static SotClipboardFormatId RegisterFormatName( const OUString& rName );
static SotClipboardFormatId RegisterFormatMimeType( const OUString& rMimeType );
- static SotClipboardFormatId GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static SotClipboardFormatId GetFormat( const css::datatransfer::DataFlavor& rFlavor );
static OUString GetFormatName( SotClipboardFormatId nFormat );
- static bool GetFormatDataFlavor( SotClipboardFormatId nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ static bool GetFormatDataFlavor( SotClipboardFormatId nFormat, css::datatransfer::DataFlavor& rFlavor );
static OUString GetFormatMimeType( SotClipboardFormatId nFormat );
static bool IsInternal( const SvGlobalName& );
static SotClipboardFormatId GetFormatIdFromMimeType( const OUString& rMimeType );
@@ -150,7 +150,7 @@ public:
// In:- optional - check only for this specific format
SotClipboardFormatId nOnlyTestFormat = SotClipboardFormatId::NONE,
// In:- optional - check the contents of Xtransferable
- const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL );
+ const css::uno::Reference< css::datatransfer::XTransferable >* pxTransferable = NULL );
static sal_uInt16 IsChart( const SvGlobalName& rName );
static sal_uInt16 IsMath( const SvGlobalName& rName );
diff --git a/include/sot/sotdata.hxx b/include/sot/sotdata.hxx
index 88a7dde5352d..58867b0b0cd7 100644
--- a/include/sot/sotdata.hxx
+++ b/include/sot/sotdata.hxx
@@ -30,7 +30,7 @@ class SotFactory;
class SotObject;
typedef ::std::vector< SotFactory* > SotFactoryList;
-typedef ::std::vector< com::sun::star::datatransfer::DataFlavor* > tDataFlavorList;
+typedef ::std::vector< css::datatransfer::DataFlavor* > tDataFlavorList;
struct SotData_Impl
{
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 8ef557b958c3..6b6bebed2165 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -228,7 +228,7 @@ protected:
virtual ~UCBStorageStream();
public:
TYPEINFO_OVERRIDE();
- UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
+ UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
virtual sal_uLong Read( void * pData, sal_uLong nSize ) override;
@@ -243,7 +243,7 @@ public:
virtual bool Validate( bool=false ) const override;
virtual bool ValidateMode( StreamMode ) const override;
virtual bool Equals( const BaseStorageStream& rStream ) const override;
- bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue );
+ bool SetProperty( const OUString& rName, const css::uno::Any& rValue );
SvStream* GetModifySvStream();
};
@@ -276,7 +276,7 @@ public:
bool bDirect,
bool bIsRoot,
bool bIsRepair,
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
+ css::uno::Reference< css::ucb::XProgressHandler >
xProgressHandler );
UCBStorage( UCBStorage_Impl* );
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 05d947a29c8e..316bc41ee9a4 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -69,7 +69,7 @@ public:
sal_uInt32 GetSize() const;
bool CopyTo( SotStorageStream * pDestStm );
bool Commit();
- bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue );
+ bool SetProperty( const OUString& rName, const css::uno::Any& rValue );
virtual sal_uInt64 remainingSize() override;
};
@@ -177,10 +177,10 @@ public:
static bool IsOLEStorage( const OUString & rFileName );
static bool IsOLEStorage( SvStream* pStream );
- static SotStorage* OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
+ static SotStorage* OpenOLEStorage( const css::uno::Reference < css::embed::XStorage >& xStorage,
const OUString& rEleName, StreamMode = STREAM_STD_READWRITE );
- static SotClipboardFormatId GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
- static sal_Int32 GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
+ static SotClipboardFormatId GetFormatID( const css::uno::Reference < css::embed::XStorage >& xStorage );
+ static sal_Int32 GetVersion( const css::uno::Reference < css::embed::XStorage >& xStorage );
};
#endif // _SVSTOR_HXX