diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-23 09:07:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-23 10:48:50 +0200 |
| commit | c06e2fcc2c03c4b6353bd9a1e282c36de872d777 (patch) | |
| tree | 69cdc7e4bf9d658b108d2a71a8d9ed41c518ed0d | |
| parent | a1ff0745cc4f78777e8dba1e7bb52d18386d7394 (diff) | |
com::sun::star->css in include/sot to include/typelib
Change-Id: I9cd92b53370a6b6018d2f7c648890f9c014a27de
271 files changed, 4625 insertions, 4663 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 diff --git a/include/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx index 06cf311d6bd5..ca048ed85924 100644 --- a/include/svl/PasswordHelper.hxx +++ b/include/svl/PasswordHelper.hxx @@ -26,19 +26,19 @@ class SvPasswordHelper { - static void GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); - static void GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); + static void GetHashPasswordLittleEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); + static void GetHashPasswordBigEndian(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); public: - SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen); + SVL_DLLPUBLIC static void GetHashPassword(css::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen); - SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); + SVL_DLLPUBLIC static void GetHashPassword(css::uno::Sequence<sal_Int8>& rPassHash, const OUString& sPass); /** Use this method to compare a given string with another given Hash value. This is necessary, because in older versions exists different hashes of the same string. They were endian dependent. We need this to handle old files. This method will compare against big and little endian. See #101326# */ - SVL_DLLPUBLIC static bool CompareHashPassword(const com::sun::star::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass); + SVL_DLLPUBLIC static bool CompareHashPassword(const css::uno::Sequence<sal_Int8>& rOldPassHash, const OUString& sNewPass); }; #endif diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx index 127eb009a973..738d127933e4 100644 --- a/include/svl/asiancfg.hxx +++ b/include/svl/asiancfg.hxx @@ -48,15 +48,14 @@ public: void SetCharDistanceCompression(sal_Int16 value); - com::sun::star::uno::Sequence< com::sun::star::lang::Locale > - GetStartEndCharLocales() const; + css::uno::Sequence< css::lang::Locale > GetStartEndCharLocales() const; bool GetStartEndChars( - com::sun::star::lang::Locale const & locale, OUString & startChars, + css::lang::Locale const & locale, OUString & startChars, OUString & endChars) const; void SetStartEndChars( - com::sun::star::lang::Locale const & locale, + css::lang::Locale const & locale, OUString const * startChars, OUString const * endChars); private: diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 52360c7a6524..a14f0c77b9b3 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -42,9 +42,9 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const override; + virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 ) override; + virtual bool PutValue(const css::uno::Any & rVal, sal_uInt8 ) override; virtual sal_uInt16 GetValueCount() const = 0; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 788c609e77d7..1ea75ae8e07f 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -48,10 +48,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; @@ -98,10 +98,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; @@ -148,10 +148,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; @@ -198,10 +198,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index a7401fd84694..991a8036ec08 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -49,16 +49,16 @@ public: virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } void SetColor( Color nColor ) { _nColor = nColor; } void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; } - const OUString& GetBitmapURL() const { return _aURL; } + const OUString& GetBitmapURL() const { return _aURL; } Color GetColor() const { return _nColor; } sal_uInt16 GetStyle() const { return _nStyle; } }; diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 37d8bdc0028d..bd72434ae87f 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -55,9 +55,9 @@ public: OUString & rText, const IntlWrapper* pIntlWrapper = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; INetContentType GetEnumValue() const; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index ee365efb3aa4..4c59264de5e1 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -52,10 +52,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) override; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index 23403c85dbcd..b658dccf8c29 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -37,9 +37,9 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon // the workaround for automated testing! static bool m_bAllowInteraction; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream(); + css::uno::Reference< css::io::XInputStream > OpenStream(); - void WriteEntryToStream( const LockFileEntry& aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream ); + void WriteEntryToStream( const LockFileEntry& aEntry, css::uno::Reference< css::io::XOutputStream > xStream ); public: DocumentLockFile( const OUString& aOrigURL ); diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 7c0d8de411cb..46c8534327ea 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -94,11 +94,9 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0) - const override; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 = 0) const override; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) - override; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 4144e05bc1dc..3e552c2e40e6 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -38,9 +38,9 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; SvGlobalName GetValue() const { return m_aName; } - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 9b9e9375bd9f..64410a8e0196 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -27,28 +27,28 @@ class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence < sal_Int32 > m_aList; + css::uno::Sequence < sal_Int32 > m_aList; public: TYPEINFO_OVERRIDE(); SfxIntegerListItem(); SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList ); - SfxIntegerListItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Sequence < sal_Int32 >& rList ); + SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList ); SfxIntegerListItem( const SfxIntegerListItem& rItem ); virtual ~SfxIntegerListItem(); - ::com::sun::star::uno::Sequence < sal_Int32 > GetSequence() + css::uno::Sequence < sal_Int32 > GetSequence() { return m_aList; } - ::com::sun::star::uno::Sequence < sal_Int32 > GetConstSequence() const + css::uno::Sequence < sal_Int32 > GetConstSequence() const { return (const_cast< SfxIntegerListItem * >(this))->GetSequence(); } void GetList( ::std::vector < sal_Int32 >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; #endif // INCLUDED_SVL_ILSTITEM_HXX diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index 0ec2b775a47e..a6bfd1d09176 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -35,8 +35,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void SetRotation( long nValue ); long GetRotation() const; diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 07188cdf49b3..1e64eda2aecf 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -34,12 +34,10 @@ class SvDataPipe_Impl; class SVL_DLLPUBLIC SvInputStream: public SvStream { - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - m_xStream; - com::sun::star::uno::Reference< com::sun::star::io::XSeekable > - m_xSeekable; - SvDataPipe_Impl * m_pPipe; - sal_uInt64 m_nSeekedFrom; + css::uno::Reference< css::io::XInputStream > m_xStream; + css::uno::Reference< css::io::XSeekable > m_xSeekable; + SvDataPipe_Impl * m_pPipe; + sal_uInt64 m_nSeekedFrom; SVL_DLLPRIVATE bool open(); @@ -54,10 +52,7 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override; public: - SvInputStream( - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - const & - rTheStream); + SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream ); virtual ~SvInputStream(); }; diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index b5f36c0564e7..feb0734e77d9 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -31,10 +31,10 @@ public: OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const override; virtual bool QueryValue( - com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( - const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 3b9d4bf37f80..9ecbfce68b2d 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -65,10 +65,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 2c68dfa7718e..56a82d9af91e 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -32,8 +32,8 @@ struct SfxItemPropertyMapEntry { OUString aName; ///< name of property sal_uInt16 nWID; ///< WhichId of SfxPoolItem - com::sun::star::uno::Type aType; ///< UNO type of property - /// flag bitmap, @see com::sun::star::beans::PropertyAttribute + css::uno::Type aType; ///< UNO type of property + /// flag bitmap, @see css::beans::PropertyAttribute long nFlags; /// "member ID" to tell QueryValue/PutValue which property it is /// (when multiple properties map to the same nWID) @@ -44,7 +44,7 @@ struct SfxItemPropertyMapEntry struct SfxItemPropertySimpleEntry { sal_uInt16 nWID; - com::sun::star::uno::Type aType; + css::uno::Type aType; long nFlags; sal_uInt8 nMemberId; @@ -55,7 +55,7 @@ struct SfxItemPropertySimpleEntry { } - SfxItemPropertySimpleEntry(sal_uInt16 _nWID, com::sun::star::uno::Type const & _rType, + SfxItemPropertySimpleEntry(sal_uInt16 _nWID, css::uno::Type const & _rType, long _nFlags, sal_uInt8 _nMemberId) : nWID( _nWID ) , aType( _rType ) @@ -94,12 +94,12 @@ public: ~SfxItemPropertyMap(); const SfxItemPropertySimpleEntry* getByName( const OUString &rName ) const; - com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const; - com::sun::star::beans::Property getPropertyByName( const OUString & rName ) const - throw( ::com::sun::star::beans::UnknownPropertyException ); + css::uno::Sequence< css::beans::Property > getProperties() const; + css::beans::Property getPropertyByName( const OUString & rName ) const + throw( css::beans::UnknownPropertyException ); bool hasPropertyByName( const OUString& rName ) const; - void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq ); + void mergeProperties( const css::uno::Sequence< css::beans::Property >& rPropSeq ); PropertyEntryVector_t getPropertyEntries() const; sal_uInt32 getSize() const; @@ -107,8 +107,8 @@ public: class SVL_DLLPUBLIC SfxItemPropertySet { - SfxItemPropertyMap m_aMap; - mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; + SfxItemPropertyMap m_aMap; + mutable css::uno::Reference<css::beans::XPropertySetInfo> m_xInfo; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : @@ -117,45 +117,44 @@ public: void getPropertyValue( const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet, - com::sun::star::uno::Any& rAny) const - throw(::com::sun::star::uno::RuntimeException); + css::uno::Any& rAny) const + throw(css::uno::RuntimeException); void getPropertyValue( const OUString &rName, const SfxItemSet& rSet, - com::sun::star::uno::Any& rAny) const - throw(::com::sun::star::uno::RuntimeException, - ::com::sun::star::beans::UnknownPropertyException); - com::sun::star::uno::Any + css::uno::Any& rAny) const + throw(css::uno::RuntimeException, + css::beans::UnknownPropertyException); + css::uno::Any getPropertyValue( const OUString &rName, const SfxItemSet& rSet ) const - throw(::com::sun::star::uno::RuntimeException, - ::com::sun::star::beans::UnknownPropertyException); + throw(css::uno::RuntimeException, + css::beans::UnknownPropertyException); void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, - const com::sun::star::uno::Any& aVal, + const css::uno::Any& aVal, SfxItemSet& rSet ) const - throw(::com::sun::star::uno::RuntimeException, - com::sun::star::lang::IllegalArgumentException); + throw(css::uno::RuntimeException, + css::lang::IllegalArgumentException); void setPropertyValue( const OUString& rPropertyName, - const com::sun::star::uno::Any& aVal, + const css::uno::Any& aVal, SfxItemSet& rSet ) const - throw(::com::sun::star::uno::RuntimeException, - com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::beans::UnknownPropertyException); + throw(css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::beans::UnknownPropertyException); - com::sun::star::beans::PropertyState + css::beans::PropertyState getPropertyState(const OUString& rName, const SfxItemSet& rSet)const - throw(com::sun::star::beans::UnknownPropertyException); - com::sun::star::beans::PropertyState + throw(css::beans::UnknownPropertyException); + css::beans::PropertyState getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const throw(); - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> + css::uno::Reference<css::beans::XPropertySetInfo> getPropertySetInfo() const; const SfxItemPropertyMap& getPropertyMap() const {return m_aMap;} }; struct SfxItemPropertySetInfo_Impl; -class SVL_DLLPUBLIC SfxItemPropertySetInfo : public - cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo> +class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<css::beans::XPropertySetInfo> { SfxItemPropertySetInfo_Impl* m_pImpl; @@ -164,41 +163,41 @@ public: SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ); virtual ~SfxItemPropertySetInfo(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; }; -class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo > +class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<css::beans::XPropertySetInfo > { SfxItemPropertyMap aExtMap; public: SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pMap, - const com::sun::star::uno::Sequence<com::sun::star::beans::Property>& rPropSeq ); + const css::uno::Sequence<css::beans::Property>& rPropSeq ); virtual ~SfxExtItemPropertySetInfo(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index 0064395b9cac..92158684a461 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -29,7 +29,7 @@ // class SvtLanguageOptions ---------------------------------------------------- // these defines can be ORed -// note these values DO NOT match the values in com::sun::star::i18n::ScriptType +// note these values DO NOT match the values in css::i18n::ScriptType enum class SvtScriptType { NONE = 0x00, @@ -124,7 +124,7 @@ public: SvtSystemLanguageOptions(); virtual ~SvtSystemLanguageOptions(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; LanguageType GetWin16SystemLanguage() const; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index f60d359e9d25..716e8fce8ea9 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -42,9 +42,9 @@ public: SvLockBytes* GetValue() const { return _xVal; } - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index 767df068180b..ce6c435ceef2 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -55,9 +55,9 @@ public: LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix ); ~LockFileCommon(); - static void ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput ); - static LockFileEntry ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); - static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static void ParseList( const css::uno::Sequence< sal_Int8 >& aBuffer, std::vector< LockFileEntry > &rOutput ); + static LockFileEntry ParseEntry( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static OUString ParseName( const css::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); static OUString EscapeCharacters( const OUString& aSource ); static OUString GetOOOUserName(); static OUString GetCurrentLocalTime(); diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 059ead4f6ec7..4dab2ef8e908 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -37,10 +37,9 @@ namespace comphelper // SvNumberFormatterServiceObj must be registered as service somewhere -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> SAL_CALL SvNumberFormatterServiceObj_NewInstance( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory>& rSMgr ); + const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); @@ -48,8 +47,8 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL // construct with SvNumberFormatter class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< - com::sun::star::util::XNumberFormatsSupplier, - com::sun::star::lang::XUnoTunnel> + css::util::XNumberFormatsSupplier, + css::lang::XUnoTunnel> { private: SvNumFmtSuppl_Impl* pImpl; @@ -63,21 +62,20 @@ public: SvNumberFormatter* GetNumberFormatter() const; // XNumberFormatsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference< - com::sun::star::util::XNumberFormatsSupplier>& rObj ); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static SvNumberFormatsSupplierObj* getImplementation( const css::uno::Reference< + css::util::XNumberFormatsSupplier>& rObj ); ::comphelper::SharedMutex& getSharedMutex() const; }; diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index 9e9ddbb83b7f..8b9f3672da01 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -54,7 +54,7 @@ class OnDemandLocaleDataWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; SvtSysLocale aSysLocale; LanguageType eCurrentLanguage; LanguageType eLastAnyLanguage; @@ -75,7 +75,7 @@ public: eCurrentLanguage = LANGUAGE_SYSTEM; } OnDemandLocaleDataWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) : pEnglish(0) @@ -95,7 +95,7 @@ public: bool isInitialized() const { return bInitialized; } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) { @@ -148,8 +148,8 @@ public: */ class OnDemandCalendarWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::lang::Locale aLocale; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::lang::Locale aLocale; mutable CalendarWrapper* pPtr; mutable bool bValid; bool bInitialized; @@ -161,8 +161,8 @@ public: , bInitialized(false) {} OnDemandCalendarWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - ::com::sun::star::lang::Locale& rLocale + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + css::lang::Locale& rLocale ) : bValid(false) , bInitialized(false) @@ -175,8 +175,8 @@ public: } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::lang::Locale& rLocale + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::lang::Locale& rLocale ) { m_xContext = rxContext; @@ -189,7 +189,7 @@ public: bInitialized = true; } - void changeLocale( const ::com::sun::star::lang::Locale& rLocale ) + void changeLocale( const css::lang::Locale& rLocale ) { bValid = false; aLocale = rLocale; @@ -218,9 +218,9 @@ public: */ class OnDemandTransliterationWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; LanguageType eLanguage; - ::com::sun::star::i18n::TransliterationModules nType; + css::i18n::TransliterationModules nType; mutable ::utl::TransliterationWrapper* pPtr; mutable bool bValid; bool bInitialized; @@ -228,15 +228,15 @@ class OnDemandTransliterationWrapper public: OnDemandTransliterationWrapper() : eLanguage( LANGUAGE_SYSTEM ) - , nType(::com::sun::star::i18n::TransliterationModules_END_OF_MODULE) + , nType(css::i18n::TransliterationModules_END_OF_MODULE) , pPtr(0) , bValid(false) , bInitialized(false) {} OnDemandTransliterationWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageType eLang, - ::com::sun::star::i18n::TransliterationModules nTypeP + css::i18n::TransliterationModules nTypeP ) : bValid(false) , bInitialized(false) @@ -251,9 +251,9 @@ public: bool isInitialized() const { return bInitialized; } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageType eLang, - ::com::sun::star::i18n::TransliterationModules nTypeP + css::i18n::TransliterationModules nTypeP ) { m_xContext = rxContext; @@ -298,9 +298,9 @@ public: */ class OnDemandNativeNumberWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; mutable NativeNumberWrapper* pPtr; - bool bInitialized; + bool bInitialized; public: OnDemandNativeNumberWrapper() @@ -308,7 +308,7 @@ public: , bInitialized(false) {} OnDemandNativeNumberWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : pPtr(0) , bInitialized(false) @@ -321,7 +321,7 @@ public: } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) { m_xContext = rxContext; diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 0239a2f19428..487d133da738 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -31,8 +31,7 @@ namespace com { namespace sun { namespace star { namespace io { class SVL_DLLPUBLIC SvOutputStream: public SvStream { - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - m_xStream; + css::uno::Reference< css::io::XOutputStream > m_xStream; SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override; @@ -45,9 +44,7 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override; public: - SvOutputStream(com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > const & - rTheStream); + SvOutputStream(css::uno::Reference< css::io::XOutputStream > const & rTheStream); virtual ~SvOutputStream(); }; diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx index eb0298c72c0e..78d5c676fca3 100644 --- a/include/svl/ownlist.hxx +++ b/include/svl/ownlist.hxx @@ -65,8 +65,8 @@ public: SvCommand& Append( const OUString & rCommand, const OUString & rArg ); bool AppendCommands( const OUString & rCmd, sal_Int32 * pEaten ); - bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); - void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); + bool FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& ); + void FillSequence( css::uno::Sequence < css::beans::PropertyValue >& ); size_t size() const { return aCommandList.size(); } diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 4b848c879118..4291dd04c1bf 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -31,10 +31,10 @@ namespace svt SVL_DLLPUBLIC void addFolderPicker( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); + const css::uno::Reference< css::uno::XInterface >& _rxPicker ); SVL_DLLPUBLIC void addFilePicker( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); + const css::uno::Reference< css::uno::XInterface >& _rxPicker ); } // namespace svt diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 1ea63b91e8b3..f6a7df9b98bf 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -47,7 +47,7 @@ enum SfxItemKind { #define CONVERT_TWIPS 0x80 // Uno conversion for measurement (for MemberId) // warning, if there is no boolean inside the any this will always return the value false -inline bool Any2Bool( const ::com::sun::star::uno::Any&rValue ) +inline bool Any2Bool( const css::uno::Any&rValue ) { bool bValue = false; if( rValue.hasValue() ) @@ -99,7 +99,7 @@ enum SfxItemPresentation /** * These values have to match the values in the - * com::sun::star::frame::status::ItemState IDL + * css::frame::status::ItemState IDL * to be found at offapi/com/sun/star/frame/status/ItemState.idl */ enum class SfxItemState { @@ -181,8 +181,8 @@ public: virtual bool ScaleMetrics( long lMult, long lDiv ); virtual bool HasMetrics() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ); virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nItemVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 27375140415f..92dd2abaa2b1 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -54,9 +54,9 @@ public: aVal = rNewVal; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index f94215b94d8e..5031f0732f53 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -49,9 +49,9 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; const Rectangle& GetValue() const { return aVal; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index 26ec50702e2a..d622d0e74f3c 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -36,13 +36,13 @@ namespace svt { class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; + css::uno::Reference< css::io::XStream > m_xStream; + css::uno::Reference< css::io::XInputStream > m_xInputStream; + css::uno::Reference< css::io::XOutputStream > m_xOutputStream; + css::uno::Reference< css::io::XSeekable > m_xSeekable; + css::uno::Reference< css::io::XTruncate > m_xTruncate; - std::vector< LockFileEntry > m_aUsersData; + std::vector< LockFileEntry > m_aUsersData; void OpenStream(); void Close(); diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 1e7e4a5891cf..9f1fac772b1c 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -50,8 +50,8 @@ public: void SetString( const OUString& ); OUString GetString(); - void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); - void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; + void SetStringList( const css::uno::Sequence< OUString >& rList ); + void GetStringList( css::uno::Sequence< OUString >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -63,9 +63,9 @@ public: virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; #endif diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 4813458afb9a..7a48eebf492c 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -63,7 +63,7 @@ class SVL_DLLPUBLIC SvxSearchItem : public SfxPoolItem, public utl::ConfigItem { - com::sun::star::util::SearchOptions m_aSearchOpt; + css::util::SearchOptions m_aSearchOpt; SfxStyleFamily m_eFamily; // style family @@ -98,8 +98,8 @@ public: SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool operator == ( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -108,7 +108,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const override; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; SvxSearchCmd GetCommand() const { return m_nCommand; } void SetCommand(SvxSearchCmd nNewCommand) { m_nCommand = nNewCommand; } @@ -177,9 +177,9 @@ public: inline sal_uInt16 GetLEVLonger() const; inline void SetLEVLonger(sal_uInt16 nSet); - inline const com::sun::star::util::SearchOptions & - GetSearchOptions() const; - inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt ); + inline const css::util::SearchOptions & + GetSearchOptions() const; + inline void SetSearchOptions( const css::util::SearchOptions &rOpt ); inline sal_Int32 GetTransliterationFlags() const; void SetTransliterationFlags( sal_Int32 nFlags ); @@ -219,30 +219,27 @@ void SvxSearchItem::SetReplaceString(const OUString& rNewString) bool SvxSearchItem::GetWordOnly() const { return 0 != (m_aSearchOpt.searchFlag & - com::sun::star::util::SearchFlags::NORM_WORD_ONLY); + css::util::SearchFlags::NORM_WORD_ONLY); } bool SvxSearchItem::GetExact() const { - return 0 == (m_aSearchOpt.transliterateFlags & - com::sun::star::i18n::TransliterationModules_IGNORE_CASE); + return 0 == (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_CASE); } bool SvxSearchItem::GetSelection() const { - return 0 != (m_aSearchOpt.searchFlag & - com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE); + return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::REG_NOT_BEGINOFLINE); } bool SvxSearchItem::GetRegExp() const { - return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ; + return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_REGEXP ; } bool SvxSearchItem::IsLEVRelaxed() const { - return 0 != (m_aSearchOpt.searchFlag & - com::sun::star::util::SearchFlags::LEV_RELAXED); + return 0 != (m_aSearchOpt.searchFlag & css::util::SearchFlags::LEV_RELAXED); } sal_uInt16 SvxSearchItem::GetLEVOther() const @@ -277,15 +274,15 @@ void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal ) bool SvxSearchItem::IsLevenshtein() const { - return m_aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE; + return m_aSearchOpt.algorithmType == css::util::SearchAlgorithms_APPROXIMATE; } -const com::sun::star::util::SearchOptions & SvxSearchItem::GetSearchOptions() const +const css::util::SearchOptions & SvxSearchItem::GetSearchOptions() const { return m_aSearchOpt; } -void SvxSearchItem::SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt ) +void SvxSearchItem::SetSearchOptions( const css::util::SearchOptions &rOpt ) { m_aSearchOpt = rOpt; } @@ -297,8 +294,7 @@ sal_Int32 SvxSearchItem::GetTransliterationFlags() const bool SvxSearchItem::IsMatchFullHalfWidthForms() const { - return 0 != (m_aSearchOpt.transliterateFlags & - com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH); + return 0 != (m_aSearchOpt.transliterateFlags & css::i18n::TransliterationModules_IGNORE_WIDTH); } #endif diff --git a/include/svl/style.hxx b/include/svl/style.hxx index da82d7ba6cf1..cff7f49dfcee 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -340,20 +340,20 @@ public: const OUString& GetOldName() const { return aName; } }; -class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel > +class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel > { public: SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ); - static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ); + static SfxUnoStyleSheet* getUnoStyleSheet( const css::uno::Reference< css::style::XStyle >& xStyle ); // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; private: SfxUnoStyleSheet(); // not implemented - static const ::com::sun::star::uno::Sequence< ::sal_Int8 >& getIdentifier(); + static const css::uno::Sequence< ::sal_Int8 >& getIdentifier(); }; #endif diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index ef2e1bc436b4..3d9894ba4f42 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -44,9 +44,9 @@ public: const IntlWrapper * = 0 ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index 6007b672a333..b784188461f8 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -82,13 +82,13 @@ SVL_DLLPUBLIC Link<OUString *, bool> GetMaybeFileHdl(); @exception std::bad_alloc if an out-of-memory condition occurs - @exception com::sun::star::uno::RuntimeException if any error occurs + @exception css::uno::RuntimeException if any error occurs */ -SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > +SVL_DLLPUBLIC css::uno::Reference< css::uri::XUriReference > normalizedMakeRelative( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context, - OUString const & baseUriReference, OUString const & uriReference); + css::uno::Reference< css::uno::XComponentContext > const & context, + OUString const & baseUriReference, + OUString const & uriReference); /** A variant of normalizedMakeRelative with a simplified interface. @@ -107,7 +107,7 @@ normalizedMakeRelative( @exception std::bad_alloc if an out-of-memory condition occurs - @exception com::sun::star::uno::RuntimeException if any error occurs + @exception css::uno::RuntimeException if any error occurs @deprecated No code should rely on the default component context. diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 3ef6b0002af1..107c8087b3d4 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -26,7 +26,7 @@ class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem { - ::com::sun::star::frame::status::Visibility m_nValue; + css::frame::status::Visibility m_nValue; public: TYPEINFO_OVERRIDE(); @@ -53,10 +53,10 @@ public: const IntlWrapper * = 0) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 8703a031a05f..216d354d3db1 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -228,7 +228,7 @@ public: NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, LanguageType eLang ); - NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, + NfCurrencyEntry( const css::i18n::Currency & rCurr, const LocaleDataWrapper& rLocaleData, LanguageType eLang ); inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol, @@ -317,7 +317,7 @@ public: /// Preferred ctor with service manager and language/country enum SvNumberFormatter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageType eLang ); @@ -770,7 +770,7 @@ public: static bool IsLocaleInstalled( LanguageType eLang ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; LanguageTag maLanguageTag; SvNumberFormatTable aFTable; // Table of format keys to format entries typedef std::map<sal_uInt32, sal_uInt32> DefaultFormatKeysMap; @@ -816,7 +816,7 @@ private: NumberFormatCodeWrapper& rNumberFormatCode, bool bAfterChangingSystemCL ); - SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode, + SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const css::i18n::NumberFormatCode& rCode, sal_uInt32 nPos, bool bAfterChangingSystemCL = false, sal_Int16 nOrgIndex = 0 ); @@ -856,7 +856,7 @@ private: // Return the index in a sequence of format codes matching an enum of // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't // contain any format code elements a default element is created and inserted. - SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq, + SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( css::uno::Sequence< css::i18n::NumberFormatCode >& rSeq, const NfIndexTableOffset nTabOff ); // Adjust a sequence of format codes to contain only one (THE) default @@ -865,7 +865,7 @@ private: // Return the default index in the sequence. // Non-PRODUCT version may check locale data for matching defaults in one // FormatElement group. - SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( ::com::sun::star::i18n::NumberFormatCode * pFormatArr, + SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( css::i18n::NumberFormatCode * pFormatArr, sal_Int32 nCount, bool bCheckCorrectness = true ); // Obtain the format entry for a given key index. diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 2858563ee4ef..c204702d168c 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -395,7 +395,7 @@ public: // rAttr.Number not empty if NatNum attributes are to be stored void GetNatNumXml( - ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr, + css::i18n::NativeNumberXmlAttributes& rAttr, sal_uInt16 nNumFor ) const; /** Switches to the first non-"gregorian" calendar, but only if the current @@ -477,7 +477,7 @@ private: @param eCodeType a NfKeywordIndex, must designate a month type code - @returns one of com::sun::star::i18n::CalendarDisplayCode values + @returns one of css::i18n::CalendarDisplayCode values according to eCodeType and the check executed (or passed). */ SVL_DLLPRIVATE sal_Int32 ImpUseMonthCase( int & io_nState, const ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType ) const; diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index d2aa02aaa101..d7b02e73de76 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -50,8 +50,7 @@ public: void clear(); void fill( - com::sun::star::uno::Reference< - com::sun::star::document::XDocumentProperties > const & xDocProps, + css::uno::Reference< css::document::XDocumentProperties > const & xDocProps, OUString const & rURL); private: @@ -63,7 +62,7 @@ private: void insertNonempty(long id, OUString const & value); - void insertDateTime(long id, com::sun::star::util::DateTime const & value); + void insertDateTime(long id, css::util::DateTime const & value); }; } diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 3e71209d77e4..b86a23d52ecb 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -126,7 +126,7 @@ class CmisDetailsContainer : public DetailsContainer private: OUString m_sUsername; OUString m_sPassword; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xCmdEnv; std::vector< OUString > m_aRepoIds; OUString m_sRepoId; OUString m_sBinding; diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index a4ef5d568b32..8736506eaaf4 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -171,7 +171,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit * @param aKey The key event * @return The command or an empty string if the key event could not be found. */ - OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); + OUString findCommand(const css::awt::KeyEvent& aKey); /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const vcl::KeyCode& aKey); diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index 21ba910b8d94..6327c9735c3f 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -76,98 +76,98 @@ namespace svt public: virtual IAccessibleTabListBox* createAccessibleTabListBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const = 0; virtual IAccessibleBrowseBox* createAccessibleBrowseBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const = 0; virtual table::IAccessibleTableControl* createAccessibleTableControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, table::IAccessibleTable& _rTable ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent + const css::uno::Reference< css::accessibility::XAccessible >& _xParent ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleTabBar( TabBar& _rTabBar ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleTextWindowContext( VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleTreeListBox( SvTreeListBox& _rListBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent + const css::uno::Reference< css::accessibility::XAccessible >& _xParent ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, AccessibleBrowseBoxObjType _eObjType ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxTableCell( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderCell( sal_Int32 _nColumnRowId, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleCheckBoxCell( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, + const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, bool _bIsTriState ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createEditBrowseBoxTableCellAccess( - const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent, - const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, + const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleToolPanelDeck( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent, + const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleToolPanelTabBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent, + const css::uno::Reference< css::accessibility::XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar ) = 0; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index b8918b8d28b6..f73d385faf47 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -53,11 +53,11 @@ namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper5< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo > SvtRulerAccessible_Base; class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAccessible_Base @@ -65,112 +65,112 @@ class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAcces public: //===== internal ======================================================== SvtRulerAccessible( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName ); + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName ); protected: virtual ~SvtRulerAccessible(); public: bool SAL_CALL - isVisible() throw( ::com::sun::star::uno::RuntimeException ); + isVisible() throw( css::uno::RuntimeException ); //===== XAccessible ===================================================== - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL + getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override; //===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL + getBounds() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocation() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Size SAL_CALL - getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL + getSize() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + grabFocus() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getForeground( ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL - getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getBackground( ) throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; + throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL + getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override; virtual ::rtl::OUString SAL_CALL - getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; virtual ::rtl::OUString SAL_CALL - getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL + getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; + throw( css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; //===== XAccessibleEventBroadcaster ===================================== virtual void SAL_CALL - addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; //===== XServiceInfo ==================================================== virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL + getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL + getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); virtual void SAL_CALL disposing() override; @@ -182,7 +182,7 @@ protected: inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -195,7 +195,7 @@ private: ::rtl::OUString msName; /// Reference to the parent object. - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxParent; /// pointer to internal representation diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 9f5bb48c7f63..da67bf0c884e 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -54,23 +54,23 @@ namespace svt VclPtr<ScrollBar> m_pFieldScroller; // string to display for "no selection" - const OUString m_sNoFieldSelection; + const OUString m_sNoFieldSelection; /// the DatabaseContext for selecting data sources - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > - m_xDatabaseContext; + css::uno::Reference< css::sdb::XDatabaseContext > + m_xDatabaseContext; // the ORB for creating objects - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xCurrentDatasourceTables; + css::uno::Reference< css::uno::XComponentContext > + m_xORB; + css::uno::Reference< css::container::XNameAccess > + m_xCurrentDatasourceTables; AddressBookSourceDialogData* - m_pImpl; + m_pImpl; public: AddressBookSourceDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); /** if you use this ctor, the dialog <ul><li>will not store it's data in the configuration (nor initially retrieve it from there)</li> @@ -92,11 +92,11 @@ namespace svt obtained from <arg>_rxTransientDS</arg> */ AddressBookSourceDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdbc::XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, - const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping + const css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping ); virtual ~AddressBookSourceDialog(); @@ -104,7 +104,7 @@ namespace svt // to be used if the object was constructed for editing a field mapping only void getFieldMapping( - ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const; + css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping) const; protected: void implConstruct(); diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index a7d7c97e01fd..3b9dd1d6d180 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -55,14 +55,14 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem static bool bInitialized ; - SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + SVT_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; public: SvtTabAppearanceCfg( ); virtual ~SvtTabAppearanceCfg( ); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; sal_uInt16 GetDragMode () const { return nDragMode; } diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 6ddaf5dc81d2..65ca905ab382 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -36,7 +36,7 @@ namespace svt */ namespace BindableControlHelper { - SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); + SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 ); } diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 1033b39d4be0..f0f5fe1b0af5 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -30,7 +30,7 @@ namespace vcl { class Window; } class TransferableDataHelper; class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< - ::com::sun::star::datatransfer::clipboard::XClipboardListener > + css::datatransfer::clipboard::XClipboardListener > { Link<TransferableDataHelper*,void> aLink; @@ -43,11 +43,11 @@ public: void ClearCallbackLink(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException, std::exception) override; // XClipboardListener - virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event ) + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx index 2e7d8c0dda72..b636fddf9519 100644 --- a/include/svtools/contextmenuhelper.hxx +++ b/include/svtools/contextmenuhelper.hxx @@ -53,13 +53,13 @@ class SVT_DLLPUBLIC ContextMenuHelper // create context menu helper // ARGS: xFrame = frame defines the context of the context menu // bAutoRefresh = specifies that the context will be constant or not - ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true ); + ContextMenuHelper( const css::uno::Reference< css::frame::XFrame >& xFrame, bool bAutoRefresh=true ); ~ContextMenuHelper(); // methods to complete a popup menu (set images, labels, enable/disable states) // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!) void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu ); - void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu ); + void completeAndExecute( const Point& aPos, const css::uno::Reference< css::awt::XPopupMenu >& xPopupMenu ); private: // asynchronous link to prevent destruction while on stack @@ -75,13 +75,13 @@ class SVT_DLLPUBLIC ContextMenuHelper void completeMenuProperties( Menu* pMenu ); // dispatch provided command - bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& aCommandURL ); + bool dispatchCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL ); // methods to retrieve a single command URL dependent value from a // ui configuration manager Image getImageFromCommandURL( const OUString& aCmdURL ) const; - OUString getLabelFromCommandURL( const OUString& aCmdURL ) const; + OUString getLabelFromCommandURL( const OUString& aCmdURL ) const; // creates an association between current module/controller bound to the // provided frame and their ui configuration managers. @@ -97,15 +97,15 @@ class SVT_DLLPUBLIC ContextMenuHelper m_bUICfgMgrAssociated = false; } - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; - OUString m_aSelf; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; - bool m_bAutoRefresh; - bool m_bUICfgMgrAssociated; + css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame; + OUString m_aSelf; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Sequence< css::beans::PropertyValue > m_aDefaultArgs; + css::uno::Reference< css::ui::XImageManager > m_xDocImageMgr; + css::uno::Reference< css::ui::XImageManager > m_xModuleImageMgr; + css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; + bool m_bAutoRefresh; + bool m_bUICfgMgrAssociated; }; } // namespace svt diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index da969fc9de45..7c26d467168c 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -324,10 +324,10 @@ public: ColorDistFunc pColorDistFn = &sameDistColor); using ListBox::GetEntryPos; - sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; + sal_Int32 GetEntryPos( sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID ) const; sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; - void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, bool bSelect = true ); + void SelectEntry( sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID, bool bSelect = true ); sal_uInt16 GetSelectEntryStyle( sal_Int32 nSelIndex = 0 ) const; inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index df75982afbbd..693f8bb7f451 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -34,10 +34,10 @@ namespace svt //= ODialogClosedListener /** - C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener + C++ class to implement a css::ui::dialogs::XDialogClosedListener */ class SVT_DLLPUBLIC DialogClosedListener : - public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener > + public ::cppu::WeakImplHelper1< css::ui::dialogs::XDialogClosedListener > { private: /** @@ -51,10 +51,10 @@ namespace svt inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) override; }; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 532b47ed1ee4..9fdd5ec22b72 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -624,8 +624,7 @@ namespace svt The column ID of the cell. @return The XAccessible interface of the specified cell. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override; /** @return The count of additional controls of the control area. */ @@ -636,8 +635,7 @@ namespace svt The 0-based index of the control. @return The XAccessible interface of the specified control. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 nIndex ) override; /** Creates the accessible object of a column header. @@ -645,8 +643,7 @@ namespace svt The column ID of the header. @return The XAccessible interface of the specified column header. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) override; /** Sets focus to current cell of the data table. */ @@ -655,8 +652,7 @@ namespace svt virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); + css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); protected: // creates the accessible which wraps the active cell void implCreateActiveAccessible( ); diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index b1b33282f05d..aee98433402b 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -55,32 +55,32 @@ class SVT_DLLPUBLIC EmbeddedObjectRef public: static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut ); static void DrawShading( const Rectangle &rRect, OutputDevice *pOut ); - static bool TryRunningState( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + static bool TryRunningState( const css::uno::Reference < css::embed::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, const OUString& aName, const OUString& aMediaType ); - static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetGraphicReplacementStream( + static css::uno::Reference< css::io::XInputStream > GetGraphicReplacementStream( sal_Int64 nViewAspect, - const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, + const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType ) throw(); - static bool IsChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj); - static bool IsGLChart(const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj); + static bool IsChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj); + static bool IsGLChart(const css::uno::Reference < css::embed::XEmbeddedObject >& xObj); - const com::sun::star::uno::Reference <com::sun::star::embed::XEmbeddedObject>& operator->() const; - const com::sun::star::uno::Reference <com::sun::star::embed::XEmbeddedObject>& GetObject() const; + const css::uno::Reference <css::embed::XEmbeddedObject>& operator->() const; + const css::uno::Reference <css::embed::XEmbeddedObject>& GetObject() const; // default constructed object; needs further assignment before it can be used EmbeddedObjectRef(); // assign a previously default constructed object - void Assign( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); + void Assign( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); // create object for a certain view aspect - EmbeddedObjectRef( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); + EmbeddedObjectRef( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); ~EmbeddedObjectRef(); EmbeddedObjectRef( const EmbeddedObjectRef& ); @@ -99,7 +99,7 @@ public: void SetGraphic( const Graphic& rGraphic, const OUString& rMediaType ); void SetGraphicStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream, + const css::uno::Reference< css::io::XInputStream >& xInGrStream, const OUString& rMediaType ); void UpdateReplacement(); diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 18e27eec5b34..c76c5b4b9734 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -29,7 +29,7 @@ class SVT_DLLPUBLIC SvEmbedTransferHelper : public TransferableHelper { private: - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > m_xObj; + css::uno::Reference< css::embed::XEmbeddedObject > m_xObj; Graphic* m_pGraphic; sal_Int64 m_nAspect; @@ -43,7 +43,7 @@ protected: public: // object, replacement image, and the aspect - SvEmbedTransferHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, + SvEmbedTransferHelper( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, const Graphic* pGraphic, sal_Int64 nAspect ); virtual ~SvEmbedTransferHelper(); @@ -51,7 +51,7 @@ public: void SetParentShellID( const OUString& rShellID ); static void FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, + const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, const Graphic* pGraphic, sal_Int64 nAspect ); }; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 582a39d0ecc2..b8552cce636b 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -64,10 +64,9 @@ struct FileViewAsyncAction class SVT_DLLPUBLIC SvtFileView : public Control { private: - SvtFileView_Impl* mpImp; - bool bSortColumn; - - ::com::sun::star::uno::Sequence< OUString > mpBlackList; + SvtFileView_Impl* mpImp; + bool bSortColumn; + css::uno::Sequence< OUString > mpBlackList; DECL_DLLPRIVATE_LINK_TYPED( HeaderSelect_Impl, HeaderBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); @@ -109,12 +108,12 @@ public: const OUString& rFolderURL, const OUString& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList + const css::uno::Sequence< OUString >& rBlackList ); /** initializes the view with the content of a folder given by an UCB content */ - bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, + bool Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent, const OUString& rFilter ); /** reads the current content of the current folder again, and applies the given filter to it diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx index eb07abd71e2b..23fc485965e9 100644 --- a/include/svtools/foldertree.hxx +++ b/include/svtools/foldertree.hxx @@ -52,7 +52,7 @@ public: void FillTreeEntry( SvTreeListEntry* pEntry ); void FillTreeEntry( const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders ); void SetTreePath( OUString const & sUrl ); - void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); + void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ); }; #endif diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 9e58bc67ec21..15493ae45cab 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -45,7 +45,7 @@ public: SvtFontSubstConfig(); virtual ~SvtFontSubstConfig(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; bool IsEnabled() const {return bIsEnabled;} void Enable(bool bSet) {bIsEnabled = bSet; SetModified();} diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index ae90bc4a1711..dbf22189a4cf 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -36,15 +36,15 @@ namespace svt { -class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XFrameActionListener, - public ::com::sun::star::lang::XComponent, +class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener, + public css::frame::XFrameActionListener, + public css::lang::XComponent, public ::comphelper::OBaseMutex, public ::cppu::OWeakObject { public: - FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); + FrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& xFrame ); virtual ~FrameStatusListener(); // methods to support status forwarder, known by the old sfx2 toolbox controller implementation @@ -53,32 +53,32 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu void unbindListener(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // 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; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override; protected: struct Listener { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + css::util::URL aURL; + css::uno::Reference< css::frame::XDispatch > xDispatch; }; typedef std::unordered_map< OUString, @@ -86,11 +86,11 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu OUStringHash, std::equal_to< OUString > > URLToDispatchMap; - bool m_bInitialized : 1, - m_bDisposed : 1; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - URLToDispatchMap m_aListenerMap; + bool m_bInitialized : 1, + m_bDisposed : 1; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + URLToDispatchMap m_aListenerMap; }; } diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index 1bd2c6b1f0b0..65fb6619ec7c 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -31,21 +31,21 @@ struct ExecuteInfo; class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController { public: - GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + GenericToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolBox, sal_uInt16 nID, const OUString& aCommand ); virtual ~GenericToolboxController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void ); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 9b0afa500eea..3ba669fef55e 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -58,9 +58,9 @@ namespace svt - typedef ::cppu::WeakImplHelper3 < com::sun::star::ui::dialogs::XExecutableDialog - , com::sun::star::lang::XServiceInfo - , com::sun::star::lang::XInitialization + typedef ::cppu::WeakImplHelper3 < css::ui::dialogs::XExecutableDialog + , css::lang::XServiceInfo + , css::lang::XInitialization > OGenericUnoDialogBase; /** abstract base class for implementing UNO objects representing dialogs (com.sun.star.awt::XDialog) @@ -82,43 +82,43 @@ namespace svt bool m_bNeedInitialization : 1; /// do we need to be initialized before any other API call is allowed? // <properties> - OUString m_sTitle; /// title of the dialog - com::sun::star::uno::Reference<com::sun::star::awt::XWindow> m_xParent; /// parent window + OUString m_sTitle; /// title of the dialog + css::uno::Reference<css::awt::XWindow> m_xParent; /// parent window // </properties> - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_aContext; + css::uno::Reference<css::uno::XComponentContext> m_aContext; public: inline bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; } protected: - OGenericUnoDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); + OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); virtual ~OGenericUnoDialog(); public: // UNO DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase) - virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override = 0; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0; + 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 = 0; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; protected: /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called, @@ -141,7 +141,7 @@ namespace svt tries to extract an com.sun.star.beans::PropertyValue from the value an pass it to the com.sun.star.beans::XPropertySet interface of the object. */ - virtual void implInitialize(const com::sun::star::uno::Any& _rValue); + virtual void implInitialize(const css::uno::Any& _rValue); private: DECL_LINK_TYPED( OnDialogDying, VclWindowEvent&, void ); @@ -170,7 +170,7 @@ namespace svt :m_aGuard( _rDialog.GetMutex() ) { if ( _rDialog.needInitialization() ) - throw ::com::sun::star::lang::NotInitializedException(); + throw css::lang::NotInitializedException(); } private: diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index c3e01ddb7df6..ccb489e0ce64 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -492,7 +492,7 @@ public: // properties and return these in a vector. Note: this implementation // will cater for XNameContainer objects and deepinspect any containees // if they exist - static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< OUString >& rvEmbedImgUrls ); + static void InspectForGraphicObjectImageURL( const css::uno::Reference< css::uno::XInterface >& rxIf, std::vector< OUString >& rvEmbedImgUrls ); // create CropScaling information // fWidth, fHeight: object size diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 7474270e77b4..edbba5d95452 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -259,8 +259,7 @@ private: VCLXHeaderBar* m_pVCLXHeaderBar; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccessible; using Window::ImplInit; @@ -349,10 +348,9 @@ public: inline bool IsDragable() const { return mbDragable; } /** Creates and returns the accessible object of the header bar. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; - void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; + void SetAccessible( css::uno::Reference< css::accessibility::XAccessible > ); + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override; }; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index a8bb1f3093a0..9a84eb86519c 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -37,8 +37,8 @@ struct HtmlOptions_Impl; class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem { HtmlOptions_Impl*pImp; - static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); - void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); + static const css::uno::Sequence<OUString>& GetPropertyNames(); + void Load( const css::uno::Sequence< OUString >& rPropertyNames ); virtual void ImplCommit() override; @@ -46,7 +46,7 @@ public: SvxHtmlOptions(); virtual ~SvxHtmlOptions(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; sal_uInt16 GetFontSize(sal_uInt16 nPos) const; void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index fbfbeb0bdc42..845bc43f0380 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -48,22 +48,22 @@ namespace svt an SvStream for this image. This method works for arbitrary URLs denoting an image, since the - com::sun::star::graphics::GraphicsProvider service is used + css::graphics::GraphicsProvider service is used to resolve the URL. However, obtaining the stream is expensive (since the image must be copied), so you are strongly encouraged to only use it when you know that the image is small enough. */ SVT_DLLPUBLIC SvStream* getImageStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rImageResourceURL ); /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves - an com::sun::star::io::XInputStream for this image. + an css::io::XInputStream for this image. */ - SVT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + SVT_DLLPUBLIC css::uno::Reference< css::io::XInputStream > getImageXStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rImageResourceURL ); } diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 8433d8f02d46..9e4c4bc3ab84 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -316,8 +316,7 @@ public: // ACCESSIBILITY ========================================================== /** Creates and returns the accessible object of the Box. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; #endif // INCLUDED_SVTOOLS_IVCTRL_HXX diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 818806a52e06..dc16ac764c4f 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -34,7 +34,7 @@ namespace svt //generated class. This conflicts with other libraries if they use the same inline //class. class SVT_DLLPUBLIC JavaContext : - public com::sun::star::uno::XCurrentContext + public css::uno::XCurrentContext { public: @@ -44,35 +44,31 @@ namespace svt particular Request then the message box is shown. Afterwards nothing happens. */ - JavaContext( const com::sun::star::uno::Reference< - com::sun::star::uno::XCurrentContext> & ctx, + JavaContext( const css::uno::Reference< css::uno::XCurrentContext> & ctx, bool bReportErrorOnce = true ); virtual ~JavaContext(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) + throw (css::uno::RuntimeException, std::exception) override; private: JavaContext(JavaContext&) = delete; JavaContext& operator = (JavaContext&) = delete; - oslInterlockedCount m_aRefCount; - - com::sun::star::uno::Reference< - com::sun::star::uno::XCurrentContext > m_xNextContext; - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler> m_xHandler; - bool m_bShowErrorsOnce; + oslInterlockedCount m_aRefCount; + css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; + css::uno::Reference< css::task::XInteractionHandler> m_xHandler; + bool m_bShowErrorsOnce; }; } diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 7d598ff0e4ea..cb6cfa9bed24 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -36,24 +36,23 @@ namespace svt //class. class SVT_DLLPUBLIC JavaInteractionHandler: - public com::sun::star::task::XInteractionHandler + public css::task::XInteractionHandler { public: JavaInteractionHandler(bool bReportErrorOnce = true); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XCurrentContext - virtual void SAL_CALL handle( const com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest >& Request ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) + throw (css::uno::RuntimeException, std::exception) override; private: oslInterlockedCount m_aRefCount; diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 4b906aee5a7b..d88b6d63ae97 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno { /** DropTargetListener that takes care of opening a file when it is dropped in the frame. */ -class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDropTargetListener > +class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener > { private: /// uno service manager to create necessary services diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index a03ca8f34fc3..f9faa180c436 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -220,16 +220,14 @@ protected: private: /// parse meta options into XDocumentProperties and encoding - bool ParseMetaOptionsImpl( const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>&, + bool ParseMetaOptionsImpl( const css::uno::Reference< css::document::XDocumentProperties>&, SvKeyValueIterator*, const HTMLOptions&, rtl_TextEncoding& rEnc ); public: /// overriding method must call this implementation! - virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>&, + virtual bool ParseMetaOptions( const css::uno::Reference< css::document::XDocumentProperties>&, SvKeyValueIterator* ); bool ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang, diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 8efd1ed82dc0..b065c50eea9f 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -47,58 +47,58 @@ namespace svt struct PopupMenuControllerBaseDispatchInfo; typedef ::cppu::WeakComponentImplHelper7< - com::sun::star::lang::XServiceInfo , - com::sun::star::frame::XPopupMenuController , - com::sun::star::lang::XInitialization , - com::sun::star::frame::XStatusListener , - com::sun::star::awt::XMenuListener , - com::sun::star::frame::XDispatchProvider , - com::sun::star::frame::XDispatch > PopupMenuControllerBaseType; + css::lang::XServiceInfo , + css::frame::XPopupMenuController , + css::lang::XInitialization , + css::frame::XStatusListener , + css::awt::XMenuListener , + css::frame::XDispatchProvider , + css::frame::XDispatch > PopupMenuControllerBaseType; class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex, // Struct for right initalization of mutex member! Must be first of baseclasses. public PopupMenuControllerBaseType { public: - PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + PopupMenuControllerBase( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~PopupMenuControllerBase(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - 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 = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override = 0; + 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 = 0; // XPopupMenuController - virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0; // XMenuListener - virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; - void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); protected: - void throwIfDisposed() throw ( ::com::sun::star::uno::RuntimeException ); + void throwIfDisposed() throw ( css::uno::RuntimeException ); /** helper method to cause statusChanged is called once for the given command url */ void SAL_CALL updateCommand( const OUString& rCommandURL ); @@ -107,21 +107,21 @@ namespace svt */ virtual void SAL_CALL disposing() override; - static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + static void resetPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); static OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); - bool m_bInitialized; - OUString m_aCommandURL; - OUString m_aBaseURL; - OUString m_aModuleName; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xDispatch; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > m_xPopupMenu; + bool m_bInitialized; + OUString m_aCommandURL; + OUString m_aBaseURL; + OUString m_aModuleName; + css::uno::Reference< css::frame::XDispatch > m_xDispatch; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::awt::XPopupMenu > m_xPopupMenu; }; } diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 68f057a93d7a..73475c43c5f0 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -33,41 +33,41 @@ namespace svt { class PopupWindowControllerImpl; -class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo +class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, public css::lang::XServiceInfo { public: - PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + PopupWindowController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL ); virtual ~PopupWindowController(); virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; - 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 = 0; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override = 0; + 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 = 0; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, 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 dispose() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; private: std::unique_ptr< PopupWindowControllerImpl > mxImpl; }; diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index bede9ed58fbe..e1ca07d34479 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -39,8 +39,7 @@ enum RestartReason { // Must be called with the solar mutex locked: SVT_DLLPUBLIC void executeRestartDialog( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context, + css::uno::Reference< css::uno::XComponentContext > const & context, vcl::Window * parent, RestartReason reason); } diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 1c606f8ce400..a5d38f05bbb9 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -796,7 +796,7 @@ public: void DrawTicks(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; #endif // INCLUDED_SVTOOLS_RULER_HXX diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index af3b82634e12..5ddb37bd8daf 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -75,7 +75,7 @@ public: The break iterator for iterating through the script portions. */ void SetText( const OUString& _rText, - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); + const css::uno::Reference< css::i18n::XBreakIterator >& _xBreakIter ); /** Returns a size struct containing the width and height of the text in the current output device. @return A size struct with the text dimensions. */ diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index db58d6867cd1..2ae4481f0899 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -38,67 +38,67 @@ namespace svt { class SVT_DLLPUBLIC StatusbarController : - public ::com::sun::star::frame::XStatusbarController, + public css::frame::XStatusbarController, public ::comphelper::OBaseMutex, public ::cppu::OWeakObject { public: - StatusbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + StatusbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL, unsigned short nID ); StatusbarController(); virtual ~StatusbarController(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; + css::uno::Reference< css::frame::XFrame > getFrameInterface() const; + css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const; ::Rectangle getControlRect() const; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() 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; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusbarController - virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL command( const css::awt::Point& aPos, ::sal_Int32 nCommand, sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics, + const css::awt::Rectangle& rOutputRectangle, + ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override; protected: struct Listener { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + css::util::URL aURL; + css::uno::Reference< css::frame::XDispatch > xDispatch; }; typedef std::unordered_map< OUString, @@ -112,20 +112,20 @@ class SVT_DLLPUBLIC StatusbarController : // execute methods // execute bound status bar controller command/execute various commands - void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - void execute( const OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - - bool m_bInitialized : 1, - m_bDisposed : 1; - unsigned short m_nID; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - OUString m_aCommandURL; - URLToDispatchMap m_aListenerMap; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XStatusbarItem > m_xStatusbarItem; + void execute( const css::uno::Sequence< css::beans::PropertyValue >& aArgs ); + void execute( const OUString& aCommand, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ); + + bool m_bInitialized : 1, + m_bDisposed : 1; + unsigned short m_nID; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::awt::XWindow > m_xParentWindow; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + OUString m_aCommandURL; + URLToDispatchMap m_aListenerMap; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + mutable css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::ui::XStatusbarItem > m_xStatusbarItem; }; } diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 07f6510f50f3..3b86f8fbc9fd 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -32,8 +32,7 @@ class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit public: MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(bool bCreate = true) override; + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) override; }; diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 94265a8ed02e..a134575cba56 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -225,7 +225,7 @@ namespace svt { namespace table /** retrieves the horizontal alignment to be used for content in this cell */ - virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() = 0; + virtual css::style::HorizontalAlignment getHorizontalAlign() = 0; /// deletes the column model instance virtual ~IColumnModel() { } @@ -336,7 +336,7 @@ namespace svt { namespace table /** retrieves the content of the given cell */ - virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) = 0; + virtual void getCellContent( ColPos const i_col, RowPos const i_row, css::uno::Any& o_cellContent ) = 0; /** returns an object which should be displayed as tooltip for the given cell @@ -353,11 +353,11 @@ namespace svt { namespace table @param o_cellToolTip takes the tooltip object upon return. */ - virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any & o_cellToolTip ) = 0; + virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, css::uno::Any & o_cellToolTip ) = 0; /** retrieves title of a given row */ - virtual ::com::sun::star::uno::Any getRowHeading( RowPos const i_rowPos ) const = 0; + virtual css::uno::Any getRowHeading( RowPos const i_rowPos ) const = 0; /** returns the color to be used for rendering the grid lines. @@ -429,7 +429,7 @@ namespace svt { namespace table /** determines the vertical alignment of content within a cell */ - virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const = 0; + virtual css::style::VerticalAlignment getVerticalAlign() const = 0; /** returns an adapter to the sorting functionality of the model diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index f34e386d82d6..f11729347c7c 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -232,7 +232,7 @@ namespace svt { namespace table given area. */ virtual bool FitsIntoCell( - ::com::sun::star::uno::Any const & i_cellContent, + css::uno::Any const & i_cellContent, OutputDevice& i_targetDevice, Rectangle const & i_targetArea ) const = 0; @@ -246,7 +246,7 @@ namespace svt { namespace table <TRUE/> if and only if the content could be formatted as string */ virtual bool GetFormattedCellString( - ::com::sun::star::uno::Any const & i_cellValue, + css::uno::Any const & i_cellValue, OUString & o_cellString ) const = 0; diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 9b3ac7a709c8..d749ca40727c 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -61,55 +61,55 @@ class SVT_DLLPUBLIC ToolboxController : private: bool m_bSupportVisible; public: - ToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + ToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL ); ToolboxController(); virtual ~ToolboxController(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; + css::uno::Reference< css::frame::XFrame > getFrameInterface() const; + const css::uno::Reference< css::uno::XComponentContext >& getContext() const; + css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() const; void updateStatus( const OUString& aCommandURL ); void updateStatus(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() 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; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) 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 css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -118,7 +118,7 @@ class SVT_DLLPUBLIC ToolboxController : const OUString& getCommandURL() const { return m_aCommandURL; } const OUString& getModuleName() const { return m_sModuleName; } - void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs, const OUString &rTarget = OUString() ); + void dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs, const OUString &rTarget = OUString() ); void enable( bool bEnable ); @@ -127,22 +127,22 @@ class SVT_DLLPUBLIC ToolboxController : void setSupportVisibleProperty(bool bValue); struct Listener { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + css::util::URL aURL; + css::uno::Reference< css::frame::XDispatch > xDispatch; }; struct DispatchInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > mxDispatch; - const ::com::sun::star::util::URL maURL; - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maArgs; + css::uno::Reference< css::frame::XDispatch > mxDispatch; + const css::util::URL maURL; + const css::uno::Sequence< css::beans::PropertyValue > maArgs; - DispatchInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch, - const ::com::sun::star::util::URL& rURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) + DispatchInfo( const css::uno::Reference< css::frame::XDispatch >& xDispatch, + const css::util::URL& rURL, + const css::uno::Sequence< css::beans::PropertyValue >& rArgs ) : mxDispatch( xDispatch ) , maURL( rURL ) , maArgs( rArgs ) @@ -163,22 +163,22 @@ class SVT_DLLPUBLIC ToolboxController : void unbindListener(); bool isBound() const; // TODO remove - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;} + css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;} // TODO remove - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const { return m_xParentWindow;} - - bool m_bInitialized : 1, - m_bDisposed : 1; - sal_uInt16 m_nToolBoxId; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - OUString m_aCommandURL; - URLToDispatchMap m_aListenerMap; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; - OUString m_sModuleName; + css::uno::Reference< css::awt::XWindow > getParent() const { return m_xParentWindow;} + + bool m_bInitialized : 1, + m_bDisposed : 1; + sal_uInt16 m_nToolBoxId; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + OUString m_aCommandURL; + URLToDispatchMap m_aListenerMap; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + + css::uno::Reference< css::awt::XWindow > m_xParentWindow; + css::uno::Reference< css::util::XURLTransformer > m_xUrlTransformer; + OUString m_sModuleName; }; } diff --git a/include/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx index 37b2a828d0a2..04de02cee180 100644 --- a/include/svtools/toolpanel/decklayouter.hxx +++ b/include/svtools/toolpanel/decklayouter.hxx @@ -78,10 +78,10 @@ namespace svt /** retrieves the XAccessible implementation for the <code>i_nChildIndex</code>'th child in the XAccessible hierarchy. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible ) = 0; virtual ~IDeckLayouter() diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index ccca954efacc..0e123be0b499 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -51,10 +51,10 @@ namespace svt virtual void Destroy() override; virtual void SetFocusToPanelSelector() override; virtual size_t GetAccessibleChildCount() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible ) override; // IToolPanelDeckListener diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 787058a929ff..84f8a0cce95d 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -81,7 +81,7 @@ namespace svt virtual void KeyInput( const KeyEvent& i_rKeyEvent ) override; virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool i_bCreate ) override; private: diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index 826029e48cc6..79271a8e94cb 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -76,10 +76,10 @@ namespace svt virtual void Destroy() override; virtual void SetFocusToPanelSelector() override; virtual size_t GetAccessibleChildCount() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible ) override; private: diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index fafeb3981e11..a6ae92a4fb00 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -100,9 +100,9 @@ namespace svt Implementations are allowed to create a new instance each time this method is called, the caller is responsible for caching the XAccessible implementation, if this is desired. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreatePanelAccessible( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + const css::uno::Reference< css::accessibility::XAccessible >& i_rParentAccessible ) = 0; virtual ~IToolPanel() diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index b3e6cdd5c25d..fb1e9de24ab1 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -169,7 +169,7 @@ namespace svt virtual bool Notify( NotifyEvent& i_rNotifyEvent ) override; virtual void GetFocus() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool i_bCreate ) override; private: diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 6b308150e644..b256366ae7a0 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -55,11 +55,11 @@ namespace vcl { class Window; } // Drag&Drop defines -#define DND_ACTION_NONE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE -#define DND_ACTION_COPY ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY -#define DND_ACTION_MOVE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE -#define DND_ACTION_COPYMOVE ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE -#define DND_ACTION_LINK ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK +#define DND_ACTION_NONE css::datatransfer::dnd::DNDConstants::ACTION_NONE +#define DND_ACTION_COPY css::datatransfer::dnd::DNDConstants::ACTION_COPY +#define DND_ACTION_MOVE css::datatransfer::dnd::DNDConstants::ACTION_MOVE +#define DND_ACTION_COPYMOVE css::datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE +#define DND_ACTION_LINK css::datatransfer::dnd::DNDConstants::ACTION_LINK #define DND_POINTER_NONE 0 #define DND_IMAGE_NONE 0 @@ -76,7 +76,7 @@ struct TransferableObjectDescriptor bool mbCanLink; TransferableObjectDescriptor() - : mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT) + : mnViewAspect(css::embed::Aspects::MSOLE_CONTENT) , mnOle2Misc(0) , mbCanLink(false) {} @@ -88,7 +88,7 @@ struct AcceptDropEvent { sal_Int8 mnAction; Point maPosPixel; - const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent maDragEvent; + const css::datatransfer::dnd::DropTargetDragEvent maDragEvent; bool mbLeaving; bool mbDefault; @@ -99,7 +99,7 @@ struct AcceptDropEvent AcceptDropEvent( sal_Int8 nAction, const Point& rPosPixel, - const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDragEvent, + const css::datatransfer::dnd::DropTargetDragEvent& rDragEvent, bool bLeaving = false ) : mnAction( nAction ), maPosPixel( rPosPixel ), @@ -112,7 +112,7 @@ struct ExecuteDropEvent { sal_Int8 mnAction; Point maPosPixel; - const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent maDropEvent; + const css::datatransfer::dnd::DropTargetDropEvent maDropEvent; bool mbDefault; ExecuteDropEvent() : @@ -121,22 +121,22 @@ struct ExecuteDropEvent ExecuteDropEvent( sal_Int8 nAction, const Point& rPosPixel, - const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) : + const css::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) : mnAction( nAction ), maPosPixel( rPosPixel ), maDropEvent( rDropEvent ), mbDefault( false ) {} }; -class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::XTransferable2, - ::com::sun::star::datatransfer::clipboard::XClipboardOwner, - ::com::sun::star::datatransfer::dnd::XDragSourceListener, - ::com::sun::star::lang::XUnoTunnel > +class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< css::datatransfer::XTransferable2, + css::datatransfer::clipboard::XClipboardOwner, + css::datatransfer::dnd::XDragSourceListener, + css::lang::XUnoTunnel > { private: // nested class to implement the XTerminateListener interface - class TerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener > + class TerminateListener : public ::cppu::WeakImplHelper1< css::frame::XTerminateListener > { private: @@ -145,11 +145,11 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; public: @@ -161,23 +161,23 @@ private: private: - ::com::sun::star::uno::Any maAny; - OUString maLastFormat; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener > mxTerminateListener; - DataFlavorExVector* mpFormats; - TransferableObjectDescriptor* mpObjDesc; + css::uno::Any maAny; + OUString maLastFormat; + mutable css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; + css::uno::Reference< css::frame::XTerminateListener > mxTerminateListener; + DataFlavorExVector* mpFormats; + TransferableObjectDescriptor* mpObjDesc; protected: - inline const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& + inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& getOwnClipboard() const { return mxClipboard; } private: // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override; // Transferable2 virtual css::uno::Any SAL_CALL getTransferData2( @@ -185,27 +185,27 @@ private: throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XDragSourceListener - virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override; private: // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override; protected: // derivees need to access lostOwnership in case hey override it // on windows, changing the access rights to a method gives unresolved externals, so we introduce // this impl-method here 'til the next incompatible update inline void implCallOwnLostOwnership( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& _rxClipboard, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxTrans + const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, + const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) { TransferableHelper::lostOwnership( _rxClipboard, _rxTrans ); @@ -221,28 +221,28 @@ protected: virtual ~TransferableHelper(); void AddFormat( SotClipboardFormatId nFormat ); - void AddFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + void AddFormat( const css::datatransfer::DataFlavor& rFlavor ); void RemoveFormat( SotClipboardFormatId nFormat ); - void RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + void RemoveFormat( const css::datatransfer::DataFlavor& rFlavor ); bool HasFormat( SotClipboardFormatId nFormat ); void ClearFormats(); - bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetAny( const css::uno::Any& rAny, const css::datatransfer::DataFlavor& rFlavor ); + bool SetString( const OUString& rString, const css::datatransfer::DataFlavor& rFlavor ); + bool SetBitmapEx( const BitmapEx& rBitmap, const css::datatransfer::DataFlavor& rFlavor ); + bool SetGDIMetaFile( const GDIMetaFile& rMtf, const css::datatransfer::DataFlavor& rFlavor ); + bool SetGraphic( const Graphic& rGraphic, const css::datatransfer::DataFlavor& rFlavor ); + bool SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& rFlavor ); + bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& rFlavor ); + bool SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ); + bool SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ); + bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); protected: virtual void AddSupportedFormats() = 0; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) = 0; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); @@ -260,12 +260,12 @@ public: static void ClearSelection( vcl::Window *pWindow ); - static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard(); - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetSystemClipboard(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); public: - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; }; struct TransferableDataHelper_Impl; @@ -276,44 +276,44 @@ class SVT_DLLPUBLIC TransferableDataHelper private: - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > mxTransfer; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; - DataFlavorExVector* mpFormats; - TransferableObjectDescriptor* mpObjDesc; - TransferableDataHelper_Impl* mpImpl; + css::uno::Reference< css::datatransfer::XTransferable > mxTransfer; + css::uno::Reference< css::datatransfer::clipboard::XClipboard > mxClipboard; + DataFlavorExVector* mpFormats; + TransferableObjectDescriptor* mpObjDesc; + TransferableDataHelper_Impl* mpImpl; protected: void InitFormats(); public: - static void FillDataFlavorExVector( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rDataFlavorSeq, + static void FillDataFlavorExVector( const css::uno::Sequence< css::datatransfer::DataFlavor >& rDataFlavorSeq, DataFlavorExVector& rDataFlavorExVector ); TransferableDataHelper(); TransferableDataHelper( const TransferableDataHelper& rDataHelper ); - TransferableDataHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + TransferableDataHelper( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ); ~TransferableDataHelper(); TransferableDataHelper& operator=( const TransferableDataHelper& rDataHelper ); - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& GetTransferable() const { return mxTransfer; } - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetXTransferable() const; + const css::uno::Reference< css::datatransfer::XTransferable >& GetTransferable() const { return mxTransfer; } + css::uno::Reference< css::datatransfer::XTransferable > GetXTransferable() const; bool HasFormat( SotClipboardFormatId nFormat ) const; - bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const; + bool HasFormat( const css::datatransfer::DataFlavor& rFlavor ) const; sal_uInt32 GetFormatCount() const; - SotClipboardFormatId GetFormat( sal_uInt32 nFormat ) const; - ::com::sun::star::datatransfer::DataFlavor GetFormatDataFlavor( sal_uInt32 nFormat ) const; + SotClipboardFormatId GetFormat( sal_uInt32 nFormat ) const; + css::datatransfer::DataFlavor GetFormatDataFlavor( sal_uInt32 nFormat ) const; DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } bool StartClipboardListening( ); void StopClipboardListening( ); - void Rebind( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxNewData ); + void Rebind( const css::uno::Reference< css::datatransfer::XTransferable >& _rxNewData ); public: @@ -321,10 +321,10 @@ public: css::uno::Any GetAny( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) const; bool GetString( SotClipboardFormatId nFormat, OUString& rStr ); - bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr ); + bool GetString( const css::datatransfer::DataFlavor& rFlavor, OUString& rStr ); bool GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmp ); - bool GetBitmapEx( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ); + bool GetBitmapEx( const css::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ); /** Return as GDI metafile. @@ -335,31 +335,31 @@ public: any reasonable handling - and you need to set a limit. */ bool GetGDIMetaFile( SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 ); - bool GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ); + bool GetGDIMetaFile( const css::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ); bool GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ); - bool GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ); + bool GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ); bool GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ); - bool GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); + bool GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); bool GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ); - bool GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc ); + bool GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc ); bool GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ); - bool GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); + bool GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); bool GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ); - bool GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); + bool GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); bool GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ); - bool GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList ); + bool GetFileList( const css::datatransfer::DataFlavor& rFlavor, FileList& rFileList ); css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); bool GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rStreamRef ); - bool GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rStreamRef ); + bool GetSotStorageStream( const css::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rStreamRef ); css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); @@ -368,8 +368,8 @@ public: static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); static TransferableDataHelper CreateFromSelection( vcl::Window * pWindow ); - static bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, - const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, + static bool IsEqual( const css::datatransfer::DataFlavor& rInternalFlavor, + const css::datatransfer::DataFlavor& rRequestFlavor, bool bCompareParameters = false ); }; @@ -378,7 +378,7 @@ class SVT_DLLPUBLIC DragSourceHelper private: // nested class to implement the XDragGestureListener interface - class DragGestureListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDragGestureListener > + class DragGestureListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDragGestureListener > { private: @@ -387,10 +387,10 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XDragGestureListener - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw( css::uno::RuntimeException, std::exception ) override; public: @@ -402,8 +402,8 @@ private: private: - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener > mxDragGestureListener; + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer; + css::uno::Reference< css::datatransfer::dnd::XDragGestureListener > mxDragGestureListener; DragSourceHelper& operator=( const DragSourceHelper& rDragSourceHelper ) = delete; bool operator==( const DragSourceHelper& rDragSourceHelper ) const = delete; @@ -422,7 +422,7 @@ class SVT_DLLPUBLIC DropTargetHelper private: // nested class to implement the XDropTargetListener interface - class DropTargetListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::dnd::XDropTargetListener > + class DropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener > { private: @@ -432,14 +432,14 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XDropTargetListener - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; public: @@ -451,9 +451,9 @@ private: private: - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; - DataFlavorExVector* mpFormats; + css::uno::Reference< css::datatransfer::dnd::XDropTarget > mxDropTarget; + css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > mxDropTargetListener; + DataFlavorExVector* mpFormats; DropTargetHelper() = delete; DropTargetHelper& operator=( const DropTargetHelper& rDropTargetHelper ) = delete; @@ -462,7 +462,7 @@ private: void ImplConstruct(); // called by our own implementation of XDropTargetListener (DropTargetListener instance) - void ImplBeginDrag( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& rSupportedDataFlavors ); + void ImplBeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors ); void ImplEndDrag(); public: @@ -472,7 +472,7 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DropTargetHelper( vcl::Window* pWindow ); - DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget ); + DropTargetHelper( const css::uno::Reference< css::datatransfer::dnd::XDropTarget >& rxDropTarget ); virtual ~DropTargetHelper(); @@ -492,7 +492,7 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper protected: virtual void AddSupportedFormats() override; - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual void DragFinished( sal_Int8 nDropAction ) override; public: @@ -506,7 +506,7 @@ public: void CopyGraphic( const Graphic& rGrf ); void CopyString( const OUString& rStr ); void CopyString( SotClipboardFormatId nFmt, const OUString& rStr ); - void CopyAny( SotClipboardFormatId nFmt, const ::com::sun::star::uno::Any& rAny ); + void CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny ); void CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ); void CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 13707db265d1..086589183467 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -530,8 +530,7 @@ public: // ACCESSIBILITY ========================================================== /** Creates and returns the accessible object of the Box. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; /** Fills the StateSet of one entry. */ void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 92b669fe4dee..36337f4c6857 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -56,8 +56,8 @@ struct SvEventDescription */ class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 < - ::com::sun::star::container::XNameReplace, - ::com::sun::star::lang::XServiceInfo + css::container::XNameReplace, + css::lang::XServiceInfo > { const OUString sEventType; @@ -88,53 +88,53 @@ public: /// calls replaceByName(const sal_uInt16, const SvxMacro&) virtual void SAL_CALL replaceByName( const OUString& rName, /// API name of event - const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) + const css::uno::Any& rElement ) /// event (PropertyValues) throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( + virtual css::uno::Any SAL_CALL getByName( const OUString& rName ) /// API name of event throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAxcess (via XNameReplace) - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess (via XNameReplace) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo /// must be implemented in subclass virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; protected: @@ -143,19 +143,19 @@ protected: const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) = 0; /// Must be implemented in subclass. virtual void getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) = 0; /// convert an API event name to the event ID as used by SvxMacroItem sal_uInt16 mapNameToEventID(const OUString& rName) const; @@ -165,15 +165,15 @@ protected: /// create PropertyValues and Any from macro void getAnyFromMacro( - ::com::sun::star::uno::Any& aAny, // Any to be filled by Macro values + css::uno::Any& aAny, // Any to be filled by Macro values const SvxMacro& rMacro); /// create macro from PropertyValues (in an Any) void getMacroFromAny( SvxMacro& aMacro, // reference to be filled by Any - const ::com::sun::star::uno::Any& rAny) + const css::uno::Any& rAny) throw ( - ::com::sun::star::lang::IllegalArgumentException); + css::lang::IllegalArgumentException); }; @@ -196,12 +196,11 @@ protected: class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor { /// keep reference to parent to prevent it from being destroyed - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > xParentRef; + css::uno::Reference< css::uno::XInterface > xParentRef; public: - SvEventDescriptor(::com::sun::star::uno::XInterface& rParent, + SvEventDescriptor(css::uno::XInterface& rParent, const SvEventDescription* pSupportedMacroItems); virtual ~SvEventDescriptor(); @@ -215,19 +214,19 @@ protected: const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) override; + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) override; using SvBaseEventDescriptor::getByName; virtual void getByName( SvxMacro& rMacros, /// macro to be filled with values const sal_uInt16 nEvent ) /// item ID of event throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) override; + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) override; /// Get the SvxMacroItem from the parent. @@ -262,7 +261,7 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; protected: @@ -273,19 +272,19 @@ protected: const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) override; + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) override; using SvBaseEventDescriptor::getByName; virtual void getByName( SvxMacro& rMacro, /// macro to be filled const sal_uInt16 nEvent ) /// item ID of event throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) override; + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) override; /// do we have an event? /// return true: we have a macro for the event @@ -294,7 +293,7 @@ protected: bool hasById( const sal_uInt16 nEvent ) const /// item ID of event throw( - ::com::sun::star::lang::IllegalArgumentException); + css::lang::IllegalArgumentException); }; diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx index a369ca8a8a97..46613ad05bc6 100644 --- a/include/svtools/unoimap.hxx +++ b/include/svtools/unoimap.hxx @@ -26,13 +26,13 @@ class ImageMap; struct SvEventDescription; -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( css::uno::Reference< css::uno::XInterface > xImageMap, ImageMap& rMap ); #endif diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 58b508fa37c6..c3a6f7612797 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -267,7 +267,7 @@ private: SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SVT_DLLPRIVATE void ImplInsertItem( ValueSetItem *const pItem, const size_t nPos ); SVT_DLLPRIVATE Rectangle ImplGetItemRect( size_t nPos ) const; - SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ); + SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); SVT_DLLPRIVATE bool ImplHasAccessibleListeners(); SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel ); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 22243f3692c1..90bbe7a96bc1 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -33,7 +33,7 @@ namespace vcl { class Window; } class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWin; + css::uno::Reference< css::awt::XWindow > m_xWin; XWindowItem & operator = ( const XWindowItem & ) = delete; diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 86210f5179a6..43e63d04149f 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -41,10 +41,10 @@ namespace comphelper class SdrObject; namespace accessibility { - typedef ::cppu::ImplHelper4 < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::util::XModeChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::accessibility::XAccessibleEventListener + typedef ::cppu::ImplHelper4 < css::beans::XPropertyChangeListener + , css::util::XModeChangeListener + , css::container::XContainerListener + , css::accessibility::XAccessibleEventListener > AccessibleControlShape_Base; /** @descr */ @@ -59,23 +59,23 @@ public: const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleControlShape( ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL GetControlModel( ) { return m_xControlModel;} ; + css::uno::Reference< css::beans::XPropertySet > SAL_CALL GetControlModel( ) { return m_xControlModel;} ; AccessibleControlShape* SAL_CALL GetLabeledByControlShape(); protected: //--- XAccessible ---------------------------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override; //--- XAccessibleComponent ------------------------------- /// forward the focus to the contained control(in alive mode) - virtual void SAL_CALL grabFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) throw(css::uno::RuntimeException, std::exception) override; //--- XAccessibleContext --------------------------------- - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; //--- XServiceInfo --------------------------------------- - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; //--- XInterface ----------------------------------------- DECLARE_XINTERFACE( ) @@ -84,27 +84,27 @@ protected: DECLARE_XTYPEPROVIDER( ) //--- XPropertyChangeListener ---------------------------- - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; //--- XComponent ----------------------------------------- virtual void SAL_CALL disposing( ) override; //--- XEventListener ------------------------------------- - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; //--- XModeChangeListener -------------------------------- - virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modeChanged( const css::util::ModeChangeEvent& _rSource ) throw(css::uno::RuntimeException, std::exception) override; //--- XAccessibleEventListener ---------------------------- - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; //--- document::XEventListener ---------------------------- using AccessibleShape::notifyEvent; // XVclContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; protected: /** Initialize a new shape. See the documentation of the base' constructor @@ -115,19 +115,19 @@ protected: /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName( ) - throw(::com::sun::star::uno::RuntimeException) override; + throw(css::uno::RuntimeException) override; /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ virtual OUString CreateAccessibleName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; #ifdef DBG_UTIL /// Set the specified state @@ -167,20 +167,20 @@ protected: void initializeComposedState( ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xModelPropsMeta; // cache this for performance reasons - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > + css::uno::Reference< css::awt::XControl > m_xUnoControl; // our UNO control - ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::WeakReference< css::accessibility::XAccessibleContext > m_aControlContext; // the AccessibleContext of the control - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > + css::uno::Reference< css::uno::XAggregation > m_xControlContextProxy; // the proxy for "aggregating" the AccessibleContext of the control - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > + css::uno::Reference< css::lang::XTypeProvider > m_xControlContextTypeAccess; // cached interface of our aggregate - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > m_xControlContextComponent; // cached interface of our aggregate ::comphelper::OWrappedAccessibleChildrenManager* diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index c9b61de189b7..04271c7476db 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -33,7 +33,7 @@ namespace accessibility { */ class SVX_DLLPUBLIC AccessibleGraphicShape : public AccessibleShape, - public ::com::sun::star::accessibility::XAccessibleImage + public css::accessibility::XAccessibleImage { public: //===== internal ======================================================== @@ -46,19 +46,19 @@ public: //===== XAccessibleImage ================================================ OUString SAL_CALL getAccessibleImageDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL getAccessibleImageHeight() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL getAccessibleImageWidth() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XInterface ====================================================== - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -74,29 +74,29 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; protected: /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: AccessibleGraphicShape (const AccessibleGraphicShape&) = delete; diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 5e848ba71902..55fa150cfc91 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -34,7 +34,7 @@ namespace accessibility { */ class SVX_DLLPUBLIC AccessibleOLEShape : public AccessibleShape, - public ::com::sun::star::accessibility::XAccessibleAction + public css::accessibility::XAccessibleAction { public: //===== internal ======================================================== @@ -46,27 +46,27 @@ public: //===== XAccessibleAction =============================================== sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding> SAL_CALL getAccessibleActionKeyBinding ( + css::uno::Reference< + css::accessibility::XAccessibleKeyBinding> SAL_CALL getAccessibleActionKeyBinding ( sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; //===== XInterface ====================================================== - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -80,29 +80,29 @@ public: virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // ====== XAccessibleExtendedAttributes ===================================== - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; protected: /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: AccessibleOLEShape (const AccessibleOLEShape&) = delete; diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index a62d7a0784f8..822be7eda382 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -76,13 +76,13 @@ class IAccessibleParent; class SVX_DLLPUBLIC AccessibleShape : public AccessibleContextBase, public AccessibleComponentBase, - public ::com::sun::star::accessibility::XAccessibleSelection, - public ::com::sun::star::accessibility::XAccessibleExtendedAttributes, - public ::com::sun::star::accessibility::XAccessibleGroupPosition, - public com::sun::star::accessibility::XAccessibleHypertext, + public css::accessibility::XAccessibleSelection, + public css::accessibility::XAccessibleExtendedAttributes, + public css::accessibility::XAccessibleGroupPosition, + public css::accessibility::XAccessibleHypertext, public IAccessibleViewForwarderListener, - public ::com::sun::star::document::XEventListener, - public ::com::sun::star::lang::XUnoTunnel + public css::document::XEventListener, + public css::lang::XUnoTunnel { public: //===== internal ======================================================== @@ -106,51 +106,51 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); //Solution: Overwrite the object's current name. - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; // ====== XAccessibleExtendedAttributes ===================================== - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleGroupPosition ========================================= - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL - getGroupPosition( const ::com::sun::star::uno::Any& rAny ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL + getGroupPosition( const css::uno::Any& rAny ) + throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) + throw (css::uno::RuntimeException, std::exception) override; /** The destructor releases its children manager and text engine if still existent. These are responsible to send appropriate events. */ @@ -216,7 +216,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return the specified child. @param nIndex @@ -227,47 +227,47 @@ public: @raises IndexOutOfBoundsException Throws an exception if the index is not valid. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; /// Return the set of current states. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint (const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleEventBroadcaster ===================================== @@ -279,9 +279,9 @@ public: */ virtual void SAL_CALL addAccessibleEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::accessibility::XAccessibleEventListener >& rxListener) + throw (css::uno::RuntimeException, std::exception) override; /** This call is forwarded to a) the base class and b) to the accessible edit engine if it is present. @@ -292,16 +292,16 @@ public: */ virtual void SAL_CALL removeAccessibleEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::accessibility::XAccessibleEventListener >& rxListener) + throw (css::uno::RuntimeException, std::exception) override; //===== XInterface ====================================================== - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -318,17 +318,17 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, @@ -340,51 +340,51 @@ public: remains functional when this happens. */ virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& Source) + throw (css::uno::RuntimeException, std::exception) override; //===== document::XEventListener ======================================== virtual void SAL_CALL - notifyEvent (const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + notifyEvent (const css::document::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== XUnoTunnel ======================================================== - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); - static AccessibleShape* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); + static AccessibleShape* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //===== XAccessibleHypertext ======================================================== - virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > + virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; //===== XAccesibleText ================================================== - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; //===== Misc ======================================================== - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetXShape() { return mxShape; } /** set the index _nIndex at the accessible shape @@ -398,8 +398,8 @@ protected: ChildrenManager* mpChildrenManager; /// Reference to the actual shape. - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> mxShape; + css::uno::Reference< + css::drawing::XShape> mxShape; /** Bundle of information passed to all shapes in a document tree. */ @@ -435,25 +435,25 @@ protected: */ virtual OUString CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ virtual OUString CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; OUString GetFullAccessibleName(AccessibleShape *shape) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); virtual OUString GetStyle(); - void UpdateDocumentAllSelState(::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet); + void UpdateDocumentAllSelState(css::uno::Reference< + css::accessibility::XAccessibleStateSet > &xStateSet); /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state. */ void UpdateStates(); diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx index 1d99e9289d38..a9ed3174bdf3 100644 --- a/include/svx/AccessibleShapeInfo.hxx +++ b/include/svx/AccessibleShapeInfo.hxx @@ -45,13 +45,13 @@ public: /** The shape itself for which an accessible object is to be constructed. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> mxShape; + css::uno::Reference< + css::drawing::XShape> mxShape; /** The accessible parent object of the shape. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference< + css::accessibility::XAccessible> mxParent; /** This object that may be realized by the same implementation as that of that of <member>mxParent</member> can be used to modify @@ -70,10 +70,10 @@ public: /** Copy the given values into the members described above. */ AccessibleShapeInfo ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< + css::drawing::XShape>& rxShape, + const css::uno::Reference< + css::accessibility::XAccessible>& rxParent, IAccessibleParent* pChildrenManager, sal_Int32 nIndex = -1); @@ -81,10 +81,10 @@ public: The accessible parent implementation object is set to NULL. */ AccessibleShapeInfo ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< + css::drawing::XShape>& rxShape, + const css::uno::Reference< + css::accessibility::XAccessible>& rxParent, sal_Int32 nIndex = -1); ~AccessibleShapeInfo(); diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index aca3221ffc52..52a121001572 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -68,13 +68,13 @@ public: /** Deprecated. Don't use this method. */ - void SetDocumentWindow (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleComponent>& rxViewWindow); + void SetDocumentWindow (const css::uno::Reference< + css::accessibility::XAccessibleComponent>& rxViewWindow); /** Deprecated. Don't use this method. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleComponent> + css::uno::Reference< + css::accessibility::XAccessibleComponent> GetDocumentWindow() const { return mxDocumentWindow;} /** Set a new broadcaster that sends events indicating shape changes. @@ -83,16 +83,16 @@ public: The new broadcaster. It replaces the current one. An empty reference may be passed to unset the broadcaster */ - void SetModelBroadcaster (const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventBroadcaster>& rxModelBroadcaster); + void SetModelBroadcaster (const css::uno::Reference< + css::document::XEventBroadcaster>& rxModelBroadcaster); /** Return the current model broadcaster. @return The returned reference may be empty if the broadcaster has not been set or has been set to an empty reference. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventBroadcaster> + css::uno::Reference< + css::document::XEventBroadcaster> GetModelBroadcaster() const { return mxModelBroadcaster;} /** Set the view that will be used to construct SvxTextEditSources which @@ -115,15 +115,15 @@ public: The new controller that replaces the current one. An empty reference may be passed to unset the controller. */ - void SetController (const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController>& rxController); + void SetController (const css::uno::Reference< + css::frame::XController>& rxController); /** Return the currently set controller. @return The reference to the currently set controller may be empty. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController> + css::uno::Reference< + css::frame::XController> GetController() const { return mxController;} /** Set the window that is used to construct SvxTextEditSources which in @@ -153,16 +153,16 @@ public: private: /** Deprecated. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleComponent> mxDocumentWindow; + css::uno::Reference< + css::accessibility::XAccessibleComponent> mxDocumentWindow; /** this broadcaster sends events indicating shape changes. The broadcaster usually is or belongs to a document model. This once was named mxControllerBroadcaster. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventBroadcaster> mxModelBroadcaster; + css::uno::Reference< + css::document::XEventBroadcaster> mxModelBroadcaster; /** This view is necessary to construct an SvxTextEditSource which in turn is used to create an accessible edit engine. @@ -171,8 +171,8 @@ private: /** The controller is used e.g. for obtaining the selected shapes. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController> mxController; + css::uno::Reference< + css::frame::XController> mxController; /** This window is necessary to construct an SvxTextEditSource which in turn is used to create an accessible edit engine. diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 6178aaeffd45..b28ee493fbcf 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -203,7 +203,7 @@ namespace accessibility The interface that should be set as the source for accessibility events sent by this object. */ - void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); + void SetEventSource( const css::uno::Reference< css::accessibility::XAccessible >& rInterface ); /** Set offset of EditEngine/Outliner from parent @@ -250,7 +250,7 @@ namespace accessibility The states are passed to every created child object (text paragraph). The state values are defined in - com::sun::star::accessibility::AccessibleStateType. + css::accessibility::AccessibleStateType. This function has to be called before querying for any children (e.g. with GetChild()). @@ -333,7 +333,7 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i ); + css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int32 i ); // XAccessibleEventBroadcaster child related methods @@ -341,12 +341,12 @@ namespace accessibility @attention Don't call with locked mutexes */ - void AddEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); + void AddEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ); /** Implements removeEventListener @attention Don't call with locked mutexes */ - void RemoveEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ); + void RemoveEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ); // XAccessibleComponent child related methods @@ -355,7 +355,7 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL GetAt( const ::com::sun::star::awt::Point& aPoint ); + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL GetAt( const css::awt::Point& aPoint ); private: diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 7e292c3aa327..825176b78f18 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -26,11 +26,11 @@ class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem { private: - com::sun::star::geometry::AffineMatrix2D maMatrix; + css::geometry::AffineMatrix2D maMatrix; public: TYPEINFO_OVERRIDE(); - AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix = 0); + AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = 0); AffineMatrixItem(SvStream& rIn); AffineMatrixItem(const AffineMatrixItem&); virtual ~AffineMatrixItem(); @@ -40,8 +40,8 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; #endif // INCLUDED_SVX_AFFINEMATRIXITEM_HXX diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index f025dcf89abc..bb0b88f6c9d2 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -88,10 +88,10 @@ public: for new and deleted children, i.e. that holds a list of listeners to be informed. */ - ChildrenManager (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& rxShapeList, + ChildrenManager (const css::uno::Reference< + css::accessibility::XAccessible>& rxParent, + const css::uno::Reference< + css::drawing::XShapes>& rxShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext); @@ -119,15 +119,15 @@ public: @raises Throws an IndexOutOfBoundsException if the index is not valid. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + css::uno::Reference< + css::accessibility::XAccessible> GetChild (long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetChild (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape (long nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException); + css::uno::Reference< css::accessibility::XAccessible> GetChild (const css::uno::Reference< css::drawing::XShape>& xShape) throw (css::uno::RuntimeException); + css::uno::Reference< css::drawing::XShape> GetChildShape (long nIndex) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update @@ -146,8 +146,8 @@ public: @param xShapeList The new list of shapes. */ - void SetShapeList (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& xShapeList); + void SetShapeList (const css::uno::Reference< + css::drawing::XShapes>& xShapeList); /** Add an accessible shape. The difference to the UNO shapes in the list passed to the constructor the specified object does not have to diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx index 1f8662d1ecea..ee6847c5ff04 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/include/svx/DescriptionGenerator.hxx @@ -53,8 +53,8 @@ public: The shape from which properties will be extracted by later calls to <member>addProperty</member>. */ - DescriptionGenerator (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + DescriptionGenerator (const css::uno::Reference< + css::drawing::XShape>& xShape); ~DescriptionGenerator(); @@ -150,10 +150,10 @@ public: private: /// Reference to the shape from which the properties are extracted. - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> mxShape; + css::uno::Reference< css::drawing::XShape> mxShape; /// Reference to the shape's property set. - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> mxSet; + css::uno::Reference< css::beans::XPropertySet> mxSet; /// The description string that is build. OUStringBuffer msDescription; diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 92c38144252b..c4052fb65834 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -107,17 +107,17 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool bReady; double fValue; }; - com::sun::star::uno::Sequence< OUString > seqEquations; + css::uno::Sequence< OUString > seqEquations; std::vector< std::shared_ptr< EnhancedCustomShape::ExpressionNode > > vNodesSharedPtr; std::vector< EquationResult > vEquationResults; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > seqTextFrames; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqGluePoints; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles; - com::sun::star::uno::Sequence< com::sun::star::awt::Size > seqSubViewSize; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > seqSegments; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > seqTextFrames; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; + css::uno::Sequence< css::beans::PropertyValues > seqHandles; + css::uno::Sequence< css::awt::Size > seqSubViewSize; bool bTextFlow : 1; bool bFilled : 1; @@ -132,9 +132,9 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE Color GetColorData( const Color& rFillColor, sal_uInt32 nIndex, double dBrightness ) const; SAL_DLLPRIVATE void AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet, sal_uInt32& nColorIndex, sal_uInt32 nColorCount); - SAL_DLLPRIVATE bool GetParameter( double& rParameterReturnValue, const com::sun::star::drawing::EnhancedCustomShapeParameter&, + SAL_DLLPRIVATE bool GetParameter( double& rParameterReturnValue, const css::drawing::EnhancedCustomShapeParameter&, const bool bReplaceGeoWidth, const bool bReplaceGeoHeight ) const; - SAL_DLLPRIVATE Point GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&, + SAL_DLLPRIVATE Point GetPoint( const css::drawing::EnhancedCustomShapeParameterPair&, const bool bScale = true, const bool bReplaceGeoSize = false ) const; SAL_DLLPRIVATE void CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList, @@ -155,20 +155,20 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool bMirroredY; bool bSwitched; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar; + css::drawing::EnhancedCustomShapeParameterPair aPosition; + css::drawing::EnhancedCustomShapeParameterPair aPolar; sal_Int32 nRefX; sal_Int32 nRefY; sal_Int32 nRefAngle; sal_Int32 nRefR; - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMinimum; - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMaximum; - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMinimum; - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aXRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aXRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aYRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aYRangeMaximum; Handle() : nFlags(HandleFlags::NONE) @@ -196,7 +196,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet sal_uInt32 GetHdlCount() const; bool GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const; - bool SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition ); + bool SetHandleControllerPosition( const sal_uInt32 nIndex, const css::awt::Point& rPosition ); EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape ); virtual ~EnhancedCustomShape2d(); @@ -226,11 +226,11 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue ); - static void SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& + static void SetEnhancedCustomShapeParameter( css::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int32 nValue ); - static void SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& + static void SetEnhancedCustomShapeHandleParameter( css::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue, bool bHorz ); - SAL_DLLPRIVATE static bool ConvertSequenceToEnhancedCustomShape2dHandle( const com::sun::star::beans::PropertyValues& rHandleProperties, + SAL_DLLPRIVATE static bool ConvertSequenceToEnhancedCustomShape2dHandle( const css::beans::PropertyValues& rHandleProperties, EnhancedCustomShape2d::Handle& rDestinationHandle ); SAL_DLLPRIVATE static void SwapStartAndEndArrow( SdrObject* pObj ); }; diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 8f0691001156..2a24fc7d2642 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -85,7 +85,7 @@ enum ExpressionFunct #define EXPRESSION_FLAG_SUMANGLE_MODE 1 -SVX_DLLPUBLIC void FillEquationParameter( const com::sun::star::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& ); +SVX_DLLPUBLIC void FillEquationParameter( const css::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& ); class ExpressionNode { @@ -116,7 +116,7 @@ public: /** Operator to retrieve the ms version of expression */ - virtual com::sun::star::drawing::EnhancedCustomShapeParameter fillNode( + virtual css::drawing::EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) = 0; }; typedef std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx index d92edc97336f..c71bf7fe59f1 100644 --- a/include/svx/IAccessibleParent.hxx +++ b/include/svx/IAccessibleParent.hxx @@ -76,19 +76,19 @@ public: */ virtual bool ReplaceChild ( AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) = 0; + ) throw (css::uno::RuntimeException) = 0; //Add this method to support Form Controls virtual AccessibleControlShape* GetAccControlShapeFromModel - (::com::sun::star::beans::XPropertySet*) - throw (::com::sun::star::uno::RuntimeException){return NULL;}; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetAccessibleCaption (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>&) - throw (::com::sun::star::uno::RuntimeException){return NULL;}; + (css::beans::XPropertySet*) + throw (css::uno::RuntimeException){return NULL;}; + virtual css::uno::Reference< + css::accessibility::XAccessible> + GetAccessibleCaption (const css::uno::Reference< + css::drawing::XShape>&) + throw (css::uno::RuntimeException){return NULL;}; virtual bool IsDocumentSelAll(){ return false; } }; diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index 0ca1ffc1da9c..83429963b7d6 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -52,7 +52,7 @@ namespace svxform /** get's a locale instance which should be used when parsing in the context specified by this instance <p>if this is not overridden by derived classes, it returns the static default locale.</p> */ - virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const override; + virtual css::lang::Locale getPreferredLocale( ) const override; }; diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 297150be6c84..022212541911 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -105,8 +105,8 @@ public: set or the referenced object does not support the XShapeDescriptor interface. */ - ShapeTypeId GetTypeId (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape) const; + ShapeTypeId GetTypeId (const css::uno::Reference< + css::drawing::XShape>& rxShape) const; /** Create a new accessible object for the given shape. @param rShapeInfo @@ -140,8 +140,8 @@ public: /// get the accessible base name for an object static OUString CreateAccessibleBaseName ( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape) - throw (::com::sun::star::uno::RuntimeException, std::exception); + const css::uno::Reference< css::drawing::XShape >& rxShape) + throw (css::uno::RuntimeException, std::exception); protected: // Declare default constructor, copy constructor, destructor, and @@ -192,8 +192,8 @@ private: Returns the slot id of the shape with the given service name or 0 when the service name is not known. */ - SVX_DLLPRIVATE long GetSlotId (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape) const; + SVX_DLLPRIVATE long GetSlotId (const css::uno::Reference< + css::drawing::XShape>& rxShape) const; }; } // end of namespace accessible diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx index 399538207c52..e4acd3eda637 100644 --- a/include/svx/SmartTagCtl.hxx +++ b/include/svx/SmartTagCtl.hxx @@ -50,11 +50,11 @@ private: struct InvokeAction { - com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > mxAction; - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxSmartTagProperties; + css::uno::Reference< css::smarttags::XSmartTagAction > mxAction; + css::uno::Reference< css::container::XStringKeyMap > mxSmartTagProperties; sal_uInt32 mnActionID; - InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties, + InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction, + css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties, sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} }; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index e8263aaa845b..0d6dca01f69d 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -41,12 +41,12 @@ namespace com { namespace sun { namespace star { namespace frame { class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem { - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > > maActionComponentsSequence; - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > > maActionIndicesSequence; - const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > > maStringKeyMaps; - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange> mxRange; - const com::sun::star::uno::Reference<com::sun::star::frame::XController> mxController; - const com::sun::star::lang::Locale maLocale; + const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > > maActionComponentsSequence; + const css::uno::Sequence < css::uno::Sequence< sal_Int32 > > maActionIndicesSequence; + const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > > maStringKeyMaps; + const css::uno::Reference<css::text::XTextRange> mxRange; + const css::uno::Reference<css::frame::XController> mxController; + const css::lang::Locale maLocale; const OUString maApplicationName; const OUString maRangeText; @@ -54,12 +54,12 @@ public: TYPEINFO_OVERRIDE(); SvxSmartTagItem( const sal_uInt16 nId, - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, - const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange> rRange, - const com::sun::star::uno::Reference<com::sun::star::frame::XController> rController, - const com::sun::star::lang::Locale rLocale, + const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, + const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, + const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, + const css::uno::Reference<css::text::XTextRange> rRange, + const css::uno::Reference<css::frame::XController> rController, + const css::lang::Locale rLocale, const OUString& rApplicationName, const OUString& rRangeText ); @@ -68,15 +68,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; // leer virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } - const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& GetStringKeyMaps() const { return maStringKeyMaps; } - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& GetTextRange() const { return mxRange; } - const com::sun::star::uno::Reference<com::sun::star::frame::XController>& GetController() const { return mxController; } - const com::sun::star::lang::Locale& GetLocale() const { return maLocale; } + const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } + const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } + const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& GetStringKeyMaps() const { return maStringKeyMaps; } + const css::uno::Reference<css::text::XTextRange>& GetTextRange() const { return mxRange; } + const css::uno::Reference<css::frame::XController>& GetController() const { return mxController; } + const css::lang::Locale& GetLocale() const { return maLocale; } const OUString GetApplicationName() const { return maApplicationName; } const OUString GetRangeText() const { return maRangeText; } }; diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx index 726df49e2a33..744ff9cebcf8 100644 --- a/include/svx/SmartTagMgr.hxx +++ b/include/svx/SmartTagMgr.hxx @@ -70,9 +70,9 @@ namespace com { namespace sun { namespace star { namespace frame { */ struct ActionReference { - com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > mxSmartTagAction; + css::uno::Reference< css::smarttags::XSmartTagAction > mxSmartTagAction; sal_Int32 mnSmartTagIndex; - ActionReference( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xSmartTagAction, sal_Int32 nSmartTagIndex ) + ActionReference( css::uno::Reference< css::smarttags::XSmartTagAction > xSmartTagAction, sal_Int32 nSmartTagIndex ) : mxSmartTagAction( xSmartTagAction), mnSmartTagIndex( nSmartTagIndex ) {} }; @@ -81,19 +81,19 @@ struct ActionReference This class organizes the available smarttag libraries and provides access functions to these libraries. The smart tag manager is a singleton. */ -class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper2< ::com::sun::star::util::XModifyListener, - ::com::sun::star::util::XChangesListener > +class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper2< css::util::XModifyListener, + css::util::XChangesListener > { private: const OUString maApplicationName; - std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagRecognizer > > maRecognizerList; - std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > maActionList; + std::vector< css::uno::Reference< css::smarttags::XSmartTagRecognizer > > maRecognizerList; + std::vector< css::uno::Reference< css::smarttags::XSmartTagAction > > maActionList; std::set< OUString > maDisabledSmartTagTypes; std::multimap < OUString, ActionReference > maSmartTagMap; - mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxConfigurationSettings; + mutable css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter; + css::uno::Reference< css::uno::XComponentContext> mxContext; + css::uno::Reference< css::beans::XPropertySet > mxConfigurationSettings; bool mbLabelTextWithSmartTags; /** Checks for installed smart tag recognizers/actions and stores them in @@ -152,14 +152,14 @@ public: */ void RecognizeString( const OUString& rText, - const com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup >& rMarkup, - const com::sun::star::uno::Reference< com::sun::star::frame::XController >& rController, - const com::sun::star::lang::Locale& rLocale, + const css::uno::Reference< css::text::XTextMarkup >& rMarkup, + const css::uno::Reference< css::frame::XController >& rController, + const css::lang::Locale& rLocale, sal_uInt32 nStart, sal_uInt32 nLen ) const; - void RecognizeTextRange(const com::sun::star::uno::Reference< com::sun::star::text::XTextRange>& rRange, - const com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup >& rMarkup, - const com::sun::star::uno::Reference< com::sun::star::frame::XController >& rController) const; + void RecognizeTextRange(const css::uno::Reference< css::text::XTextRange>& rRange, + const css::uno::Reference< css::text::XTextMarkup >& rMarkup, + const css::uno::Reference< css::frame::XController >& rController) const; /** Returns all action references associated with a given list of smart tag types @@ -172,9 +172,9 @@ public: @param rActionIndicesSequence Output parameter */ - void GetActionSequences( com::sun::star::uno::Sequence < OUString >& rSmartTagTypes, - com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, - com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence ) const; + void GetActionSequences( css::uno::Sequence < OUString >& rSmartTagTypes, + css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, + css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence ) const; /** Returns the caption for a smart tag type. @@ -184,7 +184,7 @@ public: @param rLocale The locale. */ - OUString GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const; + OUString GetSmartTagCaption( const OUString& rSmartTagType, const css::lang::Locale& rLocale ) const; /** Returns true if the given smart tag type is enabled. */ @@ -200,7 +200,7 @@ public: /** Returns a recognizer. */ - com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagRecognizer > + css::uno::Reference< css::smarttags::XSmartTagRecognizer > GetRecognizer( sal_uInt32 i ) const { return maRecognizerList[i]; } /** Is smart tag recognition active? @@ -217,14 +217,14 @@ public: */ const OUString GetApplicationName() const { return maApplicationName; } - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XModifyListener + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XChangesListener + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/include/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx index 49af77848f2f..a39c60783e46 100644 --- a/include/svx/UnoNamespaceMap.hxx +++ b/include/svx/UnoNamespaceMap.hxx @@ -27,7 +27,7 @@ class SfxItemPool; namespace svx { -SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); } diff --git a/include/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx index cf3826593f52..28daced3e6e9 100644 --- a/include/svx/XPropertyTable.hxx +++ b/include/svx/XPropertyTable.hxx @@ -26,12 +26,12 @@ // FIXME: should have a single factory method with an enumeration here [!] -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw(); -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw(); -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw(); -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw(); -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw(); -::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw(); #endif diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 2da45b6a1b50..ed82e3bd01c5 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -45,8 +45,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( sal_uInt16 nVal ); @@ -91,8 +91,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_Int16 GetLeftMargin() const {return nLeftMargin; } void SetLeftMargin(sal_Int16 nLeft); diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 960e58c07a29..3d54da34f425 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -42,7 +42,7 @@ public: // it will be used to embed the chart to the SdrObject transformation. This // allows to define possible distances between chart and SDrObject bounds here static drawinglayer::primitive2d::Primitive2DSequence tryToGetChartContentAsPrimitive2DSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rXModel, + const css::uno::Reference< css::frame::XModel >& rXModel, basegfx::B2DRange& rRange); // #i121334# Allow to switch off line and fill style by setting these as attributes @@ -52,7 +52,7 @@ public: // since this would not be saved/loaded, thus the compatibility will be better when setting it at // newly created charts using this method static void AdaptDefaultsForChart( - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > & xEmbObj, + const css::uno::Reference < css::embed::XEmbeddedObject > & xEmbObj, bool bNoFillStyle = true, bool bNoLineStyle = true); }; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 96ca16d181a1..ef99a35caed1 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -219,8 +219,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const @@ -287,8 +287,8 @@ public: SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; OUString GetValueText() const; virtual bool GetPresentation(SfxItemPresentation ePres, diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 7a615b52ab8a..f2588fcb5fdb 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -40,8 +40,8 @@ public: SvxClipboardFormatItem( const SvxClipboardFormatItem& ); virtual ~SvxClipboardFormatItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos = USHRT_MAX ); void AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName, diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index d0e6b03e6c77..6d16fed497e2 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -59,7 +59,7 @@ namespace svx //= ODataAccessDescriptor - /** class encapsulating the com::sun::star::sdb::DataAccessDescriptor service. + /** class encapsulating the css::sdb::DataAccessDescriptor service. */ class SVX_DLLPUBLIC SAL_WARN_UNUSED ODataAccessDescriptor { @@ -69,11 +69,11 @@ namespace svx public: ODataAccessDescriptor(); ODataAccessDescriptor( const ODataAccessDescriptor& _rSource ); - ODataAccessDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rValues ); - ODataAccessDescriptor( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues ); + ODataAccessDescriptor( const css::uno::Reference< css::beans::XPropertySet >& _rValues ); + ODataAccessDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& _rValues ); // allows to construct a descriptor from an Any containing either an XPropertySet or a property value sequence - ODataAccessDescriptor( const ::com::sun::star::uno::Any& _rValues ); + ODataAccessDescriptor( const css::uno::Any& _rValues ); const ODataAccessDescriptor& operator=(const ODataAccessDescriptor& _rSource); @@ -83,7 +83,7 @@ namespace svx <p>If you call this method more than once, without writing any values between both calls, the same object is returned. If you wrote values, a new object is returned.</p> */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > createPropertyValueSequence(); /** initialized the descriptor from the property values given @@ -91,7 +91,7 @@ namespace svx initializing with the new ones.</p> */ void initializeFrom( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues, + const css::uno::Sequence< css::beans::PropertyValue >& _rValues, bool _bClear = true); /// checks whether or not a given property is present in the descriptor @@ -106,12 +106,12 @@ namespace svx void clear(); /// return the value of a given property - const ::com::sun::star::uno::Any& operator [] ( DataAccessDescriptorProperty _eWhich ) const; + const css::uno::Any& operator [] ( DataAccessDescriptorProperty _eWhich ) const; /** return the (modifiable) value of a given property <p>This operator is not allowed to be called if the descriptor is readonly.</p> */ - ::com::sun::star::uno::Any& operator [] ( DataAccessDescriptorProperty _eWhich ); + css::uno::Any& operator [] ( DataAccessDescriptorProperty _eWhich ); /** returns either the data source name if given or the database location diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index 637cbd9851a0..4a9f5c4c0e63 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -110,10 +110,10 @@ namespace svx supported formats. Must be a combination of the CTF_XXX flags */ OColumnTransferable( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, + const css::uno::Reference< css::beans::XPropertySet >& _rxForm, const OUString& _rFieldName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, ColumnTransferFormatFlags _nFormats ); @@ -196,7 +196,7 @@ namespace svx ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType ,const OUString& _rCommand - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + ,const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); /** should be used when copying a query object and no connection is available. @@ -217,7 +217,7 @@ namespace svx /** with this ctor, only the object descriptor format will be provided */ ODataAccessObjectTransferable( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLivingForm + const css::uno::Reference< css::beans::XPropertySet >& _rxLivingForm ); /** checks whether or not an object descriptor can be extracted from the data flavor vector given @@ -235,7 +235,7 @@ namespace svx protected: virtual void AddSupportedFormats() override; - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual void ObjectReleased() override; protected: @@ -243,7 +243,7 @@ namespace svx ODataAccessDescriptor& getDescriptor() { return m_aDescriptor; } protected: void addCompatibleSelectionDescription( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rSelRows + const css::uno::Sequence< css::uno::Any >& _rSelRows ); // normally, a derived class could simply access getDescriptor[daSelection] and place the sequence therein // but unfortunately, we have this damned compatible format, and this can't be accessed in @@ -254,7 +254,7 @@ namespace svx ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType ,const OUString& _rCommand - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + ,const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ,bool _bAddCommand ,const OUString& _sActiveCommand); }; @@ -266,10 +266,10 @@ namespace svx */ class SVX_DLLPUBLIC SAL_WARN_UNUSED OMultiColumnTransferable : public TransferableHelper { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDescriptors; + css::uno::Sequence< css::beans::PropertyValue > m_aDescriptors; public: - OMultiColumnTransferable(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aDescriptors); + OMultiColumnTransferable(const css::uno::Sequence< css::beans::PropertyValue >& _aDescriptors); /** checks whether or not an object descriptor can be extracted from the data flavor vector given @param _rFlavors @@ -281,7 +281,7 @@ namespace svx /** extracts a object descriptor from the transferable given */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > extractDescriptor(const TransferableDataHelper& _rData); + static css::uno::Sequence< css::beans::PropertyValue > extractDescriptor(const TransferableDataHelper& _rData); protected: virtual void AddSupportedFormats() override; diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index e0362549a4f5..30e28a853506 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -46,7 +46,7 @@ namespace svx */ OComponentTransferable( const OUString& _rDatasourceOrLocation - ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent + ,const css::uno::Reference< css::ucb::XContent>& _xContent ); /** checks whether or not a component descriptor can be extracted from the data flavor vector given diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 88da6a980e59..ecb9191e6db7 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -426,7 +426,7 @@ #define RID_SVXSTR_LINECAP_ROUND (RID_SVX_START + 587 ) #define RID_SVXSTR_LINECAP_SQUARE (RID_SVX_START + 588 ) -// string resources for com::sun::star::drawing::LineJoint item +// string resources for css::drawing::LineJoint item #define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE #define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 ) #define RID_SVXSTR_LINEJOINT_BEVEL (RID_SVX_START + 590 ) diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 0db03aeb24ab..d5f4859f1d08 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -133,9 +133,9 @@ public: Rectangle CalculateFocusRectangle() const; Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const; + RECT_POINT GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const; bool IsCompletelyDisabled() const { return mbCompleteDisable; } void DoCompletelyDisable(bool bNew); @@ -213,8 +213,8 @@ public: void SetPaintable( bool bTmp ) { bPaintable = bTmp; } void Reset(); SvxPixelCtlAccessible* m_pAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + css::uno::Reference< css::accessibility::XAccessible > m_xAccess; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; long GetSquares() const { return nSquares ; } long GetWidth() const { return aRectSize.getWidth() ; } long GetHeight() const { return aRectSize.getHeight() ; } diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index f196d75f5216..dfddd02f2d61 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -43,8 +43,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XColorListRef GetColorList() const { return pColorList; } }; @@ -67,8 +67,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XGradientListRef GetGradientList() const { return pGradientList; } }; @@ -91,8 +91,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XHatchListRef GetHatchList() const { return pHatchList; } }; @@ -115,8 +115,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XBitmapListRef GetBitmapList() const { return pBitmapList; } }; @@ -139,8 +139,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XDashListRef GetDashList() const { return pDashList; } }; @@ -163,8 +163,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XLineEndListRef GetLineEndList() const { return pLineEndList; } }; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index e1a669e42c79..3dcdeebe18cb 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -42,8 +42,8 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const basegfx::B3DVector& GetValue() const { return aVal; } diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 93782db6efc4..189d5b31257f 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -28,18 +28,18 @@ // SvxFmDrawPage class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage - ,public ::com::sun::star::form::XFormsSupplier2 + ,public css::form::XFormsSupplier2 { protected: // Creating a SdrObject based on a Description. Cann be used by derived classes to - // support own ::com::sun::star::drawing::Shapes (for example Controls) - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) + // support own css::drawing::Shapes (for example Controls) + virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) throw (css::uno::RuntimeException, std::exception) override; // The following method is called when a SvxShape object should be created. // Derived classes can create a derivation or an object aggregating SvxShape. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const + virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; public: @@ -49,19 +49,19 @@ public: // UNO connection DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XFormsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() throw( css::uno::RuntimeException, std::exception ) override; // XFormsSupplier2 - virtual sal_Bool SAL_CALL hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasForms() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::lang::XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::lang::XServiceInfo + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_SVX_FMDPAGE_HXX diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx index 968a7c77e0c9..b82231ed29e0 100644 --- a/include/svx/fmglob.hxx +++ b/include/svx/fmglob.hxx @@ -28,30 +28,30 @@ const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+ sal_uInt32('0')*0x00010000+ sal_uInt32('1')*0x01000000; -const sal_uInt16 OBJ_FM_CONTROL = ::com::sun::star::form::FormComponentType::CONTROL; +const sal_uInt16 OBJ_FM_CONTROL = css::form::FormComponentType::CONTROL; // for form components -const sal_uInt16 OBJ_FM_EDIT = ::com::sun::star::form::FormComponentType::TEXTFIELD; -const sal_uInt16 OBJ_FM_BUTTON = ::com::sun::star::form::FormComponentType::COMMANDBUTTON; -const sal_uInt16 OBJ_FM_FIXEDTEXT = ::com::sun::star::form::FormComponentType::FIXEDTEXT; -const sal_uInt16 OBJ_FM_LISTBOX = ::com::sun::star::form::FormComponentType::LISTBOX; -const sal_uInt16 OBJ_FM_CHECKBOX = ::com::sun::star::form::FormComponentType::CHECKBOX; -const sal_uInt16 OBJ_FM_COMBOBOX = ::com::sun::star::form::FormComponentType::COMBOBOX; -const sal_uInt16 OBJ_FM_RADIOBUTTON = ::com::sun::star::form::FormComponentType::RADIOBUTTON; -const sal_uInt16 OBJ_FM_GROUPBOX = ::com::sun::star::form::FormComponentType::GROUPBOX; -const sal_uInt16 OBJ_FM_GRID = ::com::sun::star::form::FormComponentType::GRIDCONTROL; -const sal_uInt16 OBJ_FM_IMAGEBUTTON = ::com::sun::star::form::FormComponentType::IMAGEBUTTON; -const sal_uInt16 OBJ_FM_FILECONTROL = ::com::sun::star::form::FormComponentType::FILECONTROL; -const sal_uInt16 OBJ_FM_DATEFIELD = ::com::sun::star::form::FormComponentType::DATEFIELD; -const sal_uInt16 OBJ_FM_TIMEFIELD = ::com::sun::star::form::FormComponentType::TIMEFIELD; -const sal_uInt16 OBJ_FM_NUMERICFIELD = ::com::sun::star::form::FormComponentType::NUMERICFIELD; -const sal_uInt16 OBJ_FM_CURRENCYFIELD = ::com::sun::star::form::FormComponentType::CURRENCYFIELD; -const sal_uInt16 OBJ_FM_PATTERNFIELD = ::com::sun::star::form::FormComponentType::PATTERNFIELD; -const sal_uInt16 OBJ_FM_HIDDEN = ::com::sun::star::form::FormComponentType::HIDDENCONTROL; -const sal_uInt16 OBJ_FM_IMAGECONTROL = ::com::sun::star::form::FormComponentType::IMAGECONTROL; -const sal_uInt16 OBJ_FM_FORMATTEDFIELD = ::com::sun::star::form::FormComponentType::PATTERNFIELD + 1; -const sal_uInt16 OBJ_FM_SCROLLBAR = ::com::sun::star::form::FormComponentType::PATTERNFIELD + 2; -const sal_uInt16 OBJ_FM_SPINBUTTON = ::com::sun::star::form::FormComponentType::PATTERNFIELD + 3; -const sal_uInt16 OBJ_FM_NAVIGATIONBAR = ::com::sun::star::form::FormComponentType::PATTERNFIELD + 4; +const sal_uInt16 OBJ_FM_EDIT = css::form::FormComponentType::TEXTFIELD; +const sal_uInt16 OBJ_FM_BUTTON = css::form::FormComponentType::COMMANDBUTTON; +const sal_uInt16 OBJ_FM_FIXEDTEXT = css::form::FormComponentType::FIXEDTEXT; +const sal_uInt16 OBJ_FM_LISTBOX = css::form::FormComponentType::LISTBOX; +const sal_uInt16 OBJ_FM_CHECKBOX = css::form::FormComponentType::CHECKBOX; +const sal_uInt16 OBJ_FM_COMBOBOX = css::form::FormComponentType::COMBOBOX; +const sal_uInt16 OBJ_FM_RADIOBUTTON = css::form::FormComponentType::RADIOBUTTON; +const sal_uInt16 OBJ_FM_GROUPBOX = css::form::FormComponentType::GROUPBOX; +const sal_uInt16 OBJ_FM_GRID = css::form::FormComponentType::GRIDCONTROL; +const sal_uInt16 OBJ_FM_IMAGEBUTTON = css::form::FormComponentType::IMAGEBUTTON; +const sal_uInt16 OBJ_FM_FILECONTROL = css::form::FormComponentType::FILECONTROL; +const sal_uInt16 OBJ_FM_DATEFIELD = css::form::FormComponentType::DATEFIELD; +const sal_uInt16 OBJ_FM_TIMEFIELD = css::form::FormComponentType::TIMEFIELD; +const sal_uInt16 OBJ_FM_NUMERICFIELD = css::form::FormComponentType::NUMERICFIELD; +const sal_uInt16 OBJ_FM_CURRENCYFIELD = css::form::FormComponentType::CURRENCYFIELD; +const sal_uInt16 OBJ_FM_PATTERNFIELD = css::form::FormComponentType::PATTERNFIELD; +const sal_uInt16 OBJ_FM_HIDDEN = css::form::FormComponentType::HIDDENCONTROL; +const sal_uInt16 OBJ_FM_IMAGECONTROL = css::form::FormComponentType::IMAGECONTROL; +const sal_uInt16 OBJ_FM_FORMATTEDFIELD = css::form::FormComponentType::PATTERNFIELD + 1; +const sal_uInt16 OBJ_FM_SCROLLBAR = css::form::FormComponentType::PATTERNFIELD + 2; +const sal_uInt16 OBJ_FM_SPINBUTTON = css::form::FormComponentType::PATTERNFIELD + 3; +const sal_uInt16 OBJ_FM_NAVIGATIONBAR = css::form::FormComponentType::PATTERNFIELD + 4; #endif // _FM_FMGLOB_HXX diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index d59da3761d62..49550433edfd 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmGridControl : public DbGridControl public: FmGridControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, + const css::uno::Reference< css::uno::XComponentContext >&, vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits); @@ -114,17 +114,17 @@ public: // Window virtual void KeyInput( const KeyEvent& rKEvt ) override; - // ::com::sun::star::beans::XPropertyChangeListener - void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt); + // css::beans::XPropertyChangeListener + void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt); - // ::com::sun::star::form::XPositioningListener - void positioned(const ::com::sun::star::lang::EventObject& rEvent); + // css::form::XPositioningListener + void positioned(const css::lang::EventObject& rEvent); // XBound bool commit(); - // ::com::sun::star::form::XInsertListener - void inserted(const ::com::sun::star::lang::EventObject& rEvent); + // css::form::XInsertListener + void inserted(const css::lang::EventObject& rEvent); void markColumn(sal_uInt16 nId); bool isColumnMarked(sal_uInt16 nId) const; @@ -173,23 +173,23 @@ protected: // Initialize columns // a.) only by column description - void InitColumnsByModels(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xColumns); + void InitColumnsByModels(const css::uno::Reference< css::container::XIndexContainer >& xColumns); // b.) during alivemode by database fields - virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) override; + virtual void InitColumnsByFields(const css::uno::Reference< css::container::XIndexAccess >& xFields) override; // some kind of impl version (for one single column) of our version of InitColumnsByFields static void InitColumnByField( DbGridColumn* _pColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumnModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxFieldsByNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxFieldsByIndex + const css::uno::Reference< css::beans::XPropertySet >& _rxColumnModel, + const css::uno::Reference< css::container::XNameAccess >& _rxFieldsByNames, + const css::uno::Reference< css::container::XIndexAccess >& _rxFieldsByIndex ); FmXGridPeer* GetPeer() const {return m_pPeer;} - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> + css::uno::Sequence< css::uno::Any> getSelectionBookmarks(); - bool selectBookmarks(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& _rBookmarks); + bool selectBookmarks(const css::uno::Sequence< css::uno::Any>& _rBookmarks); /** returns if a column is selected @param nColumnId diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 23cbcd168844..dad6668973f1 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -68,18 +68,18 @@ public: class SAL_WARN_UNUSED FmXModifyMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper - ,public ::com::sun::star::util::XModifyListener + ,public css::util::XModifyListener { public: FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModifyListener + virtual void SAL_CALL modified(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -91,20 +91,20 @@ public: class SAL_WARN_UNUSED FmXUpdateMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, - public ::com::sun::star::form::XUpdateListener + public css::form::XUpdateListener { public: FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XUpdateListener - virtual sal_Bool SAL_CALL approveUpdate(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updated(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XUpdateListener + virtual sal_Bool SAL_CALL approveUpdate(const css::lang::EventObject &) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updated(const css::lang::EventObject &) throw(css::uno::RuntimeException, std::exception) override; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -116,19 +116,19 @@ public: class SAL_WARN_UNUSED FmXSelectionMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper - ,public ::com::sun::star::view::XSelectionChangeListener + ,public css::view::XSelectionChangeListener { public: FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::view::XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +// css::view::XSelectionChangeListener + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -140,19 +140,19 @@ public: class SAL_WARN_UNUSED FmXGridControlMultiplexer :public OWeakSubObject ,public ::cppu::OInterfaceContainerHelper - ,public ::com::sun::star::form::XGridControlListener + ,public css::form::XGridControlListener { public: FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::view::XSelectionChangeListener - virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +// css::view::XSelectionChangeListener + virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) throw (css::uno::RuntimeException, std::exception) override; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -164,20 +164,20 @@ public: class SAL_WARN_UNUSED FmXContainerMultiplexer : public OWeakSubObject, public ::cppu::OInterfaceContainerHelper, - public ::com::sun::star::container::XContainerListener + public css::container::XContainerListener { public: FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex); DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -187,16 +187,16 @@ public: // FmXGridControl -typedef ::cppu::ImplHelper10< ::com::sun::star::form::XBoundComponent, - ::com::sun::star::form::XGridControl, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::util::XModeSelector, - ::com::sun::star::container::XContainer, - ::com::sun::star::frame::XDispatchProvider, - ::com::sun::star::frame::XDispatchProviderInterception, - ::com::sun::star::view::XSelectionSupplier +typedef ::cppu::ImplHelper10< css::form::XBoundComponent, + css::form::XGridControl, + css::util::XModifyBroadcaster, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::util::XModeSelector, + css::container::XContainer, + css::frame::XDispatchProvider, + css::frame::XDispatchProviderInterception, + css::view::XSelectionSupplier > FmXGridControl_BASE; class FmXGridPeer; @@ -213,94 +213,94 @@ protected: sal_uInt16 m_nPeerCreationLevel; bool m_bInDraw; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + FmXGridControl(const css::uno::Reference< css::uno::XComponentContext >&); virtual ~FmXGridControl(); // UNO connection DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XComponent + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; -// ::com::sun::star::awt::XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XControl + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::awt::XView - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XView + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XBoundComponent + virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::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; +// css::container::XElementAccess + 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; -// ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::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 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGridControl - virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGridControl + virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGrid (base of XGridControl) - virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGrid (base of XGridControl) + virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGridFieldDataSupplier (base of XGridControl) - virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGridFieldDataSupplier (base of XGridControl) + virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override; // UnoControl virtual OUString GetComponentServiceName() override; -// ::com::sun::star::util::XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) 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 >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModifyBroadcaster + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModeSelector + virtual void SAL_CALL setMode(const OUString& Mode) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XContainer + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::frame::XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::frame::XDispatchProviderInterception + virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::view::XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +// css::view::XSelectionSupplier + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent); @@ -372,139 +372,139 @@ public: // spaeter Constructor, immer nach dem realen Constructor zu rufen ! void Create(vcl::Window* pParent, WinBits nStyle); -// ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); - static FmXGridPeer* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); + static FmXGridPeer* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGridPeer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGridPeer + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumns( const css::uno::Reference< css::container::XIndexContainer >& aColumns ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XComponent + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XBoundComponent + virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::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; +// css::container::XElementAccess + 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; -// ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::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 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::beans::XPropertyChangeListener + virtual void SAL_CALL SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XLoadListener + virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::sdbc::XRowSetListener + virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override; // VCLXWindow - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; -// ::com::sun::star::form::XGridControl - virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGridControl + virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGrid (base of XGridControl) - virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGrid (base of XGridControl) + virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XGridFieldDataSupplier (base of XGridControl) - virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XGridFieldDataSupplier (base of XGridControl) + virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::sdb::XRowSetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::sdb::XRowSetSupplier + virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRowSet(const css::uno::Reference< css::sdbc::XRowSet >& xDataSource) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::util::XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) 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 >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModifyBroadcaster + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override; // UnoControl - virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDesignMode() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDesignMode() throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::view::XSelectionChangeListener - virtual void SAL_CALL selectionChanged(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::view::XSelectionChangeListener + virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; void CellModified(); // PropertyListening - void updateGrid(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rDatabaseCursor); + void updateGrid(const css::uno::Reference< css::sdbc::XRowSet >& _rDatabaseCursor); void startCursorListening(); void stopCursorListening(); -// ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModeSelector + virtual void SAL_CALL setMode(const OUString& Mode) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XContainer + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override; void columnVisible(DbGridColumn* pColumn); void columnHidden(DbGridColumn* pColumn); -// ::com::sun::star::awt::XView - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XView + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::frame::XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::frame::XDispatchProviderInterception + virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::frame::XStatusListener + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XResetListener - virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XResetListener + virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::view::XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +// css::view::XSelectionSupplier + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle); - static ::com::sun::star::uno::Sequence< ::com::sun::star::util::URL>& getSupportedURLs(); - static ::com::sun::star::uno::Sequence<sal_uInt16>& getSupportedGridSlots(); + static css::uno::Sequence< css::util::URL>& getSupportedURLs(); + static css::uno::Sequence<sal_uInt16>& getSupportedGridSlots(); void ConnectToDispatcher(); void DisConnectFromDispatcher(); void UpdateDispatches(); // will connect if not already connected and just update else @@ -514,8 +514,8 @@ protected: Instead it may use addColumnListeners and removeColumnListeners which are called in all the cases. */ - void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol); - void removeColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol); + void addColumnListeners(const css::uno::Reference< css::beans::XPropertySet >& xCol); + void removeColumnListeners(const css::uno::Reference< css::beans::XPropertySet >& xCol); void selectionChanged(); void columnChanged(); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 5ed96a2b928f..def260c9e8e2 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -63,7 +63,7 @@ public: virtual SdrObject* RemoveObject(size_t nObjNum) override; // access to all forms - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& GetForms( bool _bForceCreate = true ) const; + const css::uno::Reference< css::form::XForms>& GetForms( bool _bForceCreate = true ) const; FmFormPageImpl& GetImpl() const { return *m_pImpl; } diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index 95b7c44a236f..be6b7f58d19c 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { // Helper methods -SVX_DLLPUBLIC bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl, +SVX_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl, OUString* pCurrentText = NULL); // check if the control has one of the interfaces we can use for searching // *pCurrentText will be filled with the current text of the control (as used when searching this control) @@ -49,7 +49,7 @@ SVX_DLLPUBLIC bool IsSearchableControl( const ::com::sun::star::uno::Reference< struct FmFoundRecordInformation { - ::com::sun::star::uno::Any aPosition; // bookmark of the record in which the text was found + css::uno::Any aPosition; // bookmark of the record in which the text was found sal_Int16 nFieldPos; // ditto: the relative position of the column (in the string name of the field list in the constructor) sal_Int16 nContext; // the context in which was searched and found (if the current search knows several contexts) }; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 78f3cc295de3..44e1a6967045 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -137,14 +137,14 @@ public: // helper methods for implementing XFormLayerAccess SdrUnoObj* GetFormControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel, + const css::uno::Reference< css::awt::XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _out_rxControl + css::uno::Reference< css::awt::XControl >& _out_rxControl ) const; - static ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, + static css::uno::Reference< css::form::runtime::XFormController > GetFormController( + const css::uno::Reference< css::form::XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ); diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index c9636f195a70..d543296da544 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -72,7 +72,7 @@ struct FmSearchProgress bool bOverflow; // the position of the search cursor - valid in case of STATE_SUCCESSFULL, STATE_CANCELED and STATE_NOTHING_FOUND - ::com::sun::star::uno::Any aBookmark; + css::uno::Any aBookmark; // the field, in which the text was found - valid in case of STATE_SUCCESSFULL sal_Int32 nFieldIndex; }; @@ -81,11 +81,11 @@ struct FmSearchProgress * class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides * the differences in RecordCount */ -class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> +class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< css::beans::XPropertyChangeListener> { // attribute Link<sal_Int32,void> m_lnkWhoWantsToKnow; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListening; + css::uno::Reference< css::beans::XPropertySet > m_xListening; // attribute access public: @@ -93,18 +93,18 @@ public: // methods public: - FmRecordCountListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& dbcCursor); + FmRecordCountListener(const css::uno::Reference< css::sdbc::XResultSet >& dbcCursor); // the set has to support the sdb::ResultSet service virtual ~FmRecordCountListener(); // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject) - // virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut); + // virtual sal_Bool queryInterface(css::uno::Uik aUik, css::uno::Reference< css::uno::XInterface >& rOut); - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; void DisConnect(); @@ -117,18 +117,18 @@ private: * class FmSearchEngine - Impl class for FmSearchDialog */ namespace svxform { - // We have three possible control types we may search in, determined by the supported interfaces : ::com::sun::star::awt::XTextComponent, - // ::com::sun::star::awt::XListBox, ::com::sun::star::awt::XCheckBox. + // We have three possible control types we may search in, determined by the supported interfaces : css::awt::XTextComponent, + // css::awt::XListBox, css::awt::XCheckBox. // While searching we don't want to do this distinction for every control in every round. So we need some helpers. class SAL_WARN_UNUSED ControlTextWrapper { // attributes - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xControl; + css::uno::Reference< css::uno::XInterface > m_xControl; // attribute access public: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getControl() const{ return m_xControl; } + css::uno::Reference< css::uno::XInterface > getControl() const{ return m_xControl; } public: - ControlTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xControl) { m_xControl = _xControl; } + ControlTextWrapper(const css::uno::Reference< css::uno::XInterface >& _xControl) { m_xControl = _xControl; } virtual ~ControlTextWrapper() { } virtual OUString getCurrentText() const = 0; @@ -136,32 +136,32 @@ namespace svxform { class SAL_WARN_UNUSED SimpleTextWrapper : public ControlTextWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xText; + css::uno::Reference< css::awt::XTextComponent > m_xText; public: - SimpleTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& _xText); + SimpleTextWrapper(const css::uno::Reference< css::awt::XTextComponent >& _xText); virtual OUString getCurrentText() const override; }; class SAL_WARN_UNUSED ListBoxWrapper : public ControlTextWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > m_xBox; + css::uno::Reference< css::awt::XListBox > m_xBox; public: - ListBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >& _xBox); + ListBoxWrapper(const css::uno::Reference< css::awt::XListBox >& _xBox); virtual OUString getCurrentText() const override; }; class SAL_WARN_UNUSED CheckBoxWrapper : public ControlTextWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox > m_xBox; + css::uno::Reference< css::awt::XCheckBox > m_xBox; public: - CheckBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >& _xBox); + CheckBoxWrapper(const css::uno::Reference< css::awt::XCheckBox >& _xBox); virtual OUString getCurrentText() const override; }; } enum FMSEARCH_MODE { SM_BRUTE, SM_ALLOWSCHEDULE, SM_USETHREAD }; -typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray; +typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray; class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine { @@ -173,19 +173,19 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine CursorWrapper m_xSearchCursor; std::deque<sal_Int32> m_arrFieldMapping; // Since the iterator could have more columns, as managed here (in this field listbox), - // a mapping of this ::com::sun::star::form keys on the indices of the respective columns is kept in the iterator + // a mapping of this css::form keys on the indices of the respective columns is kept in the iterator // the formatter - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xFormatSupplier; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; CharClass m_aCharacterClassficator; CollatorWrapper m_aStringCompare; - // the collection of all interesting fields (or their ::com::sun::star::data::XDatabaseVariant interfaces and FormatKeys) + // the collection of all interesting fields (or their css::data::XDatabaseVariant interfaces and FormatKeys) struct FieldInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn > xContents; + css::uno::Reference< css::sdb::XColumn > xContents; sal_uInt32 nFormatKey; bool bDoubleHandling; }; @@ -202,7 +202,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine CursorWrapper m_xClonedIterator; // Data for the decision in which field a "Found" is accepted - ::com::sun::star::uno::Any m_aPreviousLocBookmark; // position of the last finding + css::uno::Any m_aPreviousLocBookmark; // position of the last finding FieldCollection::iterator m_iterPreviousLocField; // field of the last finding // Communication with the thread that does the actual searching @@ -286,7 +286,7 @@ public: public: /** two constructs, both analogical to FmSearchDialog, therefore look this up for explanations .... - xCursor has to implement ::com::sun::star::data::DatabaseCursor service each time. + xCursor has to implement css::data::DatabaseCursor service each time. If eMode == SM_USETHREAD, a ProgressHandler should be set, because in this case the result forwarding will be done by this handler. If eMode != SM_USETHREAD, SearchNext and StarOver won't return, until the search has finished (independently of its @@ -294,14 +294,14 @@ public: every record as well as at the end of the search. */ FmSearchEngine( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat, + const css::uno::Reference< css::util::XNumberFormatsSupplier >& xFormat, FMSEARCH_MODE eMode); FmSearchEngine( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode); @@ -338,7 +338,7 @@ public: /** only valid, if not an (asynchronous) search is running, the next search will then be executed on top of the new iterator with the new parameter */ - bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, + bool SwitchToContext(const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex); protected: @@ -372,7 +372,7 @@ private: // moves m_xSearchIterator with respect to direction/overflow cursor SVX_DLLPRIVATE bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd); // moves the iterator with respect to the direction/overflow iterator/overflow cursor - SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField); + SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const css::uno::Reference< css::container::XIndexAccess >& xAllFields, sal_Int32 nField); // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields // xAllFields needs to support the DatabaseRecord service SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 906e2f3b2a3c..da73d92a58fe 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -90,8 +90,8 @@ public: OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, + const css::uno::Reference< css::beans::XPropertySet >& _rxField, + const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, @@ -119,8 +119,8 @@ public: /** returns the form controller for a given form and a given device */ - SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > - GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; + SVX_DLLPRIVATE css::uno::Reference< css::form::runtime::XFormController > + GetFormController( const css::uno::Reference< css::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override; @@ -141,14 +141,14 @@ public: struct ImplAccess { friend class FmXFormView; private: ImplAccess() { } }; void SetMoveOutside( bool _bMoveOutside, ImplAccess ) { E3dView::SetMoveOutside( _bMoveOutside ); } - void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); - void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); + void InsertControlContainer(const css::uno::Reference< css::awt::XControlContainer >& xCC); + void RemoveControlContainer(const css::uno::Reference< css::awt::XControlContainer >& xCC); virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) override; virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) override; SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return mpActualOutDev;} - SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource); + SVX_DLLPRIVATE bool checkUnMarkAll(const css::uno::Reference< css::uno::XInterface >& _xSource); private: SVX_DLLPRIVATE FmFormObj* getMarkedGrid() const; diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index c04d22043f72..33240c7333a8 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -157,17 +157,17 @@ public: // accessibility ---------------------------------------------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; /** Returns the accessibility child object of the specified frame border (if enabled). */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetChildAccessible( FrameBorderType eBorder ); /** Returns the accessibility child object with specified index (counts enabled frame borders only). */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetChildAccessible( sal_Int32 nIndex ); /** Returns the accessibility child object at the specified position (relative to control). */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetChildAccessible( const Point& rPos ); /** Returns true, if the passed point is inside the click area of any enabled frame border. */ diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index d508673f9910..c58cfc820ddc 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -41,8 +41,8 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem sal_Int8 m_nType; rtl::OUString m_aURL; rtl::OUString m_aFilterName; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xDrawing; - com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > m_xGraphic; + css::uno::Reference< css::lang::XComponent > m_xDrawing; + css::uno::Reference< css::graphic::XGraphic > m_xGraphic; public: TYPEINFO_OVERRIDE(); @@ -53,14 +53,14 @@ public: sal_Int8 GetType() const { return m_nType; } const rtl::OUString GetURL() const { return m_aURL; } - const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > GetGraphic() const { return m_xGraphic; } + const css::uno::Reference< css::graphic::XGraphic > GetGraphic() const { return m_xGraphic; } // pure virtual methods from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; // bridge to UNO - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // not implemented virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 630837e4c5fe..741624ed6067 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -137,7 +137,7 @@ class GraphicFilter; class SVX_DLLPUBLIC GalleryProgress { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XProgressBar > mxProgressBar; + css::uno::Reference< css::awt::XProgressBar > mxProgressBar; GraphicFilter* mpFilter; public: @@ -177,7 +177,7 @@ protected: // TransferableHelper virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void DragFinished( sal_Int8 nDropAction ) override; virtual void ObjectReleased() override; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index c29380628787..84213b152b70 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -214,7 +214,7 @@ public: bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); SAL_DLLPRIVATE bool InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); - SAL_DLLPRIVATE bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); + SAL_DLLPRIVATE bool InsertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ); SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ); diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index cd7e3eebd97f..cf44b1cf63ac 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -109,7 +109,7 @@ public: void SetUpdateLink( const Link<GraphCtrl*,void>& rLink ) { aUpdateLink = rLink; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index f2109a550356..eca65563ef69 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC GraphicHelper public: static void GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ); static OUString ExportGraphic( const Graphic& rGraphic, const OUString& rGraphicName ); - static void SaveShapeAsGraphic( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); + static void SaveShapeAsGraphic( const css::uno::Reference< css::drawing::XShape >& xShape ); }; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index ce696b63570b..f9160deb6a86 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -45,9 +45,9 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index b476eb1600fb..91e95430467a 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -41,7 +41,7 @@ class DbGridControl; class CursorWrapper; -bool CompareBookmark(const ::com::sun::star::uno::Any& aLeft, const ::com::sun::star::uno::Any& aRight); +bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight); namespace svxform { @@ -62,7 +62,7 @@ enum GridRowStatus class DbGridRow : public SvRefBase { - ::com::sun::star::uno::Any m_aBookmark; // Bookmark of the row, can be set + css::uno::Any m_aBookmark; // Bookmark of the row, can be set ::std::vector< ::svxform::DataColumn* > m_aVariants; GridRowStatus m_eStatus; @@ -84,7 +84,7 @@ public: void SetNew(bool _bNew) { m_bIsNew = _bNew; } bool IsNew() const { return m_bIsNew; } - const ::com::sun::star::uno::Any& GetBookmark() const { return m_aBookmark; } + const css::uno::Any& GetBookmark() const { return m_aBookmark; } bool IsValid() const { return m_eStatus == GRS_CLEAN || m_eStatus == GRS_MODIFIED; } bool IsModified() const { return m_eStatus == GRS_MODIFIED; } @@ -223,8 +223,8 @@ private: Link<sal_uInt16,int> m_aMasterStateProvider; Link<sal_uInt16,bool> m_aMasterSlotExecutor; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; + css::uno::Reference< css::uno::XComponentContext > m_xContext; DbGridColumns m_aColumns; // Column description VclPtr<NavigationBar> m_aBar; @@ -242,7 +242,7 @@ private: // For that reason we have to listen to some properties of our data source. ::comphelper::OPropertyChangeMultiplexer* m_pDataSourcePropMultiplexer; FmXGridSourcePropListener* m_pDataSourcePropListener; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener> + css::uno::Reference< css::sdb::XRowsChangeListener> m_xRowSetListener; // get notification when rows were changed void* m_pFieldListeners; @@ -269,7 +269,7 @@ private: osl::Mutex m_aDestructionSafety; osl::Mutex m_aAdjustSafety; - com::sun::star::util::Date + css::util::Date m_aNullDate; // NullDate of the Numberformatter; BrowserMode m_nMode; @@ -347,12 +347,12 @@ protected: */ virtual void PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); - void DataSourcePropertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception); + void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception); - void FieldValueChanged(sal_uInt16 _nId, const ::com::sun::star::beans::PropertyChangeEvent& _evt); + void FieldValueChanged(sal_uInt16 _nId, const css::beans::PropertyChangeEvent& _evt); void FieldListenerDisposing(sal_uInt16 _nId); - void disposing(sal_uInt16 _nId, const ::com::sun::star::lang::EventObject& _rEvt); + void disposing(sal_uInt16 _nId, const css::lang::EventObject& _rEvt); // own overridables /// called when the current row changed @@ -367,7 +367,7 @@ protected: public: DbGridControl( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >, + css::uno::Reference< css::uno::XComponentContext >, vcl::Window* pParent, WinBits nBits = WB_BORDER); @@ -375,7 +375,7 @@ public: virtual void dispose() override; virtual void Init() override; - virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) = 0; + virtual void InitColumnsByFields(const css::uno::Reference< css::container::XIndexAccess >& xFields) = 0; virtual void RemoveRows() override; /** GetCellText returns the text at the given position @@ -390,11 +390,11 @@ public: void RemoveRows(bool bNewCursor); - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;} + const css::uno::Reference< css::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;} // the data source // the options can restrict but not extend the update abilities - void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor, + void setDataSource(const css::uno::Reference< css::sdbc::XRowSet >& rCursor, sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE); virtual void Dispatch(sal_uInt16 nId) override; @@ -408,7 +408,7 @@ public: // which position does the column with the id in the View have, the handle column doesn't count sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId); return (nPos==BROWSER_INVALIDID) ? GRID_COLUMN_NOT_FOUND : nPos-1; } - // which position does the column with the id in m_aColumns have, that means the ::com::sun::star::sdbcx::Container + // which position does the column with the id in m_aColumns have, that means the css::sdbcx::Container // returned from the GetColumns (may be different from the position returned by GetViewColumnPos // if there are hidden columns) sal_uInt16 GetModelColumnPos( sal_uInt16 nId ) const; @@ -438,7 +438,7 @@ public: // to update, to insert or to restore, the according options are ignored. If the grid isn't // connected to a data source, all options except OPT_READONLY are ignored. - const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;} + const css::util::Date& getNullDate() const {return m_aNullDate;} // positioning void MoveToPosition(sal_uInt32 nPos); @@ -497,7 +497,7 @@ public: */ void ForceHideScrollbars( bool _bForce ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getContext() const { return m_xContext; } /// returns <TRUE/> if the text of the given cell can be copied into the clipboard @@ -536,8 +536,8 @@ public: @return The XAccessible interface of the specified control. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< + css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override; // IAccessibleTableProvider @@ -545,8 +545,8 @@ public: @param nRow The row index of the cell. @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< + css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; protected: diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index b776a4038129..4d525ba69976 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -66,8 +66,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const OUString& GetName() const { return sName; } void SetName(const OUString& rName) { sName = rName; } diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index b70063af5f54..f059069adb37 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -39,7 +39,7 @@ class SvxLineBox : public LineLB Size aLogicalSize; bool bRelease; SfxObjectShell* mpSh; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; + css::uno::Reference< css::frame::XFrame > mxFrame; DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void); @@ -47,7 +47,7 @@ class SvxLineBox : public LineLB public: SvxLineBox( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); void FillControl(); @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField SfxMapUnit ePoolUnit; FieldUnit eDlgUnit; Size aLogicalSize; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; + css::uno::Reference< css::frame::XFrame > mxFrame; static void ReleaseFocus_Impl(); @@ -84,7 +84,7 @@ protected: public: SvxMetricField( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); void Update( const XLineWidthItem* pItem ); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 10591848477c..cfc1e181c1d7 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -90,7 +90,7 @@ protected: Image m_aNotCheckedImage; Image m_aCheckedImage; OUString m_aAllString; - com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; + css::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; SvxLanguageListFlags m_nLangList; bool m_bHasLangNone; bool m_bLangNoneIsLangAll; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 6651c41c6aaa..39d87f6bdd72 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -89,7 +89,7 @@ private: Size aBmpSize; bool bPopupMode; bool mbInResize; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; + css::uno::Reference< css::frame::XFrame > mxFrame; DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); @@ -111,10 +111,10 @@ protected: public: SvxLineEndWindow( sal_uInt16 nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rWndTitle ); SvxLineEndWindow( sal_uInt16 nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow, const OUString& rWndTitle ); virtual ~SvxLineEndWindow(); diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 7679856051a3..65463646ffab 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -62,16 +62,16 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet Rectangle aOrgRect; VclPtr<VirtualDevice> pVDev; - com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter; - com::sun::star::lang::Locale aLocale; + css::uno::Reference<css::text::XNumberingFormatter> xFormatter; + css::lang::Locale aLocale; - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue> > aNumSettings; + css::uno::Sequence< + css::uno::Sequence< + css::beans::PropertyValue> > aNumSettings; - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess> > aOutlineSettings; + css::uno::Sequence< + css::uno::Reference< + css::container::XIndexAccess> > aOutlineSettings; public: SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 8c22b000108e..92861a43d430 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -80,8 +80,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 5d1804fa065d..37e1efa1bfdc 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -51,8 +51,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index e0ddcf0e2bb6..65dc0e5c6965 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -124,7 +124,7 @@ class SvxRubyDialog : public SfxModelessDialog bool bModified; - com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl; + css::uno::Reference<css::view::XSelectionChangeListener> xImpl; SfxBindings* pBindings; SvxRubyData_Impl* pImpl; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index e308079805a2..adb3d4f44880 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -32,8 +32,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem protected: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -65,8 +65,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem protected: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -97,8 +97,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lHeight; protected: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -175,8 +175,8 @@ protected: const IntlWrapper * = 0 ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; public: TYPEINFO_OVERRIDE(); @@ -230,8 +230,8 @@ protected: OUString &rText, const IntlWrapper * = 0 ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; private: const SvxObjectItem &operator=(const SvxObjectItem &) = delete; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 972220017693..1deefc5bae85 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -51,8 +51,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index f6f99d21cde7..3e7ed752439c 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -47,14 +47,14 @@ private: PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPropSeq; + css::uno::Sequence< css::beans::PropertyValue > aPropSeq; public: TYPEINFO_OVERRIDE(); SdrCustomShapeGeometryItem(); - SdrCustomShapeGeometryItem( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); + SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& ); SdrCustomShapeGeometryItem( SvStream& rIn, sal_uInt16 nVersion ); virtual ~SdrCustomShapeGeometryItem(); @@ -69,18 +69,18 @@ private: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const { return aPropSeq;} + const css::uno::Sequence< css::beans::PropertyValue >& GetGeometry() const { return aPropSeq;} - com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ); - const com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ) const; - com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); - const com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ) const; + css::uno::Any* GetPropertyValueByName( const OUString& rPropName ); + const css::uno::Any* GetPropertyValueByName( const OUString& rPropName ) const; + css::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); + const css::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ) const; - void SetPropertyValue( const com::sun::star::beans::PropertyValue& rPropVal ); - void SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ); + void SetPropertyValue( const css::beans::PropertyValue& rPropVal ); + void SetPropertyValue( const OUString& rSequenceName, const css::beans::PropertyValue& rPropVal ); void ClearPropertyValue( const OUString& rPropertyName ); }; diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 09dd6187ee3e..16e3078c5a5c 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -40,8 +40,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; #endif // INCLUDED_SVX_SDGGAITM_HXX diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index b7ea8810a1b2..23fa8c13e070 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -134,7 +134,7 @@ private: SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); - SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE bool StopTextEdit(); SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow ); @@ -165,7 +165,7 @@ private: SdrObjectWeakRef mxTableObj; SdrModel* mpModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener; + css::uno::Reference< css::util::XModifyListener > mxModifyListener; ImplSVEvent * mnUpdateEvent; }; diff --git a/include/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx index 656293361a37..cf0ed0cf00f9 100644 --- a/include/svx/sdr/table/tabledesign.hxx +++ b/include/svx/sdr/table/tabledesign.hxx @@ -38,7 +38,7 @@ const sal_Int32 body_style = 8; const sal_Int32 background_style = 9; const sal_Int32 style_count = 10; -extern SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > CreateTableDesignFamily(); +extern SVX_DLLPUBLIC css::uno::Reference< css::container::XNameAccess > CreateTableDesignFamily(); } } diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 82321b5161b2..8a7b75afaf1d 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -42,8 +42,8 @@ public: virtual sal_uInt16 GetValueCount() const override; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 59ac150af1ea..f77c048d1419 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -44,8 +44,8 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; @@ -71,8 +71,8 @@ public: virtual sal_uInt16 GetValueCount() const override; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 476f82613bde..6bd211bd5aa7 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -86,8 +86,8 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index b7bb7865bdab..cf175ec18c6b 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -38,8 +38,8 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; #endif diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index e557a050f209..3ca7db028c3e 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -52,8 +52,8 @@ public: virtual sal_uInt16 GetValueCount() const override; SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 006730b47656..b673f5304674 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -52,7 +52,7 @@ namespace svx /** returns the current value of the property which the provider is responsible for */ - virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const = 0; + virtual void getCurrentValue( css::uno::Any& _out_rValue ) const = 0; virtual ~IPropertyValueProvider(); }; @@ -76,7 +76,7 @@ namespace svx } virtual OUString getPropertyName() const override; - virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const override; + virtual void getCurrentValue( css::uno::Any& _out_rValue ) const override; protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } @@ -110,8 +110,8 @@ namespace svx ~PropertyChangeNotifier(); // listener maintanance - void addPropertyChangeListener( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); - void removePropertyChangeListener( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); + void addPropertyChangeListener( const OUString& _rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ); + void removePropertyChangeListener( const OUString& _rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ); /** registers a IPropertyValueProvider */ diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index 13294c723ef6..d5cb3916f84f 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -27,7 +27,7 @@ class SfxViewShell; -/** Convenience frontend for com::sun::star::ui::ContextChangeEventMultiplexer +/** Convenience frontend for css::ui::ContextChangeEventMultiplexer */ class SVX_DLLPUBLIC ContextChangeEventMultiplexer { diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 70c96db21b06..22b229c3dfc7 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -33,7 +33,7 @@ private: public: PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, - const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame); + const css::uno::Reference<css::frame::XFrame> &rFrame); virtual ~PanelLayout(); virtual void dispose() override; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 556659fa618a..dca1fd9dee4a 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -139,7 +139,7 @@ public: vcl::Window* GetDocWin() { return mpDocWin; } void SetSrchFlag( bool bSuccess ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override; void SetSaveToModule(bool b); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 9e00c8a163dd..737891d5024d 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -255,7 +255,7 @@ public: /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ - void getTextSelection( ::com::sun::star::uno::Any& rSelection ); + void getTextSelection( css::uno::Any& rSelection ); virtual void MarkListHasChanged() override; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e467525eab3d..a8e4d65c4f1f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -257,7 +257,7 @@ public: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); + virtual css::uno::Reference< css::uno::XInterface > createUnoModel(); private: SdrModel(const SdrModel& rSrcModel) = delete; @@ -274,7 +274,7 @@ private: // this is a weak reference to a possible living api wrapper for this model - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoModel; + css::uno::Reference< css::uno::XInterface > mxUnoModel; public: bool IsPasteResize() const { return bPasteResize; } @@ -302,10 +302,10 @@ public: // swapping. // The stream from which the model was loaded or in which is was saved last // needs to be delivered - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage> GetDocumentStorage() const; - ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > + virtual css::uno::Reference< + css::embed::XStorage> GetDocumentStorage() const; + css::uno::Reference< + css::io::XInputStream > GetDocumentStream(OUString const& rURL, ::comphelper::LifecycleProxy & rProxy) const; // Change the template attributes of the symbol objects to hard attributes @@ -568,8 +568,8 @@ public: bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; } void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoModel(); - void setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xModel ); + css::uno::Reference< css::uno::XInterface > getUnoModel(); + void setUnoModel( css::uno::Reference< css::uno::XInterface > xModel ); // these functions are used by the api to disable repaints during a // set of api calls. @@ -604,7 +604,7 @@ public: bool IsInDestruction() const { return mbInDestruction;} - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); virtual ImageMap* GetImageMapForObject(SdrObject*){return NULL;}; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 80a4a01e6fd3..707d29ba1c77 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -54,7 +54,7 @@ class SdrAShapeObjGeoData : public SdrTextObjGeoData bool bMirroredY; double fObjectRotation; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > + css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; }; @@ -75,8 +75,8 @@ namespace o3tl struct SdrCustomShapeInteraction { - com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > xInteraction; - com::sun::star::awt::Point aPosition; + css::uno::Reference< css::drawing::XCustomShapeHandle > xInteraction; + css::awt::Point aPosition; CustomShapeHandleModes nMode; }; @@ -92,7 +92,7 @@ private: protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; - virtual void impl_setUnoShape(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& rxUnoShape) override; + virtual void impl_setUnoShape(const css::uno::Reference<css::uno::XInterface>& rxUnoShape) override; public: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; @@ -100,19 +100,19 @@ public: // to allow sdr::properties::CustomShapeProperties access friend class sdr::properties::CustomShapeProperties; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mXRenderedCustomShape; + css::uno::Reference< css::drawing::XShape > mXRenderedCustomShape; - mutable com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeEngine > mxCustomShapeEngine; + mutable css::uno::Reference< css::drawing::XCustomShapeEngine > mxCustomShapeEngine; // #i37011# render geometry shadow SdrObject* mpLastShadowGeometry; - com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine() const; + css::uno::Reference< css::drawing::XCustomShapeEngine > GetCustomShapeEngine() const; -// SVX_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > > +// SVX_DLLPRIVATE css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > // SdrObjCustomShape::GetInteraction( const SdrObjCustomShape* pCustomShape ) const; // #i47293# -// SVX_DLLPRIVATE std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > > GetFixedInteractionHandle() const; +// SVX_DLLPRIVATE std::vector< css::uno::Reference< css::drawing::XCustomShapeHandle > > GetFixedInteractionHandle() const; SVX_DLLPRIVATE std::vector< SdrCustomShapeInteraction > GetInteractionHandles() const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 7b498af21124..9eb54d9aaf73 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -482,9 +482,9 @@ public: void SetOrdNum(sal_uInt32 nNum); // GrabBagItem for interim interop purposes - void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; + void GetGrabBagItem(css::uno::Any& rVal) const; - void SetGrabBagItem(const com::sun::star::uno::Any& rVal); + void SetGrabBagItem(const css::uno::Any& rVal); // Return the position in the navigation order for the called object. // Note that this method may update the navigation position of the @@ -879,10 +879,10 @@ public: void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); // access to the UNO representation of the shape - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > getWeakUnoShape() const { return maWeakUnoShape; } + virtual css::uno::Reference< css::uno::XInterface > getUnoShape(); + css::uno::WeakReference< css::uno::XInterface > getWeakUnoShape() const { return maWeakUnoShape; } - static SdrObject* getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ); + static SdrObject* getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt ); // sets a new UNO representation of the shape // This is only a public interface function. The actual work is @@ -890,15 +890,15 @@ public: // Calling this function is only allowed for the UNO representation // itself! void setUnoShape( - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& _rxUnoShape); + const css::uno::Reference< + css::uno::XInterface>& _rxUnoShape); // retrieves the instance responsible for notifying changes in the properties of the shape associated with // the SdrObject // // @precond // There already exists an SvxShape instance associated with the SdrObject - // @throws ::com::sun::star::uno::RuntimeException + // @throws css::uno::RuntimeException // if there does nt yet exists an SvxShape instance associated with the SdrObject. svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); @@ -959,7 +959,7 @@ protected: /// /// The implementation _must_ call the same method of its parent /// class (preferably as the first step)! - virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape ); + virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& _rxUnoShape ); // helper function for reimplementing Clone(). template< typename T > T* CloneHelper() const; @@ -970,7 +970,7 @@ private: // do not use directly, always use getSvxShape() if you have to! SvxShape* mpSvxShape; - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > + css::uno::WeakReference< css::uno::XInterface > maWeakUnoShape; // HACK: Do not automatically insert newly created object into a page. // The user needs to do it manually later. diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 4c1f107edad6..d4bf3df574d7 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -203,7 +203,7 @@ public: // Access to GrafAnimationAllowed flag void SetGrafAnimationAllowed(bool bNew); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getInputStream(); + css::uno::Reference< css::io::XInputStream > getInputStream(); // #i103116# FullDrag support virtual SdrObject* getFullDragClone() const override; diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 7685fe5290d5..59bfe442a49d 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -68,9 +68,9 @@ public: Size getPreferredSize() const; - const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > + const css::uno::Reference< css::graphic::XGraphic > getSnapshot() const; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> + css::uno::Reference< css::io::XInputStream> GetInputStream(); void SetInputStream(css::uno::Reference<css::io::XInputStream> const&); diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index bdd897b21d0d..26a0ad7179e9 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -103,10 +103,10 @@ public: const OUString& GetProgName() const; bool IsEmpty() const; - void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const; + void SetObjRef(const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef); + css::uno::Reference < css::embed::XEmbeddedObject > GetObjRef() const; - SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef_NoInit() const; + SVX_DLLPRIVATE css::uno::Reference < css::embed::XEmbeddedObject > GetObjRef_NoInit() const; void AbandonObject(); @@ -140,15 +140,15 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect) override; virtual void SetGeoData(const SdrObjGeoData& rGeo) override; - static bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, + static bool CanUnloadRunningObj( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); - static bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); + static bool Unload( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); bool Unload(); void Connect(); void Disconnect(); void ObjectLoaded(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel() const; + css::uno::Reference< css::frame::XModel > getXModel() const; bool IsChart() const; bool IsReal3DChart() const; @@ -161,17 +161,17 @@ public: // allows to transfer the graphics to the object helper void SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ); - void SetGraphicToObj( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xGrStream, + void SetGraphicToObj( const css::uno::Reference< css::io::XInputStream >& xGrStream, const OUString& aMediaType ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const; + css::uno::Reference< css::frame::XModel > GetParentXModel() const; bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ); bool AddOwnLightClient(); // handy to get the empty replacement graphic without accessing all the old stuff static Graphic GetEmptyOLEReplacementGraphic(); - void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow); + void SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow); // #i118485# missing converter added virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 8d9eebce9dce..a7fcd40fd93b 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -117,7 +117,7 @@ public: void DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn ); void DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ); - com::sun::star::uno::Reference< com::sun::star::table::XTable > getTable() const; + css::uno::Reference< css::table::XTable > getTable() const; bool isValid( const sdr::table::CellPos& rPos ) const; static CellPos getFirstCell(); @@ -151,8 +151,8 @@ public: const SfxItemSet& GetActiveCellItemSet() const; - void setTableStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAutoFormatStyle ); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& getTableStyle() const; + void setTableStyle( const css::uno::Reference< css::container::XIndexAccess >& xAutoFormatStyle ); + const css::uno::Reference< css::container::XIndexAccess >& getTableStyle() const; // text stuff @@ -256,7 +256,7 @@ public: virtual bool IsVerticalWriting() const override; virtual void SetVerticalWriting(bool bVertical) override; - com::sun::star::text::WritingMode GetWritingMode() const; + css::text::WritingMode GetWritingMode() const; virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 1cbd7eccfed6..46e14b45be18 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -56,19 +56,19 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj bool bOwnUnoControlModel; protected: - ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden + css::uno::Reference< css::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden private: SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName); SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName, - const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac ); public: TYPEINFO_OVERRIDE(); explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true); SdrUnoObj(const OUString& rModelName, - const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac, bool bOwnsModel = true); virtual ~SdrUnoObj(); @@ -95,8 +95,8 @@ public: virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode ) override; - ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > GetUnoControlModel() const {return xUnoControlModel;} - ::com::sun::star::uno::Reference< com::sun::star::awt::XControl > GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const; + css::uno::Reference< css::awt::XControlModel > GetUnoControlModel() const {return xUnoControlModel;} + css::uno::Reference< css::awt::XControl > GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const; /** retrieves a temporary XControl instance for a given output device @@ -122,15 +122,15 @@ public: In particular, the caller is required to dispose it when it's not needed anymore. */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > + 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; const OUString& GetUnoControlTypeName() const { return aUnoControlTypeName; } - virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& xModel ); + virtual void SetUnoControlModel( const css::uno::Reference< css::awt::XControlModel >& xModel ); protected: // SdrObject overridables diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 48c5b5bae554..1665e0446a44 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -149,7 +149,7 @@ public: * SdrPageView instance, the XControlContainer for this output device is returned, <NULL/> * otherwise. */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > GetControlContainer( const OutputDevice& _rDevice ) const; /// Sets all elements in the view which support a design and a alive mode into the given mode diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 3652b59b4e0c..96128017b2ef 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -91,10 +91,10 @@ public: void operator|=(const SetOfByte& r2ndSet); // initialize this set with a uno sequence of sal_Int8 - void PutValue(const com::sun::star::uno::Any & rAny); + void PutValue(const css::uno::Any & rAny); // returns a uno sequence of sal_Int8 - void QueryValue(com::sun::star::uno::Any & rAny) const; + void QueryValue(css::uno::Any & rAny) const; }; #endif // INCLUDED_SVX_SVDSOB_HXX diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 8d8e9983fb7f..0a336f440f09 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -73,8 +73,8 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -87,8 +87,8 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -97,8 +97,8 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -123,8 +123,8 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -133,8 +133,8 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -148,8 +148,8 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; @@ -274,8 +274,8 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 94a91464b0db..641fb9f9fad2 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -71,7 +71,7 @@ public: class AbstractFmShowColsDialog : public VclAbstractDialog { public: - virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols)= 0; + virtual void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols)= 0; }; class AbstractSvxZoomDialog : public VclAbstractDialog @@ -151,7 +151,7 @@ public: class AbstractSvxNewDictionaryDialog :public VclAbstractDialog { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary() = 0; + virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() = 0; }; class AbstractSvxNameDialog :public VclAbstractDialog @@ -345,10 +345,10 @@ public: sal_Int32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) = 0; + css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) = 0; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, + css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0; virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) = 0; @@ -400,7 +400,7 @@ public: )=0; virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, + const css::uno::Reference< css::frame::XFrame >& _rxFrame, sal_uInt32 nResId )=0; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, @@ -414,7 +414,7 @@ public: CreateScriptSelectorDialog( vcl::Window* pParent, bool bShowSlots, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame + const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( @@ -422,9 +422,9 @@ public: virtual VclAbstractDialog* CreateSvxMacroAssignDlg( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, + const css::uno::Reference< css::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) = 0; diff --git a/include/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx index 6ae77fecac83..124434f1e343 100644 --- a/include/svx/swframevalidation.hxx +++ b/include/svx/swframevalidation.hxx @@ -27,11 +27,11 @@ */ struct SvxSwFrameValidation { - sal_Int16 nAnchorType; //com::sun::star::text::TextContentAnchorType - sal_Int16 nHoriOrient; //com::sun::star::text::HoriOrientation - sal_Int16 nVertOrient; //com::sun::star::text::VertOrientation - sal_Int16 nHRelOrient; //com::sun::star::text::RelOrientation - sal_Int16 nVRelOrient; //com::sun::star::text::RelOrientation + sal_Int16 nAnchorType; //css::text::TextContentAnchorType + sal_Int16 nHoriOrient; //css::text::HoriOrientation + sal_Int16 nVertOrient; //css::text::VertOrientation + sal_Int16 nHRelOrient; //css::text::RelOrientation + sal_Int16 nVRelOrient; //css::text::RelOrientation bool bAutoHeight; bool bAutoWidth; bool bMirror; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index f24b2b81ef41..0c333798149d 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -41,8 +41,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; }; diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index b26a69054c8c..033ecfdbb1d6 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -27,32 +27,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 1587a2f65891..7b52ce7bdf97 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -39,8 +39,8 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; @@ -59,8 +59,8 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index f1a598408d57..d880a3baffeb 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -36,8 +36,8 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index b40b377e5dd9..a2990b7593b1 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -35,8 +35,8 @@ namespace svx private: bool m_bDocking; OUString m_sToolboxResName; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XLayoutManager > m_xLayouter; + css::uno::Reference< + css::frame::XLayoutManager > m_xLayouter; public: ToolboxAccess( const OUString& rToolboxName ); diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 4ea4549f7c8b..022350894a41 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -43,16 +43,16 @@ SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uI throw (css::uno::RuntimeException, std::exception); /** Returns a StarOffice API wrapper for the given SdrObject */ -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw (); +SVX_DLLPUBLIC css::uno::Reference< css::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw (); /** Returns the SdrObject from the given StarOffice API wrapper */ -SVX_DLLPUBLIC SdrObject* GetSdrObjectFromXShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) throw() ; +SVX_DLLPUBLIC SdrObject* GetSdrObjectFromXShape( css::uno::Reference< css::drawing::XShape > xShape ) throw() ; /** Returns a StarOffice API wrapper for the given SdrPage */ -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw (); +SVX_DLLPUBLIC css::uno::Reference< css::drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw (); /** Returns the SdrPage from the given StarOffice API wrapper */ -SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage ) throw() ; +SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( css::uno::Reference< css::drawing::XDrawPage > xDrawPage ) throw() ; /** * Maps the vcl MapUnit enum to a API constant MeasureUnit. diff --git a/include/svx/unofill.hxx b/include/svx/unofill.hxx index 49170ab8d549..b316e1b984ac 100644 --- a/include/svx/unofill.hxx +++ b/include/svx/unofill.hxx @@ -25,12 +25,12 @@ class SdrModel; -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel ); #endif // INCLUDED_SVX_UNOFILL_HXX diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx index 55c2909381d5..9e2db415f314 100644 --- a/include/svx/unomaster.hxx +++ b/include/svx/unomaster.hxx @@ -33,29 +33,29 @@ class SvxShapeMaster { public: - virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = 0; + virtual bool queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) = 0; - 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, + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) = 0; + 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) = 0; - 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, + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - 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) = 0; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) = 0; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) = 0; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException) = 0; virtual void dispose() = 0; diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index b298af4cdf3f..153ffbd27724 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -29,29 +29,29 @@ class SdrHint; class SdrModel; class SdrModel; -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw(); +SVX_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw(); -class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiServiceFactory +class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFactory { public: SvxUnoDrawMSFactory() throw() {}; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException); // internal - static ::com::sun::star::uno::Sequence< OUString > - concatServiceNames( ::com::sun::star::uno::Sequence< OUString >& rServices1, - ::com::sun::star::uno::Sequence< OUString >& rServices2 ) throw(); + static css::uno::Sequence< OUString > + concatServiceNames( css::uno::Sequence< OUString >& rServices1, + css::uno::Sequence< OUString >& rServices2 ) throw(); /** fills the given EventObject from the given SdrHint. @returns true if the SdrHint could be translated to an EventObject<br> false if not */ - static bool createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ); + static bool createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, css::document::EventObject& aEvent ); protected: ~SvxUnoDrawMSFactory() {} diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 3a432a98df84..7cce6bc7018a 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -33,25 +33,25 @@ class SdrModel; class SVX_DLLPUBLIC SvxUnoDrawingModel : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other public SvxUnoDrawMSFactory, - public ::com::sun::star::drawing::XDrawPagesSupplier, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::ucb::XAnyCompareFactory + public css::drawing::XDrawPagesSupplier, + public css::lang::XServiceInfo, + public css::ucb::XAnyCompareFactory { friend class SvxUnoDrawPagesAccess; private: SdrModel* mpDoc; - ::com::sun::star::uno::WeakReference< ::com::sun::star::drawing::XDrawPages > mxDrawPagesAccess; + css::uno::WeakReference< css::drawing::XDrawPages > mxDrawPagesAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDashTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxHatchTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxBitmapTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxTransGradientTable; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxMarkerTable; + css::uno::Reference< css::uno::XInterface > mxDashTable; + css::uno::Reference< css::uno::XInterface > mxGradientTable; + css::uno::Reference< css::uno::XInterface > mxHatchTable; + css::uno::Reference< css::uno::XInterface > mxBitmapTable; + css::uno::Reference< css::uno::XInterface > mxTransGradientTable; + css::uno::Reference< css::uno::XInterface > mxMarkerTable; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; + css::uno::Sequence< css::uno::Type > maTypeSequence; public: SvxUnoDrawingModel( SdrModel* pDoc ) throw(); @@ -60,41 +60,41 @@ public: SdrModel* GetDoc() const { return mpDoc; } // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(css::uno::RuntimeException, std::exception) override; // XMultiServiceFactory ( SvxUnoDrawMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) 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; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; }; -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pExportService ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pImportService ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pExportService ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pImportService ); #endif diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index f1ce0fd82377..b18111e2e93e 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -56,12 +56,12 @@ class SvxShapeConnector; #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) -class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun::star::drawing::XDrawPage, - ::com::sun::star::drawing::XShapeGrouper, - ::com::sun::star::drawing::XShapes2, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XComponent>, +class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawing::XDrawPage, + css::drawing::XShapeGrouper, + css::drawing::XShapes2, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::lang::XComponent>, public SfxListener, protected SvxMutexHelper { @@ -72,8 +72,8 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun: SdrModel* mpModel; SdrView* mpView; - void _SelectObjectsInView( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& aShapes, SdrPageView* pPageView ) throw (); - void _SelectObjectInView( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, SdrPageView* pPageView ) throw(); + void _SelectObjectsInView( const css::uno::Reference< css::drawing::XShapes >& aShapes, SdrPageView* pPageView ) throw (); + void _SelectObjectInView( const css::uno::Reference< css::drawing::XShape >& xShape, SdrPageView* pPageView ) throw(); virtual void disposing() throw(); @@ -86,21 +86,21 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun: void ChangeModel( SdrModel* pNewModel ); // Creation of a SdrObject and insertion into the SdrPage - SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bBeginning = false ) throw(); + SdrObject *CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape, bool bBeginning = false ) throw(); // Determine Type and Inventor static void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw(); // Creating a SdrObject using it's Description. // Can be used by derived classes to support their owen Shapes (e.g. Controls). - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) + virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception); static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); // The following method is called if a SvxShape object is to be created. // Derived classes can create a derivation or an SvxShape aggregating object. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const + virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception); UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage ) @@ -112,36 +112,36 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun: virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) + throw (css::uno::RuntimeException, std::exception) override; // XShapes2 - virtual void SAL_CALL addTop( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addBottom( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) 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; // XShapeGrouper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) throw(css::uno::RuntimeException, std::exception) 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; // 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 >& aListener ) 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 >& aListener ) 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; }; #endif diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 7ea24b05769c..909e843146a8 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -35,8 +35,8 @@ class SfxItemPool; classes can set a model on demand by overiding getModelPool(). */ class SVX_DLLPUBLIC SvxUnoDrawPool : public ::cppu::OWeakAggObject, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, public comphelper::PropertySetHelper { public: @@ -52,33 +52,33 @@ public: virtual SfxItemPool* getModelPool( bool bReadOnly ) throw(); // overriden helpers from comphelper::PropertySetHelper - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override; + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override; - virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::beans::PropertyState* pStates ) throw(::com::sun::star::beans::UnknownPropertyException ) override; - virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException ) override; - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override; + virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates ) throw(css::beans::UnknownPropertyException ) override; + virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException ) override; + virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) 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; protected: void init(); - static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException); - virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException); + virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); protected: SdrModel* mpModel; diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index 9e425c92873c..81e1ada9f7e0 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -39,7 +39,7 @@ class UHashMap public: static sal_uInt32 getId( const OUString& rCompareString ); static OUString getNameFromId (sal_uInt32 nId); - static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); + static css::uno::Sequence< OUString > getServiceNames(); }; /** diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 766dbe588dd6..843b7c964cb1 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -87,34 +87,34 @@ class SvxItemPropertySet; class SfxItemSet; void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, - const com::sun::star::uno::Any& rVal, SfxItemSet& rSet ); + const css::uno::Any& rVal, SfxItemSet& rSet ); -com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); +css::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); // WARNING: if you update the supported interfaces, // also update SvxShape::_getTypes() typedef ::cppu::WeakAggImplHelper12< - ::com::sun::star::drawing::XShape, - ::com::sun::star::lang::XComponent, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XMultiPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::container::XNamed, - ::com::sun::star::drawing::XGluePointsSupplier, - ::com::sun::star::container::XChild, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::document::XActionLockable, - ::com::sun::star::beans::XMultiPropertyStates> SvxShape_UnoImplHelper; + css::drawing::XShape, + css::lang::XComponent, + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::beans::XPropertyState, + css::lang::XUnoTunnel, + css::container::XNamed, + css::drawing::XGluePointsSupplier, + css::container::XChild, + css::lang::XServiceInfo, + css::document::XActionLockable, + css::beans::XMultiPropertyStates> SvxShape_UnoImplHelper; class SVX_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, public SfxListener, public SvxShapeMutex { private: - ::com::sun::star::awt::Size maSize; - ::com::sun::star::awt::Point maPosition; + css::awt::Size maSize; + css::awt::Point maPosition; OUString maShapeType; OUString maShapeName; @@ -122,7 +122,7 @@ private: SvxShapeImpl* mpImpl; bool mbIsMultiPropertyCall; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XIndexContainer > mxGluePoints; + css::uno::WeakReference< css::container::XIndexContainer > mxGluePoints; protected: friend class SvxDrawPage; @@ -141,7 +141,7 @@ protected: void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw(); - ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; + css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); @@ -160,10 +160,10 @@ protected: void endSetPropertyValues(); // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); public: SvxShape( SdrObject* pObj ) throw (css::uno::RuntimeException); @@ -187,7 +187,7 @@ public: void InvalidateSdrObject() { mpObj.reset( NULL ); }; SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } - ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const + css::uno::Any GetBitmap( bool bMetaFile = false ) const throw (css::uno::RuntimeException, std::exception); svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); @@ -207,17 +207,17 @@ public: UNO3_GETIMPLEMENTATION_DECL( SvxShape ) // access methods for master objects - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - 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); - ::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); + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( ) throw(css::uno::RuntimeException); + 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); + css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL _setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::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); + css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + void SAL_CALL _setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() throw(css::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL _getTypes( ) throw(::com::sun::star::uno::RuntimeException); + css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes( ) throw(css::uno::RuntimeException); void setMaster( SvxShapeMaster* pMaster ); @@ -225,86 +225,86 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) 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; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, 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; // 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; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::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::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (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; // XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertiesToDefault( - const ::com::sun::star::uno::Sequence< + const css::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( - const ::com::sun::star::uno::Sequence< + const css::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; // XGluePointsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getGluePoints( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getGluePoints( ) throw(css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) override; private: /** initializes SdrObj-dependent members. Only to be called when GetSdrObject() != NULL @@ -327,10 +327,10 @@ protected: protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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 bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; - virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; public: SvxShapeText( SdrObject* pObj ) throw (); @@ -340,28 +340,28 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::text::XTextRange + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; }; class SvxShapeRect : public SvxShapeText @@ -371,27 +371,27 @@ public: virtual ~SvxShapeRect() throw (); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ class SvxShapeGroup : public SvxShape, - public ::com::sun::star::drawing::XShapeGroup, - public ::com::sun::star::drawing::XShapes2, - public ::com::sun::star::drawing::XShapes + public css::drawing::XShapeGroup, + public css::drawing::XShapes2, + public css::drawing::XShapes { private: rtl::Reference< SvxDrawPage> mxPage; - void addUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, size_t nPos ); + void addUnoShape( const css::uno::Reference< css::drawing::XShape >& xShape, size_t nPos ); public: SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw (); @@ -400,53 +400,53 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XShapes2 - virtual void SAL_CALL addTop( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addBottom( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) 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; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XShapeGroup - virtual void SAL_CALL enterGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL leaveGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterGroup( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL leaveGroup( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; }; #include <com/sun/star/drawing/XConnectorShape.hpp> /*********************************************************************** * * ***********************************************************************/ -class SvxShapeConnector : public ::com::sun::star::drawing::XConnectorShape, +class SvxShapeConnector : public css::drawing::XConnectorShape, public SvxShapeText { public: @@ -454,39 +454,39 @@ public: virtual ~SvxShapeConnector() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XConnectorShape - virtual void SAL_CALL connectStart( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL connectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectBegin( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connectStart( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnectBegin( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; }; #include <com/sun/star/drawing/XControlShape.hpp> /*********************************************************************** * * ***********************************************************************/ -class SVX_DLLPUBLIC SvxShapeControl : public ::com::sun::star::drawing::XControlShape, public SvxShapeText +class SVX_DLLPUBLIC SvxShapeControl : public css::drawing::XControlShape, public SvxShapeText { protected: using SvxUnoTextRangeBase::setPropertyValue; @@ -497,39 +497,39 @@ public: virtual ~SvxShapeControl() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XPropertySet - 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 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; // 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 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 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; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XControlShape - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getControl() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getControl() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setControl( const css::uno::Reference< css::awt::XControlModel >& xControl ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -542,7 +542,7 @@ public: virtual ~SvxShapeDimensioning() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -555,7 +555,7 @@ public: virtual ~SvxShapeCircle() throw (); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -567,8 +567,8 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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 bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; void resetModifiedState(); @@ -583,7 +583,7 @@ public: bool createLink( const OUString& aLinkURL ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; }; @@ -595,27 +595,27 @@ public: class SvxShapePolyPolygon : public SvxShapeText { private: - ::com::sun::star::drawing::PolygonKind mePolygonKind; + css::drawing::PolygonKind mePolygonKind; protected: using SvxUnoTextRangeBase::setPropertyValue; using SvxUnoTextRangeBase::getPropertyValue; // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; public: - SvxShapePolyPolygon( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_LINE ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::beans::PropertyVetoException); + SvxShapePolyPolygon( SdrObject* pObj , css::drawing::PolygonKind eNew = css::drawing::PolygonKind_LINE ) throw(css::lang::IllegalArgumentException, css::beans::PropertyVetoException); virtual ~SvxShapePolyPolygon() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} + css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -625,7 +625,7 @@ public: class SvxShapePolyPolygonBezier : public SvxShapeText { private: - ::com::sun::star::drawing::PolygonKind mePolygonKind; + css::drawing::PolygonKind mePolygonKind; protected: using SvxUnoTextRangeBase::setPropertyValue; @@ -633,19 +633,19 @@ protected: public: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - SvxShapePolyPolygonBezier( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_PATHLINE) throw(); + SvxShapePolyPolygonBezier( SdrObject* pObj , css::drawing::PolygonKind eNew = css::drawing::PolygonKind_PATHLINE) throw(); virtual ~SvxShapePolyPolygonBezier() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} + css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -658,8 +658,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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 bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; public: SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw(); @@ -672,7 +672,7 @@ private: /*********************************************************************** * * ***********************************************************************/ -class Svx3DSceneObject : public ::com::sun::star::drawing::XShapes, public SvxShape +class Svx3DSceneObject : public css::drawing::XShapes, public SvxShape { private: rtl::Reference< SvxDrawPage > mxPage; @@ -684,7 +684,7 @@ protected: public: Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw(); // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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 bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -695,29 +695,29 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) 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; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -727,15 +727,15 @@ class Svx3DCubeObject : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; public: Svx3DCubeObject( SdrObject* pObj ) throw(); virtual ~Svx3DCubeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -747,13 +747,13 @@ public: Svx3DSphereObject( SdrObject* pObj ) throw(); protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual ~Svx3DSphereObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -763,15 +763,15 @@ class Svx3DLatheObject : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; public: Svx3DLatheObject( SdrObject* pObj ) throw(); virtual ~Svx3DLatheObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -783,13 +783,13 @@ public: Svx3DExtrudeObject( SdrObject* pObj ) throw(); protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual ~Svx3DExtrudeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -799,22 +799,22 @@ class Svx3DPolygonObject : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; public: Svx3DPolygonObject( SdrObject* pObj ) throw(); virtual ~Svx3DPolygonObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** * * ***********************************************************************/ typedef ::cppu::WeakAggImplHelper1< - ::com::sun::star::drawing::XEnhancedCustomShapeDefaulter + css::drawing::XEnhancedCustomShapeDefaulter > SvxShape_UnoImplHelper1; class SVX_DLLPUBLIC SvxCustomShape : public SvxShapeText, public SvxShape_UnoImplHelper1 @@ -829,7 +829,7 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // override these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual ~SvxCustomShape() throw (); @@ -837,29 +837,29 @@ public: virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XPropertySet - void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, std::exception) override; + void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; //XEnhancedCustomShapeDefaulter - virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (css::uno::RuntimeException, std::exception) override; }; /*********************************************************************** @@ -874,8 +874,8 @@ public: protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) 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) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: OUString referer_; @@ -892,14 +892,14 @@ private: class SVX_DLLPUBLIC SvxDummyShapeContainer : public SvxShape { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > m_xDummyObject; public: - SvxDummyShapeContainer( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xWrappedObject ); + SvxDummyShapeContainer( css::uno::Reference< css::drawing::XShapes > xWrappedObject ); virtual ~SvxDummyShapeContainer() throw(); - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > getWrappedShape() + css::uno::Reference< css::drawing::XShapes > getWrappedShape() { return m_xDummyObject; } }; diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 2f8e35e78782..cf0bf7a4c662 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -206,11 +206,11 @@ { OUString(UNO_NAME_SHADOWYDIST), SDRATTR_SHADOWYDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, #define LINE_PROPERTIES_DEFAULTS\ - { OUString(UNO_NAME_LINECAP), XATTR_LINECAP, ::cppu::UnoType<com::sun::star::drawing::LineCap>::get(), 0, 0}, \ + { OUString(UNO_NAME_LINECAP), XATTR_LINECAP, ::cppu::UnoType<css::drawing::LineCap>::get(), 0, 0}, \ { OUString(UNO_NAME_LINECOLOR), XATTR_LINECOLOR, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ { OUString(UNO_NAME_LINEENDCENTER), XATTR_LINEENDCENTER, cppu::UnoType<bool>::get() , 0, 0}, \ { OUString(UNO_NAME_LINEENDWIDTH), XATTR_LINEENDWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_LINEJOINT), XATTR_LINEJOINT, ::cppu::UnoType<com::sun::star::drawing::LineJoint>::get(), 0, 0}, \ + { OUString(UNO_NAME_LINEJOINT), XATTR_LINEJOINT, ::cppu::UnoType<css::drawing::LineJoint>::get(), 0, 0}, \ { OUString(UNO_NAME_LINESTARTCENTER), XATTR_LINESTARTCENTER, cppu::UnoType<bool>::get() , 0, 0}, \ { OUString(UNO_NAME_LINESTARTWIDTH), XATTR_LINESTARTWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_LINESTYLE), XATTR_LINESTYLE, cppu::UnoType<css::drawing::LineStyle>::get() , 0, 0}, \ @@ -218,14 +218,14 @@ { OUString(UNO_NAME_LINEWIDTH), XATTR_LINEWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, #define LINE_PROPERTIES \ - { OUString(UNO_NAME_LINEDASH), XATTR_LINEDASH, ::cppu::UnoType<com::sun::star::drawing::LineDash>::get() , 0, MID_LINEDASH}, \ + { OUString(UNO_NAME_LINEDASH), XATTR_LINEDASH, ::cppu::UnoType<css::drawing::LineDash>::get() , 0, MID_LINEDASH}, \ { OUString("LineDashName"), XATTR_LINEDASH, ::cppu::UnoType<OUString>::get() , 0, MID_NAME}, \ LINE_PROPERTIES_DEFAULTS #define LINE_PROPERTIES_START_END \ - { OUString(UNO_NAME_LINEEND), XATTR_LINEEND, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString(UNO_NAME_LINEEND), XATTR_LINEEND, ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ { OUString("LineEndName"), XATTR_LINEEND, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ - { OUString(UNO_NAME_LINESTART), XATTR_LINESTART, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString(UNO_NAME_LINESTART), XATTR_LINESTART, ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ { OUString("LineStartName"), XATTR_LINESTART, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, #define FILL_PROPERTIES_BMP \ @@ -234,12 +234,12 @@ { OUString(UNO_NAME_FILLBMP_OFFSET_Y), XATTR_FILLBMP_TILEOFFSETY, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_X), XATTR_FILLBMP_POSOFFSETX, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ { OUString(UNO_NAME_FILLBMP_POSITION_OFFSET_Y), XATTR_FILLBMP_POSOFFSETY, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ - { OUString(UNO_NAME_FILLBMP_RECTANGLE_POINT), XATTR_FILLBMP_POS, ::cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLBMP_RECTANGLE_POINT), XATTR_FILLBMP_POS, ::cppu::UnoType<css::drawing::RectanglePoint>::get() , 0, 0}, \ { OUString(UNO_NAME_FILLBMP_SIZE_X), XATTR_FILLBMP_SIZEX, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_FILLBMP_SIZE_Y), XATTR_FILLBMP_SIZEY, ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_FILLBMP_STRETCH), XATTR_FILLBMP_STRETCH, cppu::UnoType<bool>::get() , 0, 0}, \ { OUString(UNO_NAME_FILLBMP_TILE), XATTR_FILLBMP_TILE, cppu::UnoType<bool>::get() , 0, 0},\ - { OUString(UNO_NAME_FILLBMP_MODE), OWN_ATTR_FILLBMP_MODE, ::cppu::UnoType<com::sun::star::drawing::BitmapMode>::get(), 0, 0}, + { OUString(UNO_NAME_FILLBMP_MODE), OWN_ATTR_FILLBMP_MODE, ::cppu::UnoType<css::drawing::BitmapMode>::get(), 0, 0}, #define FILL_PROPERTIES_DEFAULTS \ { OUString(UNO_NAME_FILLCOLOR), XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ @@ -252,22 +252,22 @@ { OUString(UNO_NAME_FILLBITMAPNAME), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ { OUString(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP , ::cppu::UnoType<OUString>::get(), 0, MID_GRAFURL }, \ { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT), XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ - { OUString(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , ::cppu::UnoType<com::sun::star::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ + { OUString(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , ::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ { OUString(UNO_NAME_FILLGRADIENTNAME), XATTR_FILLGRADIENT , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , ::cppu::UnoType<com::sun::star::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \ + { OUString(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , ::cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \ { OUString(UNO_NAME_FILLHATCHNAME), XATTR_FILLHATCH , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ - { OUString(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , ::cppu::UnoType<com::sun::star::drawing::FillStyle>::get() , 0, 0}, \ + { OUString(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , ::cppu::UnoType<css::drawing::FillStyle>::get() , 0, 0}, \ { OUString(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() , 0, 0}, \ - { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<com::sun::star::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ + { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \ { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENTNAME), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \ { OUString(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<com::sun::star::text::GraphicCrop>::get(), 0, 0 }, + { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 }, #define EDGERADIUS_PROPERTIES \ { OUString(UNO_NAME_EDGERADIUS), SDRATTR_ECKENRADIUS , ::cppu::UnoType<sal_Int32>::get() , 0, SFX_METRIC_ITEM}, #define TEXT_PROPERTIES_DEFAULTS\ - { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0},\ + { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::cppu::UnoType<css::text::WritingMode>::get(), 0, 0},\ { OUString(UNO_NAME_TEXT_ANIAMOUNT), SDRATTR_TEXT_ANIAMOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_TEXT_ANICOUNT), SDRATTR_TEXT_ANICOUNT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_TEXT_ANIDELAY), SDRATTR_TEXT_ANIDELAY, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ @@ -299,20 +299,20 @@ SVX_UNOEDIT_NUMBERING_PROPERTIE, \ TEXT_PROPERTIES_DEFAULTS -// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, +// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, #define MISC_OBJ_PROPERTIES_NO_SHEAR \ { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_FRAMERECT), OWN_ATTR_FRAMERECT, cppu::UnoType<css::awt::Rectangle>::get(), 0, 0 }, \ { OUString(UNO_NAME_MISC_OBJ_ROTATEANGLE), SDRATTR_ROTATEANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_BITMAP), OWN_ATTR_BITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString("IsFontwork"), OWN_ATTR_ISFONTWORK, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_BITMAP), OWN_ATTR_BITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("IsFontwork"), OWN_ATTR_ISFONTWORK, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, #define MISC_OBJ_PROPERTIES \ - { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), 0, 0}, \ + { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, \ MISC_OBJ_PROPERTIES_NO_SHEAR \ { OUString(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, @@ -325,19 +325,19 @@ { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString("Visible"), SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , cppu::UnoType<bool>::get(), 0, 0},\ - { OUString("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString("UINamePlural"), OWN_ATTR_UINAME_PLURAL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("UINamePlural"), OWN_ATTR_UINAME_PLURAL , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ /* #i68101# */ \ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0}, \ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0}, #define LINKTARGET_PROPERTIES \ - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, #define CONNECTOR_PROPERTIES \ - { OUString(UNO_NAME_EDGEKIND), SDRATTR_EDGEKIND, ::cppu::UnoType<com::sun::star::drawing::ConnectorType>::get(), 0, 0}, \ + { OUString(UNO_NAME_EDGEKIND), SDRATTR_EDGEKIND, ::cppu::UnoType<css::drawing::ConnectorType>::get(), 0, 0}, \ { OUString(UNO_NAME_EDGENODE1HORZDIST), SDRATTR_EDGENODE1HORZDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_EDGENODE1VERTDIST), SDRATTR_EDGENODE1VERTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_EDGENODE2HORZDIST), SDRATTR_EDGENODE2HORZDIST, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ @@ -348,19 +348,19 @@ { OUString(UNO_NAME_EDGELINE1DELTA), SDRATTR_EDGELINE1DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_EDGELINE2DELTA), SDRATTR_EDGELINE2DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_EDGELINE3DELTA), SDRATTR_EDGELINE3DELTA, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString("StartShape"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("StartShape"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ { OUString("StartGluePointIndex"), OWN_ATTR_GLUEID_HEAD, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString("StartPosition"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0}, \ - { OUString("EndShape"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EndPosition"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0},\ + { OUString("StartPosition"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<css::awt::Point>::get(), 0, 0}, \ + { OUString("EndShape"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("EndPosition"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<css::awt::Point>::get(), 0, 0},\ { OUString("EndGluePointIndex"), OWN_ATTR_GLUEID_TAIL, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ \ - { OUString("EdgeStartConnection"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EdgeStartPoint"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { OUString("EdgeEndConnection"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { OUString("EdgeEndPoint"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("EdgeStartConnection"), OWN_ATTR_EDGE_START_OBJ, cppu::UnoType<css::drawing::XShape>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("EdgeStartPoint"), OWN_ATTR_EDGE_START_POS, ::cppu::UnoType<css::awt::Point>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { OUString("EdgeEndConnection"), OWN_ATTR_EDGE_END_OBJ, cppu::UnoType<css::drawing::XShape>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, \ + { OUString("EdgeEndPoint"), OWN_ATTR_EDGE_END_POS, ::cppu::UnoType<css::awt::Point>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ \ - { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_EDGE_POLYPOLYGONBEZIER, ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ { OUString(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, cppu::UnoType<bool>::get(), 0, 0}, \ @@ -369,7 +369,7 @@ { OUString(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_MEASUREHELPLINEDIST), SDRATTR_MEASUREHELPLINEDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_MEASUREHELPLINEOVERHANG), SDRATTR_MEASUREHELPLINEOVERHANG, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_MEASUREKIND), SDRATTR_MEASUREKIND, ::cppu::UnoType<com::sun::star::drawing::MeasureKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASUREKIND), SDRATTR_MEASUREKIND, ::cppu::UnoType<css::drawing::MeasureKind>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURELINEDIST), SDRATTR_MEASURELINEDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_MEASUREOVERHANG), SDRATTR_MEASUREOVERHANG, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_MEASUREUNIT), SDRATTR_MEASUREUNIT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\ @@ -377,33 +377,33 @@ { OUString(UNO_NAME_MEASURETEXTAUTOANGLE), SDRATTR_MEASURETEXTAUTOANGLE, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTAUTOANGLEVIEW), SDRATTR_MEASURETEXTAUTOANGLEVIEW, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTFIXEDANGLE), SDRATTR_MEASURETEXTFIXEDANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTHPOS), SDRATTR_MEASURETEXTHPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASURETEXTHPOS), SDRATTR_MEASURETEXTHPOS, ::cppu::UnoType<css::drawing::MeasureTextHorzPos>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTISFIXEDANGLE), SDRATTR_MEASURETEXTISFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTROTA90), SDRATTR_MEASURETEXTROTA90, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_MEASURETEXTUPSIDEDOWN), SDRATTR_MEASURETEXTUPSIDEDOWN, cppu::UnoType<bool>::get(), 0, 0}, \ - { OUString(UNO_NAME_MEASURETEXTVPOS), SDRATTR_MEASURETEXTVPOS, ::cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get(), 0, 0}, \ + { OUString(UNO_NAME_MEASURETEXTVPOS), SDRATTR_MEASURETEXTVPOS, ::cppu::UnoType<css::drawing::MeasureTextVertPos>::get(), 0, 0}, \ { OUString("MeasureDecimalPlaces"), SDRATTR_MEASUREDECIMALPLACES, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define SPECIAL_DIMENSIONING_PROPERTIES \ SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ - { OUString("StartPosition"), OWN_ATTR_MEASURE_START_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0},\ - { OUString("EndPosition"), OWN_ATTR_MEASURE_END_POS, ::cppu::UnoType<com::sun::star::awt::Point>::get(), 0, 0}, + { OUString("StartPosition"), OWN_ATTR_MEASURE_START_POS, ::cppu::UnoType<css::awt::Point>::get(), 0, 0},\ + { OUString("EndPosition"), OWN_ATTR_MEASURE_END_POS, ::cppu::UnoType<css::awt::Point>::get(), 0, 0}, #define SPECIAL_CIRCLE_PROPERTIES \ { OUString(UNO_NAME_CIRCENDANGLE), SDRATTR_CIRCENDANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_CIRCKIND), SDRATTR_CIRCKIND, ::cppu::UnoType<com::sun::star::drawing::CircleKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_CIRCKIND), SDRATTR_CIRCKIND, ::cppu::UnoType<css::drawing::CircleKind>::get(), 0, 0}, \ { OUString(UNO_NAME_CIRCSTARTANGLE),SDRATTR_CIRCSTARTANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SPECIAL_POLYGON_PROPERTIES \ - { OUString(UNO_NAME_POLYGONKIND), OWN_ATTR_VALUE_POLYGONKIND, ::cppu::UnoType<com::sun::star::drawing::PolygonKind>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_POLYGONKIND), OWN_ATTR_VALUE_POLYGONKIND, ::cppu::UnoType<css::drawing::PolygonKind>::get(), css::beans::PropertyAttribute::READONLY, 0}, #define SPECIAL_POLYPOLYGON_PROPERTIES \ - { OUString(UNO_NAME_POLYPOLYGON), OWN_ATTR_VALUE_POLYPOLYGON, ::cppu::UnoType<com::sun::star::drawing::PointSequenceSequence>::get(), 0, 0}, \ - { OUString(UNO_NAME_POLYGON), OWN_ATTR_VALUE_POLYGON, ::cppu::UnoType<com::sun::star::drawing::PointSequence>::get(), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGON), OWN_ATTR_VALUE_POLYPOLYGON, ::cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0}, \ + { OUString(UNO_NAME_POLYGON), OWN_ATTR_VALUE_POLYGON, ::cppu::UnoType<css::drawing::PointSequence>::get(), 0, 0}, #define SPECIAL_POLYPOLYGONBEZIER_PROPERTIES \ - { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_VALUE_POLYPOLYGONBEZIER, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, + { OUString(UNO_NAME_POLYPOLYGONBEZIER), OWN_ATTR_VALUE_POLYPOLYGONBEZIER, ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0}, #define SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ { OUString(UNO_NAME_GRAPHIC_LUMINANCE), SDRATTR_GRAFLUMINANCE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ @@ -413,14 +413,14 @@ { OUString(UNO_NAME_GRAPHIC_BLUE), SDRATTR_GRAFBLUE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_GRAPHIC_GAMMA), SDRATTR_GRAFGAMMA , cppu::UnoType<double>::get(), 0, 0}, \ { OUString(UNO_NAME_GRAPHIC_TRANSPARENCY), SDRATTR_GRAFTRANSPARENCE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ - { OUString(UNO_NAME_GRAPHIC_COLOR_MODE), SDRATTR_GRAFMODE , ::cppu::UnoType<com::sun::star::drawing::ColorMode>::get(), 0, 0}, + { OUString(UNO_NAME_GRAPHIC_COLOR_MODE), SDRATTR_GRAFMODE , ::cppu::UnoType<css::drawing::ColorMode>::get(), 0, 0}, #define SPECIAL_GRAPHOBJ_PROPERTIES \ SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<com::sun::star::text::GraphicCrop>::get(), 0, 0 }, \ + { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , ::cppu::UnoType<OUString>::get(), 0, 0 }, \ - { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ + { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, \ { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , cppu::UnoType<css::awt::XBitmap>::get() , 0, 0}, \ { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get() , 0, 0}, @@ -437,14 +437,14 @@ { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_6), SDRATTR_3DSCENE_LIGHTCOLOR_6 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_7), SDRATTR_3DSCENE_LIGHTCOLOR_7 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTCOLOR_8), SDRATTR_3DSCENE_LIGHTCOLOR_8 , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_1), SDRATTR_3DSCENE_LIGHTDIRECTION_1 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_2), SDRATTR_3DSCENE_LIGHTDIRECTION_2 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_3), SDRATTR_3DSCENE_LIGHTDIRECTION_3 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_4), SDRATTR_3DSCENE_LIGHTDIRECTION_4 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_5), SDRATTR_3DSCENE_LIGHTDIRECTION_5 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8 , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_1), SDRATTR_3DSCENE_LIGHTDIRECTION_1 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_2), SDRATTR_3DSCENE_LIGHTDIRECTION_2 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_3), SDRATTR_3DSCENE_LIGHTDIRECTION_3 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_4), SDRATTR_3DSCENE_LIGHTDIRECTION_4 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_5), SDRATTR_3DSCENE_LIGHTDIRECTION_5 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_6), SDRATTR_3DSCENE_LIGHTDIRECTION_6 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_7), SDRATTR_3DSCENE_LIGHTDIRECTION_7 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_LIGHTDIRECTION_8), SDRATTR_3DSCENE_LIGHTDIRECTION_8 , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_1), SDRATTR_3DSCENE_LIGHTON_1 , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_2), SDRATTR_3DSCENE_LIGHTON_2 , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_LIGHTON_3), SDRATTR_3DSCENE_LIGHTON_3 , cppu::UnoType<bool>::get(), 0, 0}, \ @@ -455,13 +455,13 @@ { OUString(UNO_NAME_3D_SCENE_LIGHTON_8), SDRATTR_3DSCENE_LIGHTON_8 , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_PERSPECTIVE), SDRATTR_3DSCENE_PERSPECTIVE , cppu::UnoType<css::drawing::ProjectionMode>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_SHADOW_SLANT), SDRATTR_3DSCENE_SHADOW_SLANT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SCENE_SHADE_MODE), SDRATTR_3DSCENE_SHADE_MODE , ::cppu::UnoType<com::sun::star::drawing::ShadeMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SCENE_SHADE_MODE), SDRATTR_3DSCENE_SHADE_MODE , ::cppu::UnoType<css::drawing::ShadeMode>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING),SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, cppu::UnoType<bool>::get(), 0, 0}, #define SPECIAL_3DSCENEOBJECT_PROPERTIES \ SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX), OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_CAMERA_GEOMETRY), OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY , ::cppu::UnoType<com::sun::star::drawing::CameraGeometry>::get(), 0, 0}, + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX), OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_CAMERA_GEOMETRY), OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY , ::cppu::UnoType<css::drawing::CameraGeometry>::get(), 0, 0}, // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY) @@ -472,25 +472,25 @@ { OUString(UNO_NAME_3D_MAT_SPECULAR) ,SDRATTR_3DOBJ_MAT_SPECULAR , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_MAT_SPECULAR_INTENSITY) ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_NORMALS_INVERT) ,SDRATTR_3DOBJ_NORMALS_INVERT , cppu::UnoType<bool>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_NORMALS_KIND) ,SDRATTR_3DOBJ_NORMALS_KIND , ::cppu::UnoType<com::sun::star::drawing::NormalsKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_NORMALS_KIND) ,SDRATTR_3DOBJ_NORMALS_KIND , ::cppu::UnoType<css::drawing::NormalsKind>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_SHADOW_3D) ,SDRATTR_3DOBJ_SHADOW_3D , cppu::UnoType<bool>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_TEXTURE_FILTER) ,SDRATTR_3DOBJ_TEXTURE_FILTER , cppu::UnoType<bool>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_KIND) ,SDRATTR_3DOBJ_TEXTURE_KIND , ::cppu::UnoType<com::sun::star::drawing::TextureKind>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_MODE) ,SDRATTR_3DOBJ_TEXTURE_MODE , ::cppu::UnoType<com::sun::star::drawing::TextureMode>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_PROJ_X) ,SDRATTR_3DOBJ_TEXTURE_PROJ_X , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTURE_PROJ_Y) ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y , ::cppu::UnoType<com::sun::star::drawing::TextureProjectionMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_KIND) ,SDRATTR_3DOBJ_TEXTURE_KIND , ::cppu::UnoType<css::drawing::TextureKind>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_MODE) ,SDRATTR_3DOBJ_TEXTURE_MODE , ::cppu::UnoType<css::drawing::TextureMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_PROJ_X) ,SDRATTR_3DOBJ_TEXTURE_PROJ_X , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTURE_PROJ_Y) ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_REDUCED_LINE_GEOMETRY) ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY , cppu::UnoType<bool>::get(), 0, 0}, #define SPECIAL_3DCUBEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS_IS_CENTER) ,OWN_ATTR_3D_VALUE_POS_IS_CENTER , cppu::UnoType<bool>::get(), 0, 0}, #define SPECIAL_3DSPHEREOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_POS) ,OWN_ATTR_3D_VALUE_POSITION , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<com::sun::star::drawing::Direction3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_SIZE) ,OWN_ATTR_3D_VALUE_SIZE , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, @@ -503,24 +503,24 @@ { OUString(UNO_NAME_3D_CLOSE_BACK) , SDRATTR_3DOBJ_CLOSE_BACK, cppu::UnoType<bool>::get(), 0, 0}, #define SPECIAL_3DLATHEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_LATHE_END_ANGLE) ,SDRATTR_3DOBJ_END_ANGLE ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_HORZ_SEGS) ,SDRATTR_3DOBJ_HORZ_SEGS ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_VERT_SEGS) ,SDRATTR_3DOBJ_VERT_SEGS ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, #define SPECIAL_3DEXTRUDEOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_EXTRUDE_DEPTH) ,SDRATTR_3DOBJ_DEPTH ,::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_3D_PERCENT_DIAGONAL) ,SDRATTR_3DOBJ_PERCENT_DIAGONAL ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define SPECIAL_3DPOLYGONOBJECT_PROPERTIES \ - { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::cppu::UnoType<com::sun::star::drawing::HomogenMatrix>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D , ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_NORMALSPOLYGON3D) ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ - { OUString(UNO_NAME_3D_TEXTUREPOLYGON3D) ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<com::sun::star::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TRANSFORM_MATRIX) ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_POLYPOLYGON3D) ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D , ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_NORMALSPOLYGON3D) ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ + { OUString(UNO_NAME_3D_TEXTUREPOLYGON3D) ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \ { OUString(UNO_NAME_3D_LINEONLY) ,OWN_ATTR_3D_VALUE_LINEONLY , cppu::UnoType<bool>::get(), 0, 0}, #define SPECIAL_3DBACKSCALE_PROPERTIES \ diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index a32cb284a48b..b59a6406630e 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -44,8 +44,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const override; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // leer - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; // leer + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // leer + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; // leer }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 98301e3d227f..21f9b04a5516 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -55,8 +55,8 @@ public: virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 2a0bce5beaf3..2345482ccea2 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -39,8 +39,8 @@ public: XColorItem() {} XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; XColorItem(sal_uInt16 nWhich, const Color& rTheColor); XColorItem(sal_uInt16 nWhich, const OUString& rName, const Color& rTheColor); diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index cd43c98a1e5d..65097f4997e3 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -41,8 +41,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 28dae1181017..e08eeaab9584 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -42,8 +42,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 836bcf4e6a86..62a9b024062a 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -44,8 +44,8 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const override; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index c391656bdc8a..fe6d89b95ffa 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -49,8 +49,8 @@ public: virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 88cb845bfc63..7e9a8329f317 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -46,8 +46,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index 1099a6f10475..c5de3b0a8ea1 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -40,8 +40,8 @@ public: virtual sal_uInt16 GetValueCount() const override; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; #endif diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 534b636ce651..5daf0f1ffc00 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -41,8 +41,8 @@ public: virtual sal_uInt16 GetValueCount() const override; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; #endif diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 70cb6821daf6..f71fe97d6a19 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -32,20 +32,20 @@ class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem { public: TYPEINFO_OVERRIDE(); - XLineStyleItem(com::sun::star::drawing::LineStyle = com::sun::star::drawing::LineStyle_SOLID); + XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID); XLineStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const override; virtual sal_uInt16 GetValueCount() const override; - css::drawing::LineStyle GetValue() const { return (com::sun::star::drawing::LineStyle) SfxEnumItem::GetValue(); } + css::drawing::LineStyle GetValue() const { return (css::drawing::LineStyle) SfxEnumItem::GetValue(); } }; #endif diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 5f12cd30e0fe..1026f8b17903 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -33,21 +33,21 @@ class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem { public: TYPEINFO_OVERRIDE(); - XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND ); + XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND ); XLineJointItem( SvStream& rIn ); virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const override; virtual sal_uInt16 GetValueCount() const override; - com::sun::star::drawing::LineJoint GetValue() const { return (com::sun::star::drawing::LineJoint) SfxEnumItem::GetValue(); } + css::drawing::LineJoint GetValue() const { return (css::drawing::LineJoint) SfxEnumItem::GetValue(); } }; #endif // INCLUDED_SVX_XLINJOIT_HXX diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 79c513f3b7a8..0e2c5add0a8e 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -33,21 +33,21 @@ class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem { public: TYPEINFO_OVERRIDE(); - XLineCapItem(com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT); + XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); XLineCapItem(SvStream& rIn); virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const override; virtual sal_uInt16 GetValueCount() const override; - com::sun::star::drawing::LineCap GetValue() const; + css::drawing::LineCap GetValue() const; }; #endif // INCLUDED_SVX_XLNCAPIT_HXX diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 4be1208ffdf1..db57dc08f81b 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -38,8 +38,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 82b1767d08fa..3ef685dd85f8 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -47,8 +47,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 1d4e49692419..36ec83137479 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -35,8 +35,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index d7b0632bb6a4..886cc77c5f2e 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -46,8 +46,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index e5794a057796..fecb8716a9d3 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -38,8 +38,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index 5f2cd2287946..ff05e382b2ca 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -35,8 +35,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 95adeb57230e..c9c9ac45f884 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -46,8 +46,8 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index d09ff1cbd652..e6264737c2cb 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -37,8 +37,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 3aa36048210a..17172caf8f52 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -35,8 +35,8 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index e9ad3ea0fe00..6cf1ee9fedb5 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -51,8 +51,8 @@ struct OUStringLess; class OutputStorageWrapper_Impl; class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImplHelper2< - ::com::sun::star::document::XEmbeddedObjectResolver, - ::com::sun::star::container::XNameAccess > + css::document::XEmbeddedObjectResolver, + css::container::XNameAccess > { typedef ::std::map< OUString, OutputStorageWrapper_Impl*, OUStringLess > SvXMLEmbeddedObjectHelper_Impl; @@ -65,10 +65,10 @@ private: OUString maCurContainerStorageName; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxRootStorage; // package + css::uno::Reference < css::embed::XStorage > mxRootStorage; // package ::comphelper::IEmbeddedHelper* mpDocPersist; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxContainerStorage; // container sub package for - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxTempStorage; // package + css::uno::Reference < css::embed::XStorage > mxContainerStorage; // container sub package for + css::uno::Reference < css::embed::XStorage > mxTempStorage; // package // objects SvXMLEmbeddedObjectHelperMode meCreateMode; SvXMLEmbeddedObjectHelper_Impl *mpStreamMap; @@ -81,7 +81,7 @@ private: bool *pGraphicRepl=0, bool *pOasisFormat=0 ) const; - SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XStorage > ImplGetContainerStorage( + SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > ImplGetContainerStorage( const OUString& rStorageName ); SVX_DLLPRIVATE bool ImplReadObject( @@ -93,14 +93,14 @@ private: SVX_DLLPRIVATE OUString ImplInsertEmbeddedObjectURL( const OUString& rURLStr ); - SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > ImplGetReplacementImage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj ); + SVX_DLLPRIVATE css::uno::Reference< css::io::XInputStream > ImplGetReplacementImage( + const css::uno::Reference< css::embed::XEmbeddedObject >& xObj ); protected: SvXMLEmbeddedObjectHelper(); virtual ~SvXMLEmbeddedObjectHelper(); - void Init( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + void Init( const css::uno::Reference < css::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); @@ -112,7 +112,7 @@ public: SvXMLEmbeddedObjectHelperMode eCreateMode ); static SvXMLEmbeddedObjectHelper* Create( - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + const css::uno::Reference < css::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode, bool bDirect = true ); @@ -124,16 +124,16 @@ public: void Flush(); // XEmbeddedObjectResolver - virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) 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; // XNameAccess - 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; static void splitObjectURL(const OUString& aURLNoPar, diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 0cf81488b6ca..f6a969000ca1 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -39,12 +39,12 @@ enum SvXMLGraphicHelperMode struct SvxGraphicHelperStream_Impl { - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > xStorage; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream; + css::uno::Reference < css::embed::XStorage > xStorage; + css::uno::Reference < css::io::XStream > xStream; }; -class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, - ::com::sun::star::document::XBinaryStreamResolver > +class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, + css::document::XBinaryStreamResolver > { private: @@ -52,10 +52,10 @@ private: typedef ::std::vector< URLPair > URLPairVector; typedef ::std::vector< GraphicObject > GraphicObjectVector; typedef ::std::set< OUString > URLSet; - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > > GraphicOutputStreamVector; + typedef ::std::vector< css::uno::Reference< css::io::XOutputStream > > GraphicOutputStreamVector; ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > mxRootStorage; + css::uno::Reference < css::embed::XStorage > mxRootStorage; OUString maCurStorageName; URLPairVector maGrfURLs; GraphicObjectVector maGrfObjs; @@ -85,7 +85,7 @@ private: protected: SvXMLGraphicHelper(); virtual ~SvXMLGraphicHelper(); - void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage, + void Init( const css::uno::Reference < css::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, bool bDirect ); @@ -94,7 +94,7 @@ protected: public: SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ); - static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage, + static SvXMLGraphicHelper* Create( const css::uno::Reference < css::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, bool bDirect = true ); static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode ); @@ -104,12 +104,12 @@ public: public: // XGraphicObjectResolver - virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(css::uno::RuntimeException, std::exception) override; // XBinaryStreamResolver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL createOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveOutputStream( const css::uno::Reference< css::io::XOutputStream >& rxBinaryStream ) throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 37fe77d550be..6562a6fa31eb 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -60,7 +60,7 @@ public: static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL ); static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index ad23fe7ab8a2..14589b59790b 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -216,15 +216,15 @@ public: static OUString GetDefaultExtFilter(XPropertyListType t); OUString GetDefaultExt() const { return GetDefaultExt(meType); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + virtual css::uno::Reference< css::container::XNameContainer > createInstance() = 0; bool Load(); - bool LoadFrom(const ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage > &xStorage, + bool LoadFrom(const css::uno::Reference< + css::embed::XStorage > &xStorage, const OUString &rURL, const OUString &rReferer); bool Save(); - bool SaveTo (const ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage > &xStorage, + bool SaveTo (const css::uno::Reference< + css::embed::XStorage > &xStorage, const OUString &rURL, OUString *pOptName); virtual bool Create() = 0; @@ -267,7 +267,7 @@ public: XColorEntry* Replace(long nIndex, XColorEntry* pEntry); XColorEntry* Remove(long nIndex); XColorEntry* GetColor(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; static XColorListRef CreateStdColorList(); @@ -287,7 +287,7 @@ public: XLineEndEntry* Remove(long nIndex); XLineEndEntry* GetLineEnd(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; }; @@ -312,7 +312,7 @@ public: XDashEntry* Remove(long nIndex); XDashEntry* GetDash(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; // Special call to get a bitmap for the solid line representation. It @@ -341,7 +341,7 @@ public: XHatchEntry* Remove(long nIndex); XHatchEntry* GetHatch(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; }; @@ -360,7 +360,7 @@ public: XGradientEntry* Remove(long nIndex); XGradientEntry* GetGradient(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; }; @@ -378,7 +378,7 @@ public: XBitmapEntry* Remove(long nIndex); XBitmapEntry* GetBitmap(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() override; + virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; }; diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index 6241b9e01e36..851a932cd014 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -41,8 +41,8 @@ public: virtual sal_uInt16 GetValueCount() const override; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; /************************************************************************* diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 84dcb598dfbf..1fa187de167a 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { - com::sun::star::uno::Sequence < sal_Int32 > maValues; + css::uno::Sequence < sal_Int32 > maValues; sal_uInt16 mnMinZoom; sal_uInt16 mnMaxZoom; @@ -40,7 +40,7 @@ public: virtual ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); - const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} + const css::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} sal_uInt16 GetMinZoom() const {return mnMinZoom;} sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} @@ -49,8 +49,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const override; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 52c73eb0572f..ad7ee08bea82 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -38,9 +38,9 @@ namespace toolkit struct AnimatedImagesPeer_Data; typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow - , ::com::sun::star::awt::XAnimation - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + , css::awt::XAnimation + , css::container::XContainerListener + , css::util::XModifyListener > AnimatedImagesPeer_Base; class AnimatedImagesPeer :public AnimatedImagesPeer_Base @@ -53,27 +53,27 @@ namespace toolkit public: // XAnimation - virtual void SAL_CALL startAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopAnimation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAnimationRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startAnimation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stopAnimation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnimationRunning( ) throw (css::uno::RuntimeException, std::exception) override; // VclWindowPeer - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; protected: void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) override; @@ -81,7 +81,7 @@ namespace toolkit private: /** updates our images with the ones from the given XAnimatedImages component */ - void impl_updateImages_nolck( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_animatedImages ); + void impl_updateImages_nolck( const css::uno::Reference< css::uno::XInterface >& i_animatedImages ); private: AnimatedImagesPeer(const AnimatedImagesPeer&) = delete; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index e804e2a50295..b1fda894b29f 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -53,7 +53,7 @@ class AccessibleStateSetHelper; typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; typedef ::cppu::ImplHelper1< - ::com::sun::star::lang::XServiceInfo > VCLXAccessibleComponent_BASE; + css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; class VCLExternalSolarLock; @@ -63,7 +63,7 @@ class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent ,public VCLXAccessibleComponent_BASE { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow; + css::uno::Reference< css::awt::XWindow> mxWindow; VCLXWindow* mpVCLXindow; VCLExternalSolarLock* m_pSolarLock; @@ -77,7 +77,7 @@ protected: virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent ); + virtual css::uno::Reference< css::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent ); public: VCLXAccessibleComponent( VCLXWindow* pVCLXindow ); @@ -92,43 +92,43 @@ public: virtual void SAL_CALL disposing() override; - // ::com::sun::star::uno::XInterface + // css::uno::XInterface DECLARE_XINTERFACE() - // ::com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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; - - // ::com::sun::star::accessibility::XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::accessibility::XAccessibleComponent - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::accessibility::XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) 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& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + + // css::accessibility::XAccessibleContext + sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + + // css::accessibility::XAccessibleComponent + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::accessibility::XAccessibleExtendedComponent + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; protected: // base class overridables - ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override; + css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; private: /** we may be reparented (if external components use OAccessibleImplementationAccess base class), @@ -137,7 +137,7 @@ private: @precond the caller must ensure thread safety, i.e. our mutex must be locked */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > getVclParent() const; }; diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 996f0a7853ca..9e5391f0a874 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -33,10 +33,10 @@ // class VCLXBitmap -class VCLXBitmap : public ::com::sun::star::awt::XBitmap, - public ::com::sun::star::awt::XDisplayBitmap, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::lang::XUnoTunnel, +class VCLXBitmap : public css::awt::XBitmap, + public css::awt::XDisplayBitmap, + public css::lang::XTypeProvider, + public css::lang::XUnoTunnel, public ::cppu::OWeakObject { private: @@ -52,24 +52,24 @@ public: const BitmapEx& GetBitmap() const { return maBitmap; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXBitmap* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XBitmap - ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XBitmap + css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index e07e56cfd346..7cafa4ac9764 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -34,35 +34,35 @@ // class VCLXContainer -class TOOLKIT_DLLPUBLIC VCLXContainer : public ::com::sun::star::awt::XVclContainer, - public ::com::sun::star::awt::XVclContainerPeer, +class TOOLKIT_DLLPUBLIC VCLXContainer : public css::awt::XVclContainer, + public css::awt::XVclContainerPeer, public VCLXWindow { public: VCLXContainer(); virtual ~VCLXContainer(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclContainer - void SAL_CALL addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > SAL_CALL getWindows( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclContainer + void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > SAL_CALL getWindows( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclContainerPeer - void SAL_CALL enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& WindowOrder, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Windows ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclContainerPeer + void SAL_CALL enableDialogControl( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& WindowOrder, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Windows ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index dc2846235f02..b5f984423bd6 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -39,10 +39,10 @@ class VirtualDevice; /// An UNO wrapper for the VCL OutputDevice class TOOLKIT_DLLPUBLIC VCLXDevice : - public ::com::sun::star::awt::XDevice, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::lang::XUnoTunnel, - public ::com::sun::star::awt::XUnitConversion, + public css::awt::XDevice, + public css::lang::XTypeProvider, + public css::lang::XUnoTunnel, + public css::awt::XUnitConversion, public ::cppu::OWeakObject { friend class VCLXGraphics; @@ -64,34 +64,34 @@ public: void SetCreatedWithToolkit( bool bCreatedWithToolkit ); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XDevice, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL createGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( const ::com::sun::star::awt::FontDescriptor& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& Bitmap ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XUnitConversion - ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXDevice* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XDevice, + css::uno::Reference< css::awt::XGraphics > SAL_CALL createGraphics( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::awt::FontDescriptor > SAL_CALL getFontDescriptors( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XFont > SAL_CALL getFont( const css::awt::FontDescriptor& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XBitmap > SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& Bitmap ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XUnitConversion + css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index fe4fe68ee3dd..c65684682bff 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -33,14 +33,14 @@ // class VCLXFont -class TOOLKIT_DLLPUBLIC VCLXFont : public ::com::sun::star::awt::XFont2, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::lang::XUnoTunnel, +class TOOLKIT_DLLPUBLIC VCLXFont : public css::awt::XFont2, + public css::lang::XTypeProvider, + public css::lang::XUnoTunnel, public ::cppu::OWeakObject { private: ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; + css::uno::Reference< css::awt::XDevice> mxDevice; vcl::Font maFont; FontMetric* mpFontMetric; @@ -52,34 +52,34 @@ public: VCLXFont(); virtual ~VCLXFont(); - void Init( ::com::sun::star::awt::XDevice& rxDev, const vcl::Font& rFont ); + void Init( css::awt::XDevice& rxDev, const vcl::Font& rFont ); const vcl::Font& GetFont() const { return maFont; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XFont - ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XFont2 - sal_Bool SAL_CALL hasGlyphs( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXFont* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XFont + css::awt::FontDescriptor SAL_CALL getFontDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getStringWidth( const OUString& str ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getKernPairs( css::uno::Sequence< sal_Unicode >& rnChars1, css::uno::Sequence< sal_Unicode >& rnChars2, css::uno::Sequence< sal_Int16 >& rnKerns ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XFont2 + sal_Bool SAL_CALL hasGlyphs( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 4d73bec1724c..d7111f36a6ad 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -54,14 +54,14 @@ namespace o3tl // class VCLXGraphics -class VCLXGraphics : public ::com::sun::star::awt::XGraphics2, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::lang::XUnoTunnel, +class VCLXGraphics : public css::awt::XGraphics2, + public css::lang::XTypeProvider, + public css::lang::XUnoTunnel, public ::cppu::OWeakObject { private: // used to return same reference on each call to getDevice() - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; + css::uno::Reference< css::awt::XDevice> mxDevice; VclPtr<OutputDevice> mpOutputDevice; vcl::Font maFont; @@ -84,54 +84,54 @@ public: void SetOutputDevice( OutputDevice* pOutDev ); OutputDevice* GetOutputDevice() const { return mpOutputDevice; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XGraphics Attributes - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XGraphics Methods - virtual void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL push( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL pop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataY ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& Longs ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXGraphics* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XGraphics Attributes + virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRasterOp( css::awt::RasterOperation _rasterop ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFont( const css::uno::Reference< css::awt::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (css::uno::RuntimeException, std::exception) override; + + // css::awt::XGraphics Methods + virtual void SAL_CALL selectFont( const css::awt::FontDescriptor& aDescription ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClipRegion( const css::uno::Reference< css::awt::XRegion >& Clipping ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL intersectClipRegion( const css::uno::Reference< css::awt::XRegion >& xClipping ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL push( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL pop( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL copy( const css::uno::Reference< css::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL draw( const css::uno::Reference< css::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawPolyLine( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawPolygon( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawPolyPolygon( const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataX, const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataY ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const css::awt::Gradient& aGradient ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const css::uno::Sequence< ::sal_Int32 >& Longs ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const css::uno::Reference< css::graphic::XGraphic >& aGraphic ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 7d6bb277cca9..18c41f89ad30 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -49,14 +49,14 @@ public: const Pointer& GetPointer() const { return maPointer; } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXPointer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XPointer - void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXPointer* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XPointer + void SAL_CALL setType( sal_Int32 nType ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index d73ffa343d73..e89613c0cd61 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -50,7 +50,7 @@ // class VCLXPrinterPropertySet -typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XPrinterPropertySet +typedef ::cppu::WeakImplHelper < css::awt::XPrinterPropertySet > VCLXPrinterPropertySet_Base; class VCLXPrinterPropertySet :public VCLXPrinterPropertySet_Base ,public MutexAndBroadcastHelper @@ -58,7 +58,7 @@ class VCLXPrinterPropertySet :public VCLXPrinterPropertySet_Base { protected: VclPtr<Printer> mxPrinter; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxPrnDevice; + css::uno::Reference< css::awt::XDevice > mxPrnDevice; sal_Int16 mnOrientation; bool mbHorizontal; @@ -67,36 +67,36 @@ public: virtual ~VCLXPrinterPropertySet(); Printer* GetPrinter() const { return mxPrinter.get(); } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > GetDevice(); + css::uno::Reference< css::awt::XDevice > GetDevice(); - // ::com::sun::star::uno::XInterface + // css::uno::XInterface DECLARE_XINTERFACE(); - // ::com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider DECLARE_XTYPEPROVIDER(); - // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setPropertyValue( const OUString& rPropertyName, 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 { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { return OPropertySetHelper::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } + // css::beans::XPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } + css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return OPropertySetHelper::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) override; - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; using cppu::OPropertySetHelper::getFastPropertyValue; - void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; - - // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; + + // css::awt::XPrinterPropertySet + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; }; @@ -104,7 +104,7 @@ public: typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet - , ::com::sun::star::awt::XPrinter + , css::awt::XPrinter > VCLXPrinter_Base; class VCLXPrinter: public VCLXPrinter_Base { @@ -114,28 +114,28 @@ public: VCLXPrinter( const OUString& rPrinterName ); virtual ~VCLXPrinter(); - // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const OUString& rPropertyName, 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 { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } - - // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); } - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); } - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); } - - // ::com::sun::star::awt::XPrinter - sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + + // css::awt::XPrinterPropertySet + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } + css::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); } + void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); } + + // css::awt::XPrinter + sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(css::awt::PrinterException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL end( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL terminate( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XDevice > SAL_CALL startPage( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL endPage( ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override; }; @@ -143,7 +143,7 @@ public: typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet - , ::com::sun::star::awt::XInfoPrinter + , css::awt::XInfoPrinter > VCLXInfoPrinter_Base; class VCLXInfoPrinter: public VCLXInfoPrinter_Base { @@ -151,40 +151,40 @@ public: VCLXInfoPrinter( const OUString& rPrinterName ); virtual ~VCLXInfoPrinter(); - // ::com::sun::star::beans::XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const OUString& rPropertyName, 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 { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } - - // ::com::sun::star::awt::XPrinterPropertySet - void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); } - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); } - void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); } - - // ::com::sun::star::awt::XInfoPrinter - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createDevice( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + + // css::awt::XPrinterPropertySet + void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } + css::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); } + void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); } + + // css::awt::XInfoPrinter + css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice( ) throw(css::uno::RuntimeException, std::exception) override; }; // class VCLXPrinterServer -typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XPrinterServer, +typedef ::cppu::WeakImplHelper < css::awt::XPrinterServer, css::lang::XServiceInfo > VCLXPrinterServer_Base; class VCLXPrinterServer : public VCLXPrinterServer_Base { public: - // ::com::sun::star::awt::XPrinterServer - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XPrinterServer + css::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 915416d95db1..727baebd0c75 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -33,9 +33,9 @@ // class VCLXRegion -class VCLXRegion : public ::com::sun::star::awt::XRegion, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::lang::XUnoTunnel, +class VCLXRegion : public css::awt::XRegion, + public css::lang::XTypeProvider, + public css::lang::XUnoTunnel, public ::cppu::OWeakObject { private: @@ -51,33 +51,33 @@ public: const vcl::Region& GetRegion() const { return maRegion; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXRegion* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XRegion - ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL unionRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL intersectRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL excludeRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL xOrRectangle( const ::com::sun::star::awt::Rectangle& rRect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL unionRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL intersectRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL excludeRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL xOrRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::awt::Rectangle > SAL_CALL getRectangles() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXRegion* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XRegion + css::awt::Rectangle SAL_CALL getBounds() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL unionRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL intersectRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL excludeRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL xOrRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::awt::Rectangle > SAL_CALL getRectangles() throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 58185376196b..d7114a175b2c 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -33,7 +33,7 @@ namespace toolkit //= VCLXSpinButton - typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XSpinValue + typedef ::cppu::ImplHelper1 < css::awt::XSpinValue > VCLXSpinButton_Base; class VCLXSpinButton :public VCLXWindow @@ -55,26 +55,26 @@ namespace toolkit DECLARE_XTYPEPROVIDER() // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; // XSpinValue - virtual void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( sal_Int32 n ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinimum( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaximum( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrientation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int32 n ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinimum( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaximum( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getOrientation( ) throw (css::uno::RuntimeException, std::exception) override; // VclWindowPeer - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // VCLXWindow void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) override; diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index b108495f2bbe..29840ffb5458 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -32,24 +32,24 @@ // class VCLXSystemDependendtWindow -class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt::XSystemDependentWindowPeer, +class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDependentWindowPeer, public VCLXWindow { public: VCLXSystemDependentWindow(); virtual ~VCLXSystemDependentWindow(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XSystemDependendtWindowPeer - ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XSystemDependendtWindowPeer + css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index 96464a988377..92d10d1a176d 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -35,8 +35,8 @@ typedef ::cppu::ImplInheritanceHelper2 < VCLXContainer - , ::com::sun::star::awt::tab::XTabPageContainer - , ::com::sun::star::container::XContainerListener + , css::awt::tab::XTabPageContainer + , css::container::XContainerListener > VCLXTabPageContainer_Base; class VCLXTabPageContainer : public VCLXTabPageContainer_Base { @@ -44,37 +44,37 @@ public: VCLXTabPageContainer(); virtual ~VCLXTabPageContainer(); - // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDevice, + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::grid::XTabPageContainer - virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::grid::XTabPageContainer + virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; private: TabPageListenerMultiplexer m_aTabPageListeners; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages; + ::std::vector< css::uno::Reference< css::awt::tab::XTabPage > > m_aTabPages; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 88a2d0fde117..5335e700f3e0 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -30,9 +30,9 @@ #include <toolkit/awt/vclxcontainer.hxx> -typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XTopWindow2 +typedef ::cppu::ImplHelper1 < css::awt::XTopWindow2 > VCLXTopWindow_XBase; -typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XSystemDependentWindowPeer +typedef ::cppu::ImplHelper1 < css::awt::XSystemDependentWindowPeer > VCLXTopWindow_SBase; class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base :public VCLXTopWindow_XBase @@ -42,7 +42,7 @@ private: const bool m_bWHWND; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar> mxMenuBar; + css::uno::Reference< css::awt::XMenuBar> mxMenuBar; virtual vcl::Window* GetWindowImpl() = 0; @@ -54,27 +54,27 @@ public: virtual ~VCLXTopWindow_Base(); // XInterface equivalents - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider equivalents - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XSystemDependentWindowPeer - ::com::sun::star::uno::Any SAL_CALL getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XSystemDependentWindowPeer + css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTopWindow - void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL toFront() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL toBack() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTopWindow + void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL toFront() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL toBack() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) throw(css::uno::RuntimeException, std::exception) override; // XTopWindow2 - virtual sal_Bool SAL_CALL getIsMaximized() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIsMaximized( sal_Bool _ismaximized ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIsMinimized() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisplay() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + virtual sal_Bool SAL_CALL getIsMaximized() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsMaximized( sal_Bool _ismaximized ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsMinimized() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDisplay() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; }; @@ -92,14 +92,14 @@ public: VCLXTopWindow(bool bWHWND = false); virtual ~VCLXTopWindow(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 9d52e4f5243d..a353c4a44b43 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -62,15 +62,15 @@ namespace toolkit class UnoPropertyArrayHelper; class VCLXWindowImpl; typedef ::cppu::ImplInheritanceHelper9 < VCLXDevice - , ::com::sun::star::awt::XWindow2 - , ::com::sun::star::awt::XVclWindowPeer - , ::com::sun::star::awt::XLayoutConstrains - , ::com::sun::star::awt::XView - , ::com::sun::star::awt::XDockableWindow - , ::com::sun::star::accessibility::XAccessible - , ::com::sun::star::lang::XEventListener - , ::com::sun::star::beans::XPropertySetInfo - , ::com::sun::star::awt::XStyleSettingsSupplier + , css::awt::XWindow2 + , css::awt::XVclWindowPeer + , css::awt::XLayoutConstrains + , css::awt::XView + , css::awt::XDockableWindow + , css::accessibility::XAccessible + , css::lang::XEventListener + , css::beans::XPropertySetInfo + , css::awt::XStyleSettingsSupplier > VCLXWindow_Base; class TOOLKIT_DLLPUBLIC VCLXWindow : public VCLXWindow_Base @@ -85,13 +85,13 @@ protected: DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext(); void SetSynthesizingVCLEvent( bool b ); bool IsSynthesizingVCLEvent() const; - void SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ); + void SetSystemParent_Impl( const css::uno::Any& rHandle ); ::toolkit::IAccessibleFactory& getAccessibleFactory(); @@ -138,100 +138,100 @@ public: void notifyWindowRemoved( vcl::Window& _rWindow ); - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static VCLXWindow* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rrxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XWindowPeer - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > SAL_CALL getToolkit( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& Pointer ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setBackground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL invalidate( sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL invalidateRect( const ::com::sun::star::awt::Rectangle& Rect, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XVclWindowPeer - sal_Bool SAL_CALL isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Peer ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) - throw(::com::sun::star::uno::RuntimeException, + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static VCLXWindow* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XWindow + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Rectangle SAL_CALL getPosSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEnable( sal_Bool Enable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XWindowPeer + css::uno::Reference< css::awt::XToolkit > SAL_CALL getToolkit( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setPointer( const css::uno::Reference< css::awt::XPointer >& Pointer ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setBackground( sal_Int32 Color ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL invalidate( sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL invalidateRect( const css::awt::Rectangle& Rect, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XVclWindowPeer + sal_Bool SAL_CALL isChild( const css::uno::Reference< css::awt::XWindowPeer >& Peer ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDesignMode( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableClipSiblings( sal_Bool bClip ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setForeground( sal_Int32 Color ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setControlFont( const css::awt::FontDescriptor& aFont ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) + throw(css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XView - sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::accessibility::XAccessible - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XDockableWindow - void SAL_CALL addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isFloating( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL startPopupMode( const ::com::sun::star::awt::Rectangle& WindowRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isInPopupMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XWindow2 - void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::beans::XPropertySetInfo - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XView + sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(css::uno::RuntimeException, std::exception) override; + + // css::accessibility::XAccessible + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::awt::XDockableWindow + void SAL_CALL addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableDocking( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isFloating( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFloatingMode( sal_Bool bFloating ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL unlock( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL startPopupMode( const css::awt::Rectangle& WindowRect ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isInPopupMode( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::awt::XWindow2 + void SAL_CALL setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getOutputSize( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isVisible( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEnabled( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasFocus( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::beans::XPropertySetInfo + css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; + css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; // XStyleSettingsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index ddf65c247cf7..8de05e041250 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -119,12 +119,12 @@ protected: const Image& GetImage() const { return maImage; } protected: - // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XWindow + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; protected: /** forward our bitmap to our window @@ -146,8 +146,8 @@ public: // class VCLXButton typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl - , ::com::sun::star::awt::XButton - , ::com::sun::star::awt::XToggleButton + , css::awt::XButton + , css::awt::XToggleButton > VCLXButton_Base; class VCLXButton :public VCLXButton_Base { @@ -158,34 +158,34 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXButton(); virtual ~VCLXButton(); - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XToggleButton - // ::com::sun::star::awt::XItemEventBroadcaster - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XToggleButton + // css::awt::XItemEventBroadcaster + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -200,14 +200,14 @@ public: VCLXImageControl(); virtual ~VCLXImageControl(); - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -219,8 +219,8 @@ protected: // class VCLXCheckBox -class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, - public ::com::sun::star::awt::XButton, +class VCLXCheckBox : public css::awt::XCheckBox, + public css::awt::XButton, public VCLXGraphicControl { private: @@ -230,45 +230,45 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXCheckBox(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XCheckBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XCheckBox + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getState( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setState( sal_Int16 n ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton: - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton: + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -277,8 +277,8 @@ public: // class VCLXRadioButton -class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, - public ::com::sun::star::awt::XButton, +class VCLXRadioButton : public css::awt::XRadioButton, + public css::awt::XButton, public VCLXGraphicControl { private: @@ -289,43 +289,43 @@ private: protected: void ImplClickedOrToggled( bool bToggled ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXRadioButton(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XRadioButton - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XRadioButton + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL getState( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton: - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton: + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -335,32 +335,32 @@ public: // class VCLXMessageBox -class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, +class VCLXMessageBox : public css::awt::XMessageBox, public VCLXTopWindow { public: VCLXMessageBox(); virtual ~VCLXMessageBox(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XMessageBox - void SAL_CALL setCaptionText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getCaptionText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMessageText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XMessageBox + void SAL_CALL setCaptionText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getCaptionText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMessageText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getMessageText( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL execute( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -378,23 +378,23 @@ public: VCLXFrame(); virtual ~VCLXFrame(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDevice, + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -405,43 +405,43 @@ public: // class VCLXDialog -class TOOLKIT_DLLPUBLIC VCLXDialog : public ::com::sun::star::awt::XDialog2, +class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, public VCLXTopWindow { public: VCLXDialog(); virtual ~VCLXDialog(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDialog2 - virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDialog2 + virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL endExecute( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDialog + void SAL_CALL setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getTitle( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL execute( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL endExecute( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDevice, + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; }; @@ -454,30 +454,30 @@ public: VCLXTabPage(); virtual ~VCLXTabPage(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDevice, + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - TabPage* getTabPage() const throw ( ::com::sun::star::uno::RuntimeException); + TabPage* getTabPage() const throw ( css::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; -class VCLXMultiPage : public ::com::sun::star::awt::XSimpleTabController, public VCLXContainer +class VCLXMultiPage : public css::awt::XSimpleTabController, public VCLXContainer { TabListenerMultiplexer maTabListeners; sal_Int32 mTabId; @@ -487,41 +487,41 @@ public: VCLXMultiPage(); virtual ~VCLXMultiPage(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDevice, - ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDevice, + css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XVclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XSimpleTabController - virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // C++ - TabControl* getTabControl() const throw ( ::com::sun::star::uno::RuntimeException); + TabControl* getTabControl() const throw ( css::uno::RuntimeException); sal_uInt16 insertTab( TabPage*, OUString& sTitle ); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -531,7 +531,7 @@ public: // class VCLXFixedHyperlink class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink : - public ::com::sun::star::awt::XFixedHyperlink, + public css::awt::XFixedHyperlink, public VCLXWindow { private: @@ -540,43 +540,43 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXFixedHyperlink(); virtual ~VCLXFixedHyperlink(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XFixedHyperlink + void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAlignment( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -585,35 +585,35 @@ public: // class VCLXFixedText -class VCLXFixedText : public ::com::sun::star::awt::XFixedText, +class VCLXFixedText : public css::awt::XFixedText, public VCLXWindow { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXFixedText(); virtual ~VCLXFixedText(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XFixedText + void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAlignment( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -622,7 +622,7 @@ public: // class VCLXScrollBar -class VCLXScrollBar : public ::com::sun::star::awt::XScrollBar, +class VCLXScrollBar : public css::awt::XScrollBar, public VCLXWindow { private: @@ -630,51 +630,51 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXScrollBar(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XScrollbar - void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XScrollbar + void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getMaximum( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getLineIncrement( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBlockIncrement( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getVisibleSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getOrientation( ) throw(css::uno::RuntimeException, std::exception) override; // why isn't this part of the XScrollbar? - void SAL_CALL setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getMinimum( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMinimum( sal_Int32 n ) throw(css::uno::RuntimeException); + sal_Int32 SAL_CALL getMinimum( ) throw(css::uno::RuntimeException); - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException); + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override; + static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -683,9 +683,9 @@ public: // class VCLXEdit -class TOOLKIT_DLLPUBLIC VCLXEdit : public ::com::sun::star::awt::XTextComponent, - public ::com::sun::star::awt::XTextEditField, - public ::com::sun::star::awt::XTextLayoutConstrains, +class TOOLKIT_DLLPUBLIC VCLXEdit : public css::awt::XTextComponent, + public css::awt::XTextEditField, + public css::awt::XTextLayoutConstrains, public VCLXWindow { private: @@ -693,7 +693,7 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: @@ -701,48 +701,48 @@ public: TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTextComponent - void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextComponent + void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTextEditField: - void SAL_CALL setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextEditField: + void SAL_CALL setEchoChar( sal_Unicode cEcho ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -752,9 +752,9 @@ public: // class VCLXListBox typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow - , ::com::sun::star::awt::XListBox - , ::com::sun::star::awt::XTextLayoutConstrains - , ::com::sun::star::awt::XItemListListener + , css::awt::XListBox + , css::awt::XTextLayoutConstrains + , css::awt::XItemListListener > VCLXListBox_Base; class VCLXListBox : public VCLXListBox_Base { @@ -764,62 +764,62 @@ private: protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; void ImplCallItemListeners(); public: VCLXListBox(); - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XListBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XListBox + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getItems( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getSelectedItemPos( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getSelectedItem( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isMutipleMode( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTextLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -829,8 +829,8 @@ public: // class VCLXComboBox typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit - , ::com::sun::star::awt::XComboBox - , ::com::sun::star::awt::XItemListListener > VCLXComboBox_Base; + , css::awt::XComboBox + , css::awt::XItemListListener > VCLXComboBox_Base; class VCLXComboBox : public VCLXComboBox_Base { private: @@ -839,51 +839,51 @@ private: protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXComboBox(); virtual ~VCLXComboBox(); - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XComboBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XComboBox + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getItems( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTextLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -892,7 +892,7 @@ public: // class VCLXSpinField -class TOOLKIT_DLLPUBLIC VCLXSpinField : public ::com::sun::star::awt::XSpinField, +class TOOLKIT_DLLPUBLIC VCLXSpinField : public css::awt::XSpinField, public VCLXEdit { private: @@ -904,24 +904,24 @@ protected: public: VCLXSpinField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XSpinField - void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL up( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL down( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL first( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL last( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XSpinField + void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL up( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL down( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL first( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL last( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -947,9 +947,9 @@ public: void setStrictFormat( bool bStrict ); bool isStrictFormat(); - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -958,46 +958,46 @@ public: // class VCLXDateField -class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField, +class TOOLKIT_DLLPUBLIC VCLXDateField : public css::awt::XDateField, public VCLXFormattedSpinField { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXDateField(); virtual ~VCLXDateField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - - // ::com::sun::star::awt::XDateField - void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + + // css::awt::XDateField + void SAL_CALL setDate( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getDate( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isLongFormat( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1006,43 +1006,43 @@ public: // class VCLXTimeField -class VCLXTimeField : public ::com::sun::star::awt::XTimeField, +class VCLXTimeField : public css::awt::XTimeField, public VCLXFormattedSpinField { protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXTimeField(); virtual ~VCLXTimeField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTimeField - void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTimeField + void SAL_CALL setTime( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getTime( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1051,43 +1051,43 @@ public: // class VCLXNumericField -class VCLXNumericField : public ::com::sun::star::awt::XNumericField, +class VCLXNumericField : public css::awt::XNumericField, public VCLXFormattedSpinField { public: VCLXNumericField(); virtual ~VCLXNumericField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XNumericField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XNumericField + void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1098,48 +1098,48 @@ public: class MetricFormatter; class MetricField; -class VCLXMetricField : public ::com::sun::star::awt::XMetricField, +class VCLXMetricField : public css::awt::XMetricField, public VCLXFormattedSpinField { - MetricFormatter *GetMetricFormatter() throw(::com::sun::star::uno::RuntimeException); - MetricField *GetMetricField() throw(::com::sun::star::uno::RuntimeException); + MetricFormatter *GetMetricFormatter() throw(css::uno::RuntimeException); + MetricField *GetMetricField() throw(css::uno::RuntimeException); void CallListeners(); public: VCLXMetricField(); virtual ~VCLXMetricField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XMetricField - virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getSpinSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getDecimalDigits( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isStrictFormat( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XMetricField + virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSpinSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getDecimalDigits( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isStrictFormat( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1148,44 +1148,44 @@ public: // class VCLXCurrencyField -class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, +class VCLXCurrencyField : public css::awt::XCurrencyField, public VCLXFormattedSpinField { public: VCLXCurrencyField(); virtual ~VCLXCurrencyField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - - // ::com::sun::star::awt::XCurrencyField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + + // css::awt::XCurrencyField + void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1194,34 +1194,34 @@ public: // class VCLXPatternField -class VCLXPatternField : public ::com::sun::star::awt::XPatternField, +class VCLXPatternField : public css::awt::XPatternField, public VCLXFormattedSpinField { public: VCLXPatternField(); virtual ~VCLXPatternField(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XPatternField + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getString( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -1235,7 +1235,7 @@ class VCLXToolBox : public VCLXWindow private: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 836f9a13ec13..ed06321c05c7 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -39,7 +39,7 @@ namespace toolkit typedef ::comphelper::OAccessibleComponentHelper OAccessibleControlContext_Base; - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener + typedef ::cppu::ImplHelper1 < css::lang::XEventListener > OAccessibleControlContext_IBase; /** class implementing the AccessibleContext for an UNO control - to be used in design mode of the control. @@ -54,9 +54,9 @@ namespace toolkit ,public OAccessibleControlContext_IBase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; // the model of the control which's context we implement - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xModelPropsInfo; // the cached property set info of the model protected: @@ -67,11 +67,11 @@ namespace toolkit /** late ctor */ void Init( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator + const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ); // OCommonAccessibleComponent overridables - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; public: /** creates an accessible context for an uno control @@ -80,7 +80,7 @@ namespace toolkit can be retrieved. */ static OAccessibleControlContext* create( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator + const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator ); protected: @@ -89,24 +89,24 @@ namespace toolkit DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener using comphelper::OAccessibleContextHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: // retrieves the value of a string property from the model, if the property is present @@ -117,7 +117,7 @@ namespace toolkit // stops listening at the control model void stopModelListening( ); - VclPtr< vcl::Window > implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; + VclPtr< vcl::Window > implGetWindow( css::uno::Reference< css::awt::XWindow >* _pxUNOWindow = NULL ) const; }; diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index 1165933699fe..6deaaebc6bab 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -34,49 +34,49 @@ namespace toolkit struct AnimatedImagesControlModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel - , ::com::sun::star::awt::XAnimatedImages + , css::awt::XAnimatedImages > AnimatedImagesControlModel_Base; class AnimatedImagesControlModel : public AnimatedImagesControlModel_Base { public: - AnimatedImagesControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory ); + AnimatedImagesControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory ); AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource ); virtual UnoControlModel* Clone() const override; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XAnimatedImages - virtual ::sal_Int32 SAL_CALL getStepTime() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoRepeat() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoRepeat( sal_Bool _autorepeat ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getImageSetCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getStepTime() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoRepeat() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoRepeat( sal_Bool _autorepeat ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getScaleMode() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getImageSetCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XAnimatedImages::XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual ~AnimatedImagesControlModel(); - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; private: std::unique_ptr< AnimatedImagesControlModel_Data > m_xData; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 6366339cbadf..2e1c3ae9de57 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -46,14 +46,14 @@ typedef UnoControlModel ControlModel_Base; typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base - , ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::awt::XTabControllerModel - , ::com::sun::star::util::XChangesNotifier - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::awt::tab::XTabPageModel - , ::com::sun::star::lang::XInitialization + , css::lang::XMultiServiceFactory + , css::container::XContainer + , css::container::XNameContainer + , css::awt::XTabControllerModel + , css::util::XChangesNotifier + , css::beans::XPropertyChangeListener + , css::awt::tab::XTabPageModel + , css::lang::XInitialization > ControlModelContainer_IBase; class ControlModelContainerBase : public ControlModelContainer_IBase @@ -62,14 +62,14 @@ public: enum ChildOperation { Insert = 0, Remove }; // would like to make this typedef private, too, but the Forte 7 compiler does have // problems with this ..... - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, OUString > + typedef ::std::pair< css::uno::Reference< css::awt::XControlModel >, OUString > UnoControlModelHolder; private: typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList; public: // for grouping control models (XTabControllerModel::getGroupXXX) - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > + typedef ::std::vector< css::uno::Reference< css::awt::XControlModel > > ModelGroup; typedef ::std::vector< ModelGroup > AllGroups; @@ -92,140 +92,140 @@ protected: void Clone_Impl(ControlModelContainerBase& _rClone) const; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; UnoControlModelHolderList::iterator ImplFindElement( const OUString& rName ); - void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void updateUserFormChildren( const css::uno::Reference< css::container::XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); public: - ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + ControlModelContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ControlModelContainerBase( const ControlModelContainerBase& rModel ); virtual ~ControlModelContainerBase(); UnoControlModel* Clone() const override; - // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XContainer + void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XElementAcces - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XElementAcces + css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::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; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XNameContainer, XNameReplace, XNameAccess + void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XMultiServiceFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XMultiServiceFactory + css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; // XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGroupCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getGroupControl( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGroupCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) throw (css::uno::RuntimeException, std::exception) override; // XChangesNotifier - virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED(ControlModelContainerBase, ControlModel_Base, "toolkit.ControlModelContainerBase" ) // XInitialization - virtual void SAL_CALL initialize (const com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::tab::XTabPageModel - virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + + // css::awt::tab::XTabPageModel + virtual ::sal_Int16 SAL_CALL getTabPageID() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& _title ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImageURL() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getToolTip() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (css::uno::RuntimeException, std::exception) override; protected: - void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); - void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); + void startControlListening( const css::uno::Reference< css::awt::XControlModel >& _rxChildModel ); + void stopControlListening( const css::uno::Reference< css::awt::XControlModel >& _rxChildModel ); void implNotifyTabModelChange( const OUString& _rAccessor ); void implUpdateGroupStructure(); }; -class ResourceListener :public ::com::sun::star::util::XModifyListener, +class ResourceListener :public css::util::XModifyListener, public ::cppu::OWeakObject, public ::cppu::BaseMutex { public: - ResourceListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ); + ResourceListener( const css::uno::Reference< css::util::XModifyListener >& xListener ); virtual ~ResourceListener(); - void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver >& rResource ); + void startListening( const css::uno::Reference< css::resource::XStringResourceResolver >& rResource ); void stopListening(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xResource; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xListener; + css::uno::Reference< css::resource::XStringResourceResolver > m_xResource; + css::uno::Reference< css::util::XModifyListener > m_xListener; bool m_bListening; }; typedef ::cppu::AggImplInheritanceHelper3 < UnoControlContainer - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XChangesListener - , ::com::sun::star::util::XModifyListener + , css::container::XContainerListener + , css::util::XChangesListener + , css::util::XModifyListener > ContainerControl_IBase; class ControlContainerBase : public ContainerControl_IBase { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; bool mbSizeModified; bool mbPosModified; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; + css::uno::Reference< css::awt::XTabController > mxTabController; + css::uno::Reference< css::util::XModifyListener > mxListener; - void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const OUString& rName ); - void ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ); - virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); + void ImplInsertControl( css::uno::Reference< css::awt::XControlModel >& rxModel, const OUString& rName ); + void ImplRemoveControl( css::uno::Reference< css::awt::XControlModel >& rxModel ); + virtual void ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ); void ImplUpdateResourceResolver(); void ImplStartListingForResourceEvents(); @@ -235,35 +235,35 @@ protected: #endif public: - ControlContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + ControlContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ControlContainerBase(); DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" ) - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XContainerListener - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XContainerListener + void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener // Using a dummy/no-op implementation here, not sure if every container control needs // to implement this, certainly Dialog does, lets see about others - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) override {} protected: - virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException) override; - virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) override; - virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) override; + virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException) override; + virtual void removingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override; + virtual void addingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override; }; #endif diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index acd44cc520cf..17c77e7ae084 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -36,123 +36,123 @@ #include <list> typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase - , ::com::sun::star::awt::XUnoControlDialog - , ::com::sun::star::awt::XWindowListener + , css::awt::XUnoControlDialog + , css::awt::XWindowListener > UnoDialogControl_Base; class UnoDialogControl : public UnoDialogControl_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar > mxMenuBar; + css::uno::Reference< css::awt::XMenuBar > mxMenuBar; TopWindowListenerMultiplexer maTopWindowListeners; bool mbWindowListener; public: - UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoDialogControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoDialogControl(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTopWindow - void SAL_CALL addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL toFront( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL toBack( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& xMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTopWindow + void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL toFront( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL toBack( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XWindowListener + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDialog2 - virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDialog2 + virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XDialog + void SAL_CALL setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getTitle() throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL execute() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL endExecute() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // resolve some ambigous methods - virtual com::sun::star::uno::Reference<com::sun::star::awt::XWindowPeer> SAL_CALL getPeer() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getPeer(); } - virtual void SAL_CALL addWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addWindowListener(p1); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> SAL_CALL getModel() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getModel(); } - virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeEventListener(p1); } - virtual void SAL_CALL setContext(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setContext(p1); } - virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL getContext() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getContext(); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XView> SAL_CALL getView() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getView(); } - virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setDesignMode(p1); } - virtual sal_Bool SAL_CALL isDesignMode() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::isDesignMode(); } - virtual sal_Bool SAL_CALL isTransparent() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::isTransparent(); } - virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setPosSize(p1, p2, p3, p4, p5); } - virtual com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getPosSize(); } - virtual void SAL_CALL setVisible(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setVisible(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setVisible(p1); } - virtual void SAL_CALL setEnable(sal_Bool p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setEnable(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setEnable(p1); } - virtual void SAL_CALL setFocus() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setFocus(); } - virtual void SAL_CALL removeWindowListener(const com::sun::star::uno::Reference<com::sun::star::awt::XWindowListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeWindowListener(p1); } - virtual void SAL_CALL addFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addFocusListener(p1); } - virtual void SAL_CALL removeFocusListener(const com::sun::star::uno::Reference<com::sun::star::awt::XFocusListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeFocusListener(p1); } - virtual void SAL_CALL addKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addKeyListener(p1); } - virtual void SAL_CALL removeKeyListener(const com::sun::star::uno::Reference<com::sun::star::awt::XKeyListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeKeyListener(p1); } - virtual void SAL_CALL addMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addMouseListener(p1); } - virtual void SAL_CALL removeMouseListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeMouseListener(p1); } - virtual void SAL_CALL addMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addMouseMotionListener(p1); } - virtual void SAL_CALL removeMouseMotionListener(const com::sun::star::uno::Reference<com::sun::star::awt::XMouseMotionListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeMouseMotionListener(p1); } - virtual void SAL_CALL addPaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addPaintListener(p1); } - virtual void SAL_CALL removePaintListener(const com::sun::star::uno::Reference<com::sun::star::awt::XPaintListener>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removePaintListener(p1); } - virtual void SAL_CALL setStatusText(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setStatusText(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::setStatusText(p1); } - virtual com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::awt::XControl> > SAL_CALL getControls() throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<css::uno::Reference<css::awt::XControl> > SAL_CALL getControls() throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getControls(); } - virtual com::sun::star::uno::Reference<com::sun::star::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override { return UnoDialogControl_Base::ControlContainerBase::getControl(p1); } - virtual void SAL_CALL addControl(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p2) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addControl(const rtl::OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::addControl(p1, p2); } - virtual void SAL_CALL removeControl(const com::sun::star::uno::Reference<com::sun::star::awt::XControl>& p1) throw (com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeControl(const css::uno::Reference<css::awt::XControl>& p1) throw (css::uno::RuntimeException, std::exception) override { UnoDialogControl_Base::ControlContainerBase::removeControl(p1); } - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -163,15 +163,15 @@ public: throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) override; - virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException) override; + virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override; + virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException) override; protected: }; class UnoMultiPageModel : public ControlModelContainerBase { public: - UnoMultiPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoMultiPageModel(); UnoMultiPageModel( const UnoMultiPageModel& rModel ); @@ -179,65 +179,65 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( css::uno::RuntimeException, std::exception) override; // XNamedContainer - void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Override the method of parent Class - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getGroupControl( ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; }; class UnoMultiPageControl : public ControlContainerBase - ,public ::com::sun::star::awt::XSimpleTabController - ,public ::com::sun::star::awt::XTabListener + ,public css::awt::XSimpleTabController + ,public css::awt::XTabListener { TabListenerMultiplexer maTabListeners; - void bindPage( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + void bindPage( const css::uno::Reference< css::awt::XControl >& _rxControl ); public: - UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoMultiPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoMultiPageControl(); OUString GetComponentServiceName() override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlMultiPage" ) - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) override { return ControlContainerBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override { return ControlContainerBase::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - // com::sun::star::awt::XSimpleTabController - virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + // css::awt::XSimpleTabController + virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + + virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + + virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (css::uno::RuntimeException, std::exception) override; + + virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XTabListener - virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; protected: virtual void impl_createControlPeerIfNecessary( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl + const css::uno::Reference< css::awt::XControl >& _rxControl ) override; }; @@ -246,7 +246,7 @@ protected: class UnoPageModel : public ControlModelContainerBase { public: - UnoPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoPageModel(); UnoPageModel( const UnoPageModel& rModel ); @@ -254,13 +254,13 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoPageModel" ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( css::uno::RuntimeException, std::exception) override; // Override the method of parent Class - virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getGroupControl( ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; }; @@ -268,19 +268,19 @@ protected: class UnoPageControl : public ControlContainerBase { public: - UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoPageControl(); OUString GetComponentServiceName() override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlPage" ) }; class UnoFrameModel : public ControlModelContainerBase { public: - UnoFrameModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoFrameModel(); UnoFrameModel( const UnoFrameModel& rModel ); @@ -288,24 +288,24 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, "com.sun.star.awt.UnoFrameModel" ) - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( css::uno::RuntimeException, std::exception) override; protected: - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; }; class UnoFrameControl : public ControlContainerBase { protected: - virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ) override; + virtual void ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ) override; public: - UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoFrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoFrameControl(); OUString GetComponentServiceName() override; -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, "com.sun.star.awt.UnoControlFrame" ) }; diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index 29959fedf28c..7590e57d563a 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -29,8 +29,8 @@ #include <cppuhelper/implbase2.hxx> #include <unordered_map> -typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer, - ::com::sun::star::container::XContainer > NameContainerHelper; +typedef ::cppu::WeakImplHelper2< css::container::XNameContainer, + css::container::XContainer > NameContainerHelper; namespace toolkit @@ -49,15 +49,15 @@ NameContainerNameMap; class NameContainer_Impl : public NameContainerHelper { NameContainerNameMap mHashMap; - ::com::sun::star::uno::Sequence< OUString > mNames; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > mValues; + css::uno::Sequence< OUString > mNames; + css::uno::Sequence< css::uno::Any > mValues; sal_Int32 mnElementCount; - ::com::sun::star::uno::Type mType; + css::uno::Type mType; ContainerListenerMultiplexer maContainerListeners; public: - NameContainer_Impl( ::com::sun::star::uno::Type const & aType ) + NameContainer_Impl( css::uno::Type const & aType ) : mnElementCount( 0 ), mType( aType ), maContainerListeners( *this ) @@ -65,44 +65,44 @@ public: } // Methods XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - 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(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // Methods 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 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(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // Methods XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; }; class ScriptEventContainer : public NameContainer_Impl diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index 00a4181d8ff4..bbf694baed73 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -37,29 +37,29 @@ namespace toolkit class UnoControlFormattedFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - ::com::sun::star::uno::Any m_aCachedFormat; + css::uno::Any m_aCachedFormat; bool m_bRevokedAsClient; bool m_bSettingValueAndText; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > + css::uno::Reference< css::util::XNumberFormatter > m_xCachedFormatter; protected: sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& rConvertedValue, - ::com::sun::star::uno::Any& rOldValue, + css::uno::Any& rConvertedValue, + css::uno::Any& rOldValue, sal_Int32 nPropId, - const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::lang::IllegalArgumentException, std::exception) override; + const css::uno::Any& rValue + ) throw (css::lang::IllegalArgumentException, std::exception) override; void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue + ) throw (css::uno::Exception, std::exception) override; public: - UnoControlFormattedFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlFormattedFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel ) : UnoControlModel(rModel) , m_bRevokedAsClient(false) @@ -69,14 +69,14 @@ namespace toolkit UnoControlModel* Clone() const override { return new UnoControlFormattedFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -87,16 +87,16 @@ namespace toolkit virtual ~UnoControlFormattedFieldModel(); // XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // UnoControlModel virtual void ImplNormalizePropertySequence( const sal_Int32 _nCount, /// the number of entries in the arrays sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + css::uno::Any* _pValues, /// the values of the properties to set sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted ) const override; private: @@ -114,10 +114,10 @@ namespace toolkit UnoFormattedFieldControl(); OUString GetComponentServiceName() override; - // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextListener + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 834a8cb5907c..b02a0863cf6d 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -53,8 +53,8 @@ namespace com { namespace sun { namespace star { //= OGeometryControlModel_Base - typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::util::XCloneable - , ::com::sun::star::script::XScriptEventsSupplier + typedef ::cppu::WeakAggComponentImplHelper2 < css::util::XCloneable + , css::script::XScriptEventsSupplier > OGCM_Base; class OGeometryControlModel_Base :public ::comphelper::OMutexAndBroadcastHelper @@ -63,9 +63,9 @@ namespace com { namespace sun { namespace star { ,public OGCM_Base { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > + css::uno::Reference< css::uno::XAggregation > m_xAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > mxEventContainer; // <properties> @@ -77,29 +77,29 @@ namespace com { namespace sun { namespace star { sal_Int16 m_nTabIndex; sal_Int32 m_nStep; OUString m_aTag; - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver; + css::uno::Reference< css::resource::XStringResourceResolver > m_xStrResolver; // </properties> bool m_bCloneable; protected: - static ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle); - ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; - void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); + static css::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle); + css::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; + void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: css::uno::Any& aValue); protected: /** @param _pAggregateInstance the object to be aggregated. The refcount of the instance given MUST be 0! */ - OGeometryControlModel_Base(::com::sun::star::uno::XAggregation* _pAggregateInstance); + OGeometryControlModel_Base(css::uno::XAggregation* _pAggregateInstance); /** @param _rxAggregateInstance is the object to be aggregated. Must be acquired exactly once (by the reference object given).<br/> Will be reset to NULL upon leaving */ - OGeometryControlModel_Base(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance); + OGeometryControlModel_Base(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance); /** releases the aggregation <p>Can be used if in a derived class, an exception has to be thrown after this base class here already @@ -111,51 +111,51 @@ namespace com { namespace sun { namespace star { virtual ~OGeometryControlModel_Base(); // XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) throw(css::uno::RuntimeException, std::exception) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; // OPropertySetHelper overridables virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, + sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw (::com::sun::star::uno::Exception, std::exception) override; + sal_Int32 _nHandle, const css::uno::Any& _rValue) + throw (css::uno::Exception, std::exception) override; using comphelper::OPropertySetAggregationHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle) const override; + css::uno::Any& _rValue, sal_Int32 _nHandle) const override; // OPropertyStateHelper overridables - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) override; + virtual css::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) override; virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle) override; - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const override; + virtual css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const 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 css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; // OPropertySetAggregationHelper overridables using OPropertySetAggregationHelper::getInfoHelper; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw(css::uno::RuntimeException, std::exception) override; //XScriptEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > - SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > + SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; // XCloneable implementation - to be overwritten virtual OGeometryControlModel_Base* createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) = 0; + css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) = 0; // XComponent using comphelper::OPropertySetAggregationHelper::disposing; @@ -185,16 +185,16 @@ namespace com { namespace sun { namespace star { ,public ::comphelper::OAggregationArrayUsageHelper< OTemplateInstanceDisambiguation< CONTROLMODEL > > { public: - OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + OGeometryControlModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); private: - OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance); + OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance); protected: // OAggregationArrayUsageHelper overridables virtual void fillProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rProps, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rAggregateProps + css::uno::Sequence< css::beans::Property >& _rProps, + css::uno::Sequence< css::beans::Property >& _rAggregateProps ) const override; // OPropertySetAggregationHelper overridables @@ -202,10 +202,10 @@ namespace com { namespace sun { namespace star { // OGeometryControlModel_Base virtual OGeometryControlModel_Base* createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) override; + css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -230,7 +230,7 @@ namespace com { namespace sun { namespace star { (this is not checked here) */ OCommonGeometryControlModel( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAgg, + css::uno::Reference< css::util::XCloneable >& _rxAgg, const OUString& _rxServiceSpecifier ); @@ -242,15 +242,15 @@ namespace com { namespace sun { namespace star { // OGeometryControlModel_Base virtual OGeometryControlModel_Base* createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) override; + css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; private: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw (::com::sun::star::uno::Exception, std::exception) override; + sal_Int32 _nHandle, const css::uno::Any& _rValue) + throw (css::uno::Exception, std::exception) override; }; #include <toolkit/controls/geometrycontrolmodel_impl.hxx> diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx index b8054dd27dc0..40ba84b8fb59 100644 --- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx @@ -24,14 +24,14 @@ template <class CONTROLMODEL> -OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) +OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ) :OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) ) { } template <class CONTROLMODEL> -OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) +OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) :OGeometryControlModel_Base(_rxAggregateInstance) { } @@ -45,7 +45,7 @@ template <class CONTROLMODEL> template <class CONTROLMODEL> -void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rProps, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rAggregateProps) const +void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css::beans::Property >& _rProps, css::uno::Sequence< css::beans::Property >& _rAggregateProps) const { // our own properties OPropertyContainer::describeProperties(_rProps); @@ -56,7 +56,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno:: template <class CONTROLMODEL> -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -64,7 +64,7 @@ template <class CONTROLMODEL> template <class CONTROLMODEL> OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) + css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) { return new OGeometryControlModel<CONTROLMODEL>(_rxAggregateInstance); } diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 9a86f3fe34a7..5efc1f354c75 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -107,10 +107,10 @@ namespace toolkit DECLARE_XTYPEPROVIDER( ) - // ::com::sun::star::io::XPersistObject + // css::io::XPersistObject OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -133,7 +133,7 @@ namespace toolkit void SAL_CALL release() throw() override { UnoControlRoadmapModel_Base::release(); } - // ::com::sun::star::beans::XPropertySet + // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; @@ -182,7 +182,7 @@ namespace toolkit DECLARE_XTYPEPROVIDER( ) DECLARE_XINTERFACE() - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx index cd9f2a70e02d..bca889d64ac6 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/include/toolkit/controls/roadmapentry.hxx @@ -32,7 +32,7 @@ #define RM_PROPERTY_ID_ENABLED 4 #define RM_PROPERTY_ID_INTERACTIVE 5 -typedef ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XServiceInfo +typedef ::cppu::WeakImplHelper1 < css::lang::XServiceInfo > ORoadmapEntry_Base; class ORoadmapEntry :public ORoadmapEntry_Base @@ -48,10 +48,10 @@ protected: DECLARE_XINTERFACE() // merge XInterface implementations DECLARE_XTYPEPROVIDER() // merge XTypeProvider implementations - /// @see ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + /// @see css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -59,9 +59,9 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; - 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; // other stuff diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 2d87df0df2f7..540ef9ca76b1 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -32,19 +32,19 @@ #include <toolkit/helper/servicenames.hxx> -class StdTabController : public ::com::sun::star::awt::XTabController, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::lang::XTypeProvider, +class StdTabController : public css::awt::XTabController, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, public ::cppu::OWeakAggObject { private: ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer; + css::uno::Reference< css::awt::XTabControllerModel > mxModel; + css::uno::Reference< css::awt::XControlContainer > mxControlContainer; protected: ::osl::Mutex& GetMutex() { return maMutex; } - static bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ); + static bool ImplCreateComponentSequence( css::uno::Sequence< css::uno::Reference< css::awt::XControl > >& rControls, const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rModels, css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& rComponents, css::uno::Sequence< css::uno::Any>* pTabStops, bool bPeerComponent ); // if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls void ImplActivateControl( bool bFirst ) const; @@ -52,29 +52,29 @@ public: StdTabController(); virtual ~StdTabController(); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel ); + static css::uno::Reference< css::awt::XControl > FindControl( css::uno::Sequence< css::uno::Reference< css::awt::XControl > >& rCtrls, const css::uno::Reference< css::awt::XControlModel > & rxCtrlModel ); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // XTabController - void SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& Container ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL autoTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL activateTabOrder( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL activateFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL activateLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL setModel( const css::uno::Reference< css::awt::XTabControllerModel >& Model ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setContainer( const css::uno::Reference< css::awt::XControlContainer >& Container ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL autoTabOrder( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL activateTabOrder( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL activateFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL activateLast( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index 86cadafd3247..bcace97f0ce3 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -64,14 +64,14 @@ struct UnoControlModelEntry bool bGroup; union { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >* pxControl; + css::uno::Reference< css::awt::XControlModel >* pxControl; UnoControlModelEntryList* pGroup; }; }; struct ComponentEntry { - ::com::sun::star::awt::XWindow* pComponent; + css::awt::XWindow* pComponent; Point aPos; }; @@ -79,10 +79,10 @@ typedef ::std::vector< ComponentEntry* > ComponentEntryList; #define CONTROLPOS_NOTFOUND 0xFFFFFFFF -class StdTabControllerModel : public ::com::sun::star::awt::XTabControllerModel, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::io::XPersistObject, - public ::com::sun::star::lang::XTypeProvider, +class StdTabControllerModel : public css::awt::XTabControllerModel, + public css::lang::XServiceInfo, + public css::io::XPersistObject, + public css::lang::XTypeProvider, public ::cppu::OWeakAggObject { private: @@ -93,39 +93,39 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } sal_uInt32 ImplGetControlCount( const UnoControlModelEntryList& rList ) const; - void ImplGetControlModels( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const; - static void ImplSetControlModels( UnoControlModelEntryList& rList, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ); - static sal_uInt32 ImplGetControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rCtrl, const UnoControlModelEntryList& rList ); + void ImplGetControlModels( css::uno::Reference< css::awt::XControlModel > ** pRefs, const UnoControlModelEntryList& rList ) const; + static void ImplSetControlModels( UnoControlModelEntryList& rList, const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ); + static sal_uInt32 ImplGetControlPos( const css::uno::Reference< css::awt::XControlModel >& rCtrl, const UnoControlModelEntryList& rList ); public: StdTabControllerModel(); virtual ~StdTabControllerModel(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTabControllerModel - sal_Bool SAL_CALL getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getGroupCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTabControllerModel + sal_Bool SAL_CALL getGroupControl( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getGroupCount( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) throw(css::uno::RuntimeException, std::exception) override; + + // css::io::XPersistObject + OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx index 9404b491c0e1..bc9bc7eaa5b7 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/include/toolkit/controls/tabpagecontainer.hxx @@ -34,92 +34,92 @@ #include <toolkit/helper/listenermultiplexer.hxx> -// class ::com::sun::star::awt::tab::UnoControlTabPageContainerModel +// class css::awt::tab::UnoControlTabPageContainerModel typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel - , ::com::sun::star::awt::tab::XTabPageContainerModel + , css::awt::tab::XTabPageContainerModel > UnoControlTabPageContainerModel_Base; class UnoControlTabPageContainerModel : public UnoControlTabPageContainerModel_Base { private: - std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > > m_aTabPageVector; + std::vector< css::uno::Reference< css::awt::tab::XTabPageModel > > m_aTabPageVector; ContainerListenerMultiplexer maContainerListeners; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; public: - UnoControlTabPageContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + UnoControlTabPageContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); UnoControlTabPageContainerModel( const UnoControlTabPageContainerModel& rModel ) : UnoControlTabPageContainerModel_Base( rModel ),maContainerListeners( *this ) {;} UnoControlModel* Clone() const override { return new UnoControlTabPageContainerModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainerModel, UnoControlModel, "com.sun.star.awt.tab.UnoControlTabPageContainerModel" ) // XTabPageContainerModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) + throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw (css::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 css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, 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; - // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XContainer + void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; }; // = UnoControlTabPageContainer typedef ::cppu::AggImplInheritanceHelper1 < ControlContainerBase - , ::com::sun::star::awt::tab::XTabPageContainer + , css::awt::tab::XTabPageContainer > UnoControlTabPageContainer_Base; class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base { public: - UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlTabPageContainer( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); OUString GetComponentServiceName() override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::tab::XTabPageContainer - virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::tab::XTabPageContainer + virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getTabPageCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + virtual void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) throw (css::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, "com.sun.star.awt.tab.UnoControlTabPageContainer" ) // using UnoControl::getPeer; diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index f425f826dee9..4020c35963ef 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -35,19 +35,19 @@ class UnoControlTabPageModel : public ControlModelContainerBase { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory); + UnoControlTabPageModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory); - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize (const com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; @@ -59,8 +59,8 @@ public: // class UnoTabPageControl typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase - , ::com::sun::star::awt::tab::XTabPage - , ::com::sun::star::awt::XWindowListener + , css::awt::tab::XTabPage + , css::awt::XWindowListener > UnoControlTabPage_Base; class UnoControlTabPage : public UnoControlTabPage_Base { @@ -68,20 +68,20 @@ private: bool m_bWindowListener; public: - UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlTabPage( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~UnoControlTabPage(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::awt::XWindowListener + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index ea2860606669..cfd29157dd22 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -38,20 +38,20 @@ namespace toolkit class UnoControlScrollBarModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlScrollBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + UnoControlScrollBarModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlScrollBarModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -65,8 +65,8 @@ namespace toolkit //= UnoControlScrollBarModel class UnoScrollBarControl : public UnoControlBase, - public ::com::sun::star::awt::XAdjustmentListener, - public ::com::sun::star::awt::XScrollBar + public css::awt::XAdjustmentListener, + public css::awt::XScrollBar { private: AdjustmentListenerMultiplexer maAdjustmentListeners; @@ -75,39 +75,39 @@ namespace toolkit UnoScrollBarControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XAdjustmentListener - void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XScrollBar - void SAL_CALL addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getMaximum( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getLineIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getBlockIncrement( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getVisibleSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XAdjustmentListener + void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XScrollBar + void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getMaximum( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getLineIncrement( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBlockIncrement( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getVisibleSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getOrientation( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 8f232c48d9cb..d31f49bcddce 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -65,15 +65,15 @@ struct UnoControl_Data; // class UnoControl -typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl - , ::com::sun::star::awt::XWindow2 - , ::com::sun::star::awt::XView - , ::com::sun::star::beans::XPropertiesChangeListener - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::accessibility::XAccessible - , ::com::sun::star::util::XModeChangeBroadcaster - , ::com::sun::star::awt::XUnitConversion - , ::com::sun::star::awt::XStyleSettingsSupplier +typedef ::cppu::WeakAggImplHelper9 < css::awt::XControl + , css::awt::XWindow2 + , css::awt::XView + , css::beans::XPropertiesChangeListener + , css::lang::XServiceInfo + , css::accessibility::XAccessible + , css::util::XModeChangeBroadcaster + , css::awt::XUnitConversion + , css::awt::XStyleSettingsSupplier > UnoControl_Base; class TOOLKIT_DLLPUBLIC UnoControl : public UnoControl_Base @@ -81,8 +81,8 @@ class TOOLKIT_DLLPUBLIC UnoControl : public UnoControl_Base private: ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > mxVclWindowPeer; // just to avoid the query_interface thing + css::uno::Reference< css::awt::XWindowPeer > mxPeer; + css::uno::Reference< css::awt::XVclWindowPeer > mxVclWindowPeer; // just to avoid the query_interface thing protected: EventListenerMultiplexer maDisposeListeners; @@ -94,11 +94,11 @@ protected: PaintListenerMultiplexer maPaintListeners; ::cppu::OInterfaceContainerHelper maModeChangeListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxContext; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > mxGraphics; + css::uno::Reference< css::uno::XInterface > mxContext; + css::uno::Reference< css::awt::XControlModel > mxModel; + css::uno::Reference< css::awt::XGraphics > mxGraphics; - ::com::sun::star::uno::WeakReferenceHelper + css::uno::WeakReferenceHelper maAccessibleContext; /// our most recent XAccessibleContext instance bool mbDisposePeer; @@ -112,25 +112,25 @@ protected: ::osl::Mutex& GetMutex() { return maMutex; } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParentPeer() const; + css::uno::Reference< css::awt::XWindow > getParentPeer() const; virtual void updateFromModel(); void peerCreated(); bool ImplCheckLocalize( OUString& _rPossiblyLocalizable ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer ); - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); - virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ); + css::uno::Reference< css::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ); + virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ); + virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ); void ImplLockPropertyChangeNotification( const OUString& rPropertyName, bool bLock ); - void ImplLockPropertyChangeNotifications( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, bool bLock ); + void ImplLockPropertyChangeNotifications( const css::uno::Sequence< OUString >& rPropertyNames, bool bLock ); - void DisposeAccessibleContext(::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> const& xContext); + void DisposeAccessibleContext(css::uno::Reference< + css::lang::XComponent> const& xContext); - inline void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _xPeer) + inline void setPeer( const css::uno::Reference< css::awt::XWindowPeer >& _xPeer) { mxPeer = _xPeer; - mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing + mxVclWindowPeer = css::uno::Reference< css::awt::XVclWindowPeer >(mxPeer,css::uno::UNO_QUERY); // just to avoid the query_interface thing } virtual bool requiresNewPeer( const OUString& _rPropertyName ) const; @@ -144,89 +144,89 @@ public: virtual OUString GetComponentServiceName(); - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - 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; - 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; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; // XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XWindow2 - virtual void SAL_CALL setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XWindow - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEnable( sal_Bool Enable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XView - sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& aDevice ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XControl - void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDesignMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XWindow2 + virtual void SAL_CALL setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getOutputSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVisible( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEnabled( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasFocus( ) throw (css::uno::RuntimeException, std::exception) override; + + // css::awt::XWindow + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Rectangle SAL_CALL getPosSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEnable( sal_Bool Enable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XView + sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XControl + void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface >& Context ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uno::XInterface > SAL_CALL getContext( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XView > SAL_CALL getView( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDesignMode( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XUnitConversion - virtual ::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const ::com::sun::star::awt::Point& Point, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& Point, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XStyleSettingsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (css::uno::RuntimeException, std::exception) override; private: - // ::com::sun::star::beans::XPropertiesChangeListener - void SAL_CALL propertiesChange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertiesChangeListener + void SAL_CALL propertiesChange( const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt ) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index fd833e66eb30..aa15a3e2cdec 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -37,9 +37,9 @@ protected: bool ImplHasProperty( sal_uInt16 nProp ); bool ImplHasProperty( const OUString& aPropertyName ); - void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, bool bUpdateThis ); - void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, bool bUpdateThis ); - ::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); + void ImplSetPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, bool bUpdateThis ); + void ImplSetPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, bool bUpdateThis ); + css::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); template <typename T> T ImplGetPropertyValuePOD( sal_uInt16 nProp ); template <typename T> T ImplGetPropertyValueClass( sal_uInt16 nProp ); @@ -48,16 +48,16 @@ protected: sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); - ::com::sun::star::util::Date ImplGetPropertyValue_Date( sal_uInt16 nProp ); - ::com::sun::star::util::Time ImplGetPropertyValue_Time( sal_uInt16 nProp ); + css::util::Date ImplGetPropertyValue_Date( sal_uInt16 nProp ); + css::util::Time ImplGetPropertyValue_Time( sal_uInt16 nProp ); // XLayoutConstrains (nur wenn das Control es unterstuetzt!) - ::com::sun::star::awt::Size Impl_getMinimumSize(); - ::com::sun::star::awt::Size Impl_getPreferredSize(); - ::com::sun::star::awt::Size Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ); + css::awt::Size Impl_getMinimumSize(); + css::awt::Size Impl_getPreferredSize(); + css::awt::Size Impl_calcAdjustedSize( const css::awt::Size& rNewSize ); // XTextLayoutConstrains (nur wenn das Control es unterstuetzt!) - ::com::sun::star::awt::Size Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ); + css::awt::Size Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ); void Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ); }; diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 93e3ef930429..4664a38d7620 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -39,17 +39,17 @@ class UnoControlHolderList; // class UnoControlContainer typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase - , ::com::sun::star::awt::XUnoControlContainer - , ::com::sun::star::awt::XControlContainer - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XIdentifierContainer + , css::awt::XUnoControlContainer + , css::awt::XControlContainer + , css::container::XContainer + , css::container::XIdentifierContainer > UnoControlContainer_Base; class UnoControlContainer : public UnoControlContainer_Base { private: UnoControlHolderList* mpControls; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > maTabControllers; + css::uno::Sequence< css::uno::Reference< css::awt::XTabController > > maTabControllers; ContainerListenerMultiplexer maCListeners; protected: @@ -57,53 +57,53 @@ protected: public: UnoControlContainer(); - UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer ); + UnoControlContainer( const css::uno::Reference< css::awt::XWindowPeer >& xPeer ); virtual ~UnoControlContainer(); - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XComponent + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XEventListener + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XContainer - void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XContainer + void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XIdentifierContainer - virtual ::sal_Int32 SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XIdentifierContainer + virtual ::sal_Int32 SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XIdentifierReplace - virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XIdentifierReplace + virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XIdentifierAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) 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< ::sal_Int32 > SAL_CALL getIdentifiers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::container::XIdentifierAccess + virtual css::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getIdentifiers( ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::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; + // css::container::XElementAccess + 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; - // ::com::sun::star::awt::XControlContainer - void SAL_CALL setStatusText( const OUString& StatusText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControlContainer + void SAL_CALL setStatusText( const OUString& StatusText ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeControl( const css::uno::Reference< css::awt::XControl >& Control ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XUnoControlContainer - void SAL_CALL setTabControllers( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& TabControllers ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTabController( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& TabController ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XUnoControlContainer + void SAL_CALL setTabControllers( const css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >& TabControllers ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Reference< css::awt::XTabController > > SAL_CALL getTabControllers( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XWindow - void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XWindow + void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -112,9 +112,9 @@ public: throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) override; - virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); - virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override; + virtual void removingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ); + virtual void addingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ); /** ensures that the given control has a peer, if necessary and possible @param _rxControl @@ -123,7 +123,7 @@ protected: our mutex is locked */ virtual void impl_createControlPeerIfNecessary( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl + const css::uno::Reference< css::awt::XControl >& _rxControl ); private: /** adds the control to the container, does necessary notifications, and the like @@ -135,7 +135,7 @@ private: the ID of the newly added control */ sal_Int32 impl_addControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XControl >& _rxControl, const OUString* _pName = NULL ); @@ -151,7 +151,7 @@ private: */ void impl_removeControl( sal_Int32 _nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XControl >& _rxControl, const OUString* _pNameAccessor ); diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index 96ce433d90f2..cc7fcbc84d64 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -27,27 +27,27 @@ -// class ::com::sun::star::awt::UnoControlContainerModel +// class css::awt::UnoControlContainerModel class UnoControlContainerModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ); + UnoControlContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory ); UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {} UnoControlModel* Clone() const override { return new UnoControlContainerModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 72c401da2923..ec3286a1764c 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -43,19 +43,19 @@ #include <list> #include <map> -typedef std::map<sal_uInt16, ::com::sun::star::uno::Any> ImplPropertyTable; +typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable; // class UnoControlModel -typedef ::cppu::WeakAggImplHelper7 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::io::XPersistObject - , ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XCloneable +typedef ::cppu::WeakAggImplHelper7 < css::awt::XControlModel + , css::beans::XPropertyState + , css::io::XPersistObject + , css::lang::XComponent + , css::lang::XServiceInfo + , css::lang::XUnoTunnel + , css::util::XCloneable > UnoControlModel_Base; class TOOLKIT_DLLPUBLIC UnoControlModel :public UnoControlModel_Base @@ -67,14 +67,14 @@ private: EventListenerMultiplexer maDisposeListeners; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; protected: void ImplRegisterProperty( sal_uInt16 nPropType ); void ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ); - void ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault ); - ::com::sun::star::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; - virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; + void ImplRegisterProperty( sal_uInt16 nPropId, const css::uno::Any& rDefault ); + css::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; + virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; bool ImplHasProperty( sal_uInt16 nPropId ) const; /** called before setting multiple properties, allows to care for property dependencies @@ -86,7 +86,7 @@ protected: virtual void ImplNormalizePropertySequence( const sal_Int32 _nCount, /// the number of entries in the arrays sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + css::uno::Any* _pValues, /// the values of the properties to set sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted ) const; @@ -94,7 +94,7 @@ protected: static void ImplEnsureHandleOrder( const sal_Int32 _nCount, /// number of entries in the array sal_Int32* _pHandles, /// pointer to the handles - ::com::sun::star::uno::Any* _pValues, /// pointer to the values + css::uno::Any* _pValues, /// pointer to the values sal_Int32 _nFirstHandle, /// first handle, which should precede _nSecondHandle in the sequence sal_Int32 _nSecondHandle /// second handle, which should supersede _nFirstHandle in the sequence ); @@ -106,72 +106,72 @@ protected: , MutexAndBroadcastHelper() , OPropertySetHelper( BrdcstHelper ) , maDisposeListeners( *this ) - , m_xContext( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) + , m_xContext( css::uno::Reference< css::uno::XComponentContext >() ) { assert(false); } #endif public: - UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlModel( const UnoControlModel& rModel ); virtual UnoControlModel* Clone() const = 0; - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } void SAL_CALL acquire() throw() override; void SAL_CALL release() throw() override; - // ::com::sun::star::uno::XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XAggregation + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XUnoTunnel + static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XCloneable - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XCloneable + css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider DECLARE_XTYPEPROVIDER() - // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - 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; - 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; + // css::lang::XComponent + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XPropertyState - ::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; - ::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; - void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::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; + // css::beans::XPropertyState + css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + 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; + void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0; - sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException, std::exception) override; - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; using cppu::OPropertySetHelper::getFastPropertyValue; - void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // override setValue methods to handle properties of FontDescriptor - // ::com::sun::star::beans::XPropertySet - 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; - // ::com::sun::star::beans::XFastPropertySet - void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, 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; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertySet + 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; + // css::beans::XFastPropertySet + void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; #define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 25c4ede611a6..8b8b88b2da3e 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -70,8 +70,8 @@ public: // associated XGraphicObject ( if url is valid for that ) and is set // appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid // object if the rURL points to a valid object - static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const OUString& _rURL ); - static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const OUString& _rURL ); + static css::uno::Reference< css::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( css::uno::Reference< css::graphic::XGraphicObject >& xOutGraphicObject, const OUString& _rURL ); + static css::uno::Reference< css::graphic::XGraphic > getGraphicFromURL_nothrow( const OUString& _rURL ); }; @@ -81,20 +81,20 @@ public: class UnoControlEditModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlEditModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlEditModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlEditModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo @@ -108,10 +108,10 @@ public: // class UnoEditControl -typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XTextComponent - , ::com::sun::star::awt::XTextListener - , ::com::sun::star::awt::XLayoutConstrains - , ::com::sun::star::awt::XTextLayoutConstrains +typedef ::cppu::ImplHelper4 < css::awt::XTextComponent + , css::awt::XTextListener + , css::awt::XLayoutConstrains + , css::awt::XTextLayoutConstrains > UnoEditControl_Base; class TOOLKIT_DLLPUBLIC UnoEditControl :public UnoControlBase ,public UnoEditControl_Base @@ -135,52 +135,52 @@ public: OUString GetComponentServiceName() override; TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } - void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) override; + void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; // disambiguate XInterface DECLARE_XINTERFACE() // XAggregation - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; // XTextComponent - void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override; // XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; // XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override; }; @@ -189,22 +189,22 @@ public: class UnoControlFileControlModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlFileControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlFileControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlFileControlModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -221,7 +221,7 @@ public: UnoFileControl(); OUString GetComponentServiceName() override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -238,10 +238,10 @@ private: bool mbAdjustingImagePosition; bool mbAdjustingGraphic; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; + css::uno::Reference< css::graphic::XGraphicObject > mxGrfObj; protected: - GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) + GraphicControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :UnoControlModel( rxContext ) ,mbAdjustingImagePosition( false ) ,mbAdjustingGraphic( false ) @@ -250,10 +250,10 @@ protected: GraphicControlModel( const GraphicControlModel& _rSource ) : UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; // UnoControlModel - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; private: GraphicControlModel& operator=( const GraphicControlModel& ) = delete; @@ -265,22 +265,22 @@ private: class UnoControlButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlButtonModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlButtonModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -292,10 +292,10 @@ public: // class UnoButtonControl typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase - , ::com::sun::star::awt::XButton - , ::com::sun::star::awt::XToggleButton - , ::com::sun::star::awt::XLayoutConstrains - , ::com::sun::star::awt::XItemListener + , css::awt::XButton + , css::awt::XToggleButton + , css::awt::XLayoutConstrains + , css::awt::XItemListener > UnoButtonControl_Base; class UnoButtonControl : public UnoButtonControl_Base { @@ -309,32 +309,32 @@ public: UnoButtonControl(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XToggleButton - // ::com::sun::star::awt::XItemEventBroadcaster - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XToggleButton + // css::awt::XItemEventBroadcaster + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XItemListener - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -351,22 +351,22 @@ private: bool mbAdjustingImageScaleMode; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlImageControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlImageControlModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } UnoControlModel* Clone() const override { return new UnoControlImageControlModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -374,14 +374,14 @@ public: throw (css::uno::RuntimeException, std::exception) override; // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; }; // class UnoImageControlControl typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase - , ::com::sun::star::awt::XLayoutConstrains + , css::awt::XLayoutConstrains > UnoImageControlControl_Base; class UnoImageControlControl : public UnoImageControlControl_Base { @@ -393,17 +393,17 @@ public: UnoImageControlControl(); OUString GetComponentServiceName() override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -418,22 +418,22 @@ class UnoControlRadioButtonModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlRadioButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlRadioButtonModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlRadioButtonModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -445,10 +445,10 @@ public: // class UnoRadioButtonControl typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase - , ::com::sun::star::awt::XButton - , ::com::sun::star::awt::XRadioButton - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::awt::XLayoutConstrains + , css::awt::XButton + , css::awt::XRadioButton + , css::awt::XItemListener + , css::awt::XLayoutConstrains > UnoRadioButtonControl_Base; class UnoRadioButtonControl : public UnoRadioButtonControl_Base { @@ -462,34 +462,34 @@ public: UnoRadioButtonControl(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XRadioButton - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XRadioButton + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL getState( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XItemListener + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -503,22 +503,22 @@ public: class UnoControlCheckBoxModel : public GraphicControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlCheckBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlCheckBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlCheckBoxModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -530,10 +530,10 @@ public: // class UnoCheckBoxControl typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase - , ::com::sun::star::awt::XButton - , ::com::sun::star::awt::XCheckBox - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::awt::XLayoutConstrains + , css::awt::XButton + , css::awt::XCheckBox + , css::awt::XItemListener + , css::awt::XLayoutConstrains > UnoCheckBoxControl_Base; class UnoCheckBoxControl : public UnoCheckBoxControl_Base { @@ -548,36 +548,36 @@ public: virtual ~UnoCheckBoxControl(){;} OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XButton - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XButton + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getState( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setState( sal_Int16 n ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XItemListener + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -591,22 +591,22 @@ public: class UnoControlFixedHyperlinkModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlFixedHyperlinkModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlFixedHyperlinkModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedHyperlinkModel( const UnoControlFixedHyperlinkModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlFixedHyperlinkModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) }; @@ -614,8 +614,8 @@ public: // class UnoFixedHyperlinkControl class UnoFixedHyperlinkControl : public UnoControlBase, - public ::com::sun::star::awt::XFixedHyperlink, - public ::com::sun::star::awt::XLayoutConstrains + public css::awt::XFixedHyperlink, + public css::awt::XLayoutConstrains { private: ActionListenerMultiplexer maActionListeners; @@ -625,37 +625,37 @@ public: OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XFixedHyperlink + void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAlignment( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, "com.sun.star.awt.UnoControlFixedHyperlink" ) }; @@ -665,22 +665,22 @@ public: class UnoControlFixedTextModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlFixedTextModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlFixedTextModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedTextModel( const UnoControlFixedTextModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlFixedTextModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -692,37 +692,37 @@ public: // class UnoFixedTextControl class UnoFixedTextControl : public UnoControlBase, - public ::com::sun::star::awt::XFixedText, - public ::com::sun::star::awt::XLayoutConstrains + public css::awt::XFixedText, + public css::awt::XLayoutConstrains { public: UnoFixedTextControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XControl - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XControl + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XFixedText + void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAlignment( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -736,22 +736,22 @@ public: class UnoControlGroupBoxModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlGroupBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlGroupBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlGroupBoxModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -768,9 +768,9 @@ public: UnoGroupBoxControl(); OUString GetComponentServiceName() override; - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -783,7 +783,7 @@ public: struct UnoControlListBoxModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel - , ::com::sun::star::awt::XItemList + , css::awt::XItemList > UnoControlListBoxModel_Base; class TOOLKIT_DLLPUBLIC UnoControlListBoxModel : public UnoControlListBoxModel_Base { @@ -796,7 +796,7 @@ protected: public: UnoControlListBoxModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ConstructorMode const i_mode = ConstructDefault ); UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); @@ -807,44 +807,44 @@ public: virtual void ImplNormalizePropertySequence( const sal_Int32 _nCount, /// the number of entries in the arrays sal_Int32* _pHandles, /// the handles of the properties to set - ::com::sun::star::uno::Any* _pValues, /// the values of the properties to set + css::uno::Any* _pValues, /// the values of the properties to set sal_Int32* _pValidHandles /// pointer to the valid handles, allowed to be adjusted ) const override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XItemList - virtual ::sal_Int32 SAL_CALL getItemCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setItemData( ::sal_Int32 Position, const ::com::sun::star::uno::Any& DataValue ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Pair< OUString, OUString > > SAL_CALL getAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XItemList + virtual ::sal_Int32 SAL_CALL getItemCount() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAllItems( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setItemData( ::sal_Int32 Position, const css::uno::Any& DataValue ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Pair< OUString, OUString > > SAL_CALL getAllItems( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; private: @@ -852,7 +852,7 @@ private: const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText, const ::boost::optional< OUString >& i_rItemImageURL, - void ( SAL_CALL ::com::sun::star::awt::XItemListListener::*NotificationMethod )( const ::com::sun::star::awt::ItemListEvent& ) + void ( SAL_CALL css::awt::XItemListListener::*NotificationMethod )( const css::awt::ItemListEvent& ) ); void impl_handleInsert( @@ -886,11 +886,11 @@ protected: // class UnoListBoxControl typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase - , ::com::sun::star::awt::XListBox - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::awt::XLayoutConstrains - , ::com::sun::star::awt::XTextLayoutConstrains - , ::com::sun::star::awt::XItemListListener + , css::awt::XListBox + , css::awt::XItemListener + , css::awt::XLayoutConstrains + , css::awt::XTextLayoutConstrains + , css::awt::XItemListListener > UnoListBoxControl_Base; class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base { @@ -898,63 +898,63 @@ public: UnoListBoxControl(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - - // ::com::sun::star::awt::XListBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XItemListener - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTextLayoutConstrains - ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } + + // css::awt::XListBox + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getItems( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getSelectedItemPos( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getSelectedItem( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isMutipleMode( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XItemListener + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTextLayoutConstrains + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; // XUnoControl - sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; protected: void ImplUpdateSelectedItemsProperty(); - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) override; + virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override; virtual void updateFromModel() override; private: @@ -968,26 +968,26 @@ private: class UnoControlComboBoxModel : public UnoControlListBoxModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlComboBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlComboBoxModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlComboBoxModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; @@ -995,9 +995,9 @@ public: // class UnoComboBoxControl class UnoComboBoxControl : public UnoEditControl - , public ::com::sun::star::awt::XComboBox - , public ::com::sun::star::awt::XItemListener - , public ::com::sun::star::awt::XItemListListener + , public css::awt::XComboBox + , public css::awt::XItemListener + , public css::awt::XItemListListener { private: ActionListenerMultiplexer maActionListeners; @@ -1008,52 +1008,52 @@ public: UnoComboBoxControl(); OUString GetComponentServiceName() override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { UnoEditControl::disposing( Source ); } - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoEditControl::disposing( Source ); } + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XComboBox - void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XComboBox + void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getItemCount( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getItems( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDropDownLineCount( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; // XUnoControl - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override; // XItemListListener - virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemRemoved( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL listItemModified( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL allItemsRemoved( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; // XItemListener - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; protected: - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) override; + virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override; virtual void updateFromModel() override; }; @@ -1062,7 +1062,7 @@ protected: // class UnoSpinFieldControl class UnoSpinFieldControl : public UnoEditControl, - public ::com::sun::star::awt::XSpinField + public css::awt::XSpinField { private: SpinListenerMultiplexer maSpinListeners; @@ -1071,28 +1071,28 @@ private: public: UnoSpinFieldControl(); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XSpinField - void SAL_CALL addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL up() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL down() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL first() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL last() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XSpinField + void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL up() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL down() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL first() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL last() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo // No service info, only base class for other fields. }; @@ -1103,22 +1103,22 @@ public: class UnoControlDateFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlDateFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlDateFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlDateFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1130,49 +1130,49 @@ public: // class UnoDateFieldControl class UnoDateFieldControl : public UnoSpinFieldControl, - public ::com::sun::star::awt::XDateField + public css::awt::XDateField { private: - ::com::sun::star::util::Date mnFirst; - ::com::sun::star::util::Date mnLast; + css::util::Date mnFirst; + css::util::Date mnLast; TriState mbLongFormat; public: UnoDateFieldControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextListener + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; //XDateField - void SAL_CALL setDate( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getDate( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( const ::com::sun::star::util::Date& Date ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Date SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isLongFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + void SAL_CALL setDate( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getDate( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Date SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isLongFormat( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1186,22 +1186,22 @@ public: class UnoControlTimeFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlTimeFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlTimeFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlTimeFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1213,47 +1213,47 @@ public: // class UnoTimeFieldControl class UnoTimeFieldControl : public UnoSpinFieldControl, - public ::com::sun::star::awt::XTimeField + public css::awt::XTimeField { private: - ::com::sun::star::util::Time mnFirst; - ::com::sun::star::util::Time mnLast; + css::util::Time mnFirst; + css::util::Time mnLast; public: UnoTimeFieldControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XTextListener + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; //XTimeField - void SAL_CALL setTime( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( const ::com::sun::star::util::Time& Time ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::util::Time SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + void SAL_CALL setTime( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getTime( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override; + css::util::Time SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isEmpty( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1267,22 +1267,22 @@ public: class UnoControlNumericFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlNumericFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlNumericFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlNumericFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1294,7 +1294,7 @@ public: // class UnoNumericFieldControl class UnoNumericFieldControl : public UnoSpinFieldControl, - public ::com::sun::star::awt::XNumericField + public css::awt::XNumericField { private: double mnFirst; @@ -1304,39 +1304,39 @@ public: UnoNumericFieldControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XNumericField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTextListener + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XNumericField + void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1350,22 +1350,22 @@ public: class UnoControlCurrencyFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlCurrencyFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlCurrencyFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlCurrencyFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1377,7 +1377,7 @@ public: // class UnoCurrencyFieldControl class UnoCurrencyFieldControl : public UnoSpinFieldControl, - public ::com::sun::star::awt::XCurrencyField + public css::awt::XCurrencyField { private: double mnFirst; @@ -1387,39 +1387,39 @@ public: UnoCurrencyFieldControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XTextListener - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::awt::XCurrencyField - void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::lang::XServiceInfo + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XTextListener + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + + // css::awt::XCurrencyField + void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; + double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1433,22 +1433,22 @@ public: class UnoControlPatternFieldModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlPatternFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlPatternFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlPatternFieldModel( *this ); } - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1460,33 +1460,33 @@ public: // class UnoPatternFieldControl class UnoPatternFieldControl : public UnoSpinFieldControl, - public ::com::sun::star::awt::XPatternField + public css::awt::XPatternField { protected: - void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) override; + void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override; public: UnoPatternFieldControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XPatternField + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getString( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1500,20 +1500,20 @@ public: class UnoControlProgressBarModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlProgressBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlProgressBarModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlProgressBarModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -1527,29 +1527,29 @@ public: // class UnoProgressBarControl class UnoProgressBarControl : public UnoControlBase, - public ::com::sun::star::awt::XProgressBar + public css::awt::XProgressBar { public: UnoProgressBarControl(); OUString GetComponentServiceName() override; - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); } + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakAggObject::acquire(); } void SAL_CALL release() throw() override { OWeakAggObject::release(); } - // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XTypeProvider + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::awt::XProgressBar - void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ) override; - sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::awt::XProgressBar + void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) override; + sal_Int32 SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1564,22 +1564,22 @@ public: class UnoControlFixedLineModel : public UnoControlModel { protected: - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; public: - UnoControlFixedLineModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + UnoControlFixedLineModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;} UnoControlModel* Clone() const override { return new UnoControlFixedLineModel( *this ); } - // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XMultiPropertySet + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::io::XPersistObject + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; @@ -1596,9 +1596,9 @@ public: UnoFixedLineControl(); OUString GetComponentServiceName() override; - sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isTransparent( ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx index fc99828e2aa6..95255e7a5db8 100644 --- a/include/toolkit/helper/accessiblefactory.hxx +++ b/include/toolkit/helper/accessiblefactory.hxx @@ -63,62 +63,62 @@ namespace toolkit public: /** creates an accessible context for a button window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXButton* _pXWindow ) = 0; /** creates an accessible context for a checkbox window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXCheckBox* _pXWindow ) = 0; /** creates an accessible context for a radio button window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXRadioButton* _pXWindow ) = 0; /** creates an accessible context for a listbox window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXListBox* _pXWindow ) = 0; /** creates an accessible context for a fixed hyperlink window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) = 0; /** creates an accessible context for a fixed text window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXFixedText* _pXWindow ) = 0; /** creates an accessible context for a scrollbar window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXScrollBar* _pXWindow ) = 0; /** creates an accessible context for a edit window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXEdit* _pXWindow ) = 0; /** creates an accessible context for a combo box window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXComboBox* _pXWindow ) = 0; /** creates an accessible context for a toolbox window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXToolBox* _pXWindow ) = 0; /** creates an accessible context for a generic window */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > createAccessibleContext( VCLXWindow* _pXWindow ) = 0; /** creates an accessible component for the given menu */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > createAccessible( Menu* _pMenu, bool _bIsMenuBar ) = 0; protected: diff --git a/include/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx index 8040c8d0e91d..a189f8562519 100644 --- a/include/toolkit/helper/convert.hxx +++ b/include/toolkit/helper/convert.hxx @@ -26,32 +26,32 @@ #include <tools/gen.hxx> -inline ::com::sun::star::awt::Size AWTSize( const Size& rVCLSize ) +inline css::awt::Size AWTSize( const Size& rVCLSize ) { - return ::com::sun::star::awt::Size( rVCLSize.Width(), rVCLSize.Height() ); + return css::awt::Size( rVCLSize.Width(), rVCLSize.Height() ); } -inline ::Size VCLSize( const ::com::sun::star::awt::Size& rAWTSize ) +inline ::Size VCLSize( const css::awt::Size& rAWTSize ) { return ::Size( rAWTSize.Width, rAWTSize.Height ); } -inline ::com::sun::star::awt::Point AWTPoint( const ::Point& rVCLPoint ) +inline css::awt::Point AWTPoint( const ::Point& rVCLPoint ) { - return ::com::sun::star::awt::Point( rVCLPoint.X(), rVCLPoint.Y() ); + return css::awt::Point( rVCLPoint.X(), rVCLPoint.Y() ); } -inline ::Point VCLPoint( const ::com::sun::star::awt::Point& rAWTPoint ) +inline ::Point VCLPoint( const css::awt::Point& rAWTPoint ) { return ::Point( rAWTPoint.X, rAWTPoint.Y ); } -inline ::com::sun::star::awt::Rectangle AWTRectangle( const ::Rectangle& rVCLRect ) +inline css::awt::Rectangle AWTRectangle( const ::Rectangle& rVCLRect ) { - return ::com::sun::star::awt::Rectangle( rVCLRect.Left(), rVCLRect.Top(), rVCLRect.GetWidth(), rVCLRect.GetHeight() ); + return css::awt::Rectangle( rVCLRect.Left(), rVCLRect.Top(), rVCLRect.GetWidth(), rVCLRect.GetHeight() ); } -inline ::Rectangle VCLRectangle( const ::com::sun::star::awt::Rectangle& rAWTRect ) +inline ::Rectangle VCLRectangle( const css::awt::Rectangle& rAWTRect ) { return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); } diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index d37a85e3ac35..96d5ab54a426 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -28,16 +28,16 @@ // class EmptyFontDescriptor -class EmptyFontDescriptor : public ::com::sun::star::awt::FontDescriptor +class EmptyFontDescriptor : public css::awt::FontDescriptor { public: EmptyFontDescriptor() { // Not all enums are initialized correctly in FontDescriptor-CTOR because // they are set to the first enum value, this is not always the default value. - Slant = ::com::sun::star::awt::FontSlant_DONTKNOW; - Underline = ::com::sun::star::awt::FontUnderline::DONTKNOW; - Strikeout = ::com::sun::star::awt::FontStrikeout::DONTKNOW; + Slant = css::awt::FontSlant_DONTKNOW; + Underline = css::awt::FontUnderline::DONTKNOW; + Strikeout = css::awt::FontStrikeout::DONTKNOW; } }; diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx index 569372f9e3d7..39df68cdf445 100644 --- a/include/toolkit/helper/formpdfexport.hxx +++ b/include/toolkit/helper/formpdfexport.hxx @@ -41,7 +41,7 @@ namespace toolkitform /** creates a PDF compatible control descriptor for the given control */ std::unique_ptr<vcl::PDFWriter::AnyWidget> TOOLKIT_DLLPUBLIC describePDFControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XControl >& _rxControl, vcl::PDFExtOutDevData& i_pdfExportData ); diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index b6823dd59219..49dab94db067 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -55,7 +55,7 @@ class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, public ::cppu::OInterfaceContainerHelper, - public ::com::sun::star::uno::XInterface + public css::uno::XInterface { private: ::cppu::OWeakObject& mrContext; @@ -67,8 +67,8 @@ public: ListenerMultiplexerBase( ::cppu::OWeakObject& rSource ); virtual ~ListenerMultiplexerBase(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { mrContext.acquire(); } void SAL_CALL release() throw() override { mrContext.release(); } }; @@ -77,26 +77,26 @@ public: // class EventListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, ::com::sun::star::lang::XEventListener ) +DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, css::lang::XEventListener ) DECL_LISTENERMULTIPLEXER_END // class FocusListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) - void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, css::awt::XFocusListener ) + void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class WindowListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) - void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWindowListener ) + void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowShown( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END @@ -104,163 +104,163 @@ DECL_LISTENERMULTIPLEXER_END // class VclContainerListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, ::com::sun::star::awt::XVclContainerListener ) - void SAL_CALL windowAdded( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowRemoved( const ::com::sun::star::awt::VclContainerEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, css::awt::XVclContainerListener ) + void SAL_CALL windowAdded( const css::awt::VclContainerEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowRemoved( const css::awt::VclContainerEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class KeyListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, css::awt::XKeyListener ) + void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class MouseListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, ::com::sun::star::awt::XMouseListener ) - void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, css::awt::XMouseListener ) + void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class MouseMotionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) - void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, css::awt::XMouseMotionListener ) + void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class PaintListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) - void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, css::awt::XPaintListener ) + void SAL_CALL windowPaint( const css::awt::PaintEvent& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TopWindowListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, ::com::sun::star::awt::XTopWindowListener ) - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, css::awt::XTopWindowListener ) + void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TextListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, ::com::sun::star::awt::XTextListener ) - void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, css::awt::XTextListener ) + void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class ActionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) - void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, css::awt::XActionListener ) + void SAL_CALL actionPerformed( const css::awt::ActionEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class ItemListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener ) - void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, css::awt::XItemListener ) + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TabListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener ) - void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, css::awt::XTabListener ) + void SAL_CALL inserted( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL removed( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL activated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL deactivated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class ContainerListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener ) - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, css::container::XContainerListener ) + void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class SpinListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, ::com::sun::star::awt::XSpinListener ) - void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, css::awt::XSpinListener ) + void SAL_CALL up( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL down( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL first( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL last( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class AdjustmentListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, ::com::sun::star::awt::XAdjustmentListener ) - void SAL_CALL adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, css::awt::XAdjustmentListener ) + void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class MenuListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener ) - void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, css::awt::XMenuListener ) + void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TreeSelectionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, ::com::sun::star::view::XSelectionChangeListener ) - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, css::view::XSelectionChangeListener ) + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TreeExpansionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, ::com::sun::star::awt::tree::XTreeExpansionListener ) - virtual void SAL_CALL requestChildNodes( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeExpanding( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeCollapsing( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeExpanded( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeCollapsed( const ::com::sun::star::awt::tree::TreeExpansionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener ) + virtual void SAL_CALL requestChildNodes( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL treeExpanding( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL treeCollapsing( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL treeExpanded( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL treeCollapsed( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TreeEditListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) - virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException, std::exception) override; - virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, css::awt::tree::XTreeEditListener ) + virtual void SAL_CALL nodeEditing( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::uno::RuntimeException,css::util::VetoException, std::exception) override; + virtual void SAL_CALL nodeEdited( const css::uno::Reference< css::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class SelectionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, ::com::sun::star::awt::grid::XGridSelectionListener ) - void SAL_CALL selectionChanged( const ::com::sun::star::awt::grid::GridSelectionEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, css::awt::grid::XGridSelectionListener ) + void SAL_CALL selectionChanged( const css::awt::grid::GridSelectionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END // class TabPageListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::star::awt::tab::XTabPageContainerListener ) - void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener ) + void SAL_CALL tabPageActivated( const css::awt::tab::TabPageActivatedEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; DECL_LISTENERMULTIPLEXER_END #endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 3ffe023fee99..584129131b0f 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -25,7 +25,7 @@ #include <comphelper/servicehelper.hxx> #define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ -sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +sal_Int64 ClassName::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) \ { \ if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ { \ @@ -37,28 +37,28 @@ namespace \ { \ class the##ClassName##UnoTunnelId : public rtl::Static< UnoTunnelIdInit, the##ClassName##UnoTunnelId> {}; \ } \ -const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() throw() \ +const css::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() throw() \ { \ return the##ClassName##UnoTunnelId::get().getSeq(); \ } #define IMPL_XUNOTUNNEL( ClassName ) \ IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ -ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) \ +ClassName* ClassName::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) \ { \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ + css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); \ return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ } #define IMPL_IMPLEMENTATION_ID( ClassName ) \ -::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(css::uno::RuntimeException, std::exception) \ { \ return css::uno::Sequence<sal_Int8>(); \ } #define IMPL_XTYPEPROVIDER_START( ClassName ) \ IMPL_IMPLEMENTATION_ID( ClassName ) \ -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > ClassName::getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::RuntimeException, std::exception) \ { \ static ::cppu::OTypeCollection* pCollection = NULL; \ if( !pCollection ) \ @@ -86,10 +86,10 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; \ + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; \ void SAL_CALL acquire() throw() override; \ void SAL_CALL release() throw() override; \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; @@ -98,10 +98,10 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter { \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; \ + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; \ void SAL_CALL acquire() throw() override; \ void SAL_CALL release() throw() override; \ - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; @@ -117,14 +117,14 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ } \ void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \ void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \ -::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Any ClassName::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) \ { \ - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \ - (static_cast< ::com::sun::star::lang::XEventListener* >(this)), \ + css::uno::Any aRet = ::cppu::queryInterface( rType, \ + (static_cast< css::lang::XEventListener* >(this)), \ (static_cast< InterfaceName* >(this)) ); \ return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); \ } \ -void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) \ { \ } @@ -145,19 +145,19 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: ::cppu::OInterfaceIteratorHelper aIt( *this ); \ while( aIt.hasMoreElements() ) \ { \ - ::com::sun::star::uno::Reference< InterfaceName > xListener( \ + css::uno::Reference< InterfaceName > xListener( \ static_cast< InterfaceName* >( aIt.next() ) ); \ try \ { \ xListener->MethodName( aMulti ); \ } \ - catch(const ::com::sun::star::lang::DisposedException& e) \ + catch(const css::lang::DisposedException& e) \ { \ OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); \ if ( e.Context == xListener || !e.Context.is() ) \ aIt.remove(); \ } \ - catch(const ::com::sun::star::uno::RuntimeException& e) \ + catch(const css::uno::RuntimeException& e) \ { \ DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ } \ @@ -171,19 +171,19 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: ::cppu::OInterfaceIteratorHelper aIt( *this ); \ while( aIt.hasMoreElements() ) \ { \ - ::com::sun::star::uno::Reference< InterfaceName > xListener( \ + css::uno::Reference< InterfaceName > xListener( \ static_cast< InterfaceName* >( aIt.next() ) ); \ try \ { \ xListener->MethodName( aMulti ); \ } \ - catch(const ::com::sun::star::lang::DisposedException& e) \ + catch(const css::lang::DisposedException& e) \ { \ OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); \ if ( e.Context == xListener || !e.Context.is() ) \ aIt.remove(); \ } \ - catch(const ::com::sun::star::uno::RuntimeException& e) \ + catch(const css::uno::RuntimeException& e) \ { \ DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ } \ @@ -191,18 +191,18 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: } #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( ClassName, InterfaceName, MethodName, EventType, Exception ) \ -void ClassName::MethodName( const EventType& evt ) throw(::com::sun::star::uno::RuntimeException, Exception, std::exception) \ +void ClassName::MethodName( const EventType& evt ) throw(css::uno::RuntimeException, Exception, std::exception) \ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType ) #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ClassName, InterfaceName, MethodName, EventType ) \ -void ClassName::MethodName( const EventType& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +void ClassName::MethodName( const EventType& evt ) throw(css::uno::RuntimeException, std::exception) \ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType ) #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ - OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override { return OUString("stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override \ + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override { return OUString("stardiv.Toolkit." #ImplName ); } \ + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override \ { \ - ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \ + css::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ aNames[ aNames.getLength() - 1 ] = ServiceName; \ return aNames; \ diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index 92f772bf6f19..114795b880f7 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -43,7 +43,7 @@ namespace uno { #define BASEPROPERTY_LINECOLOR 5 // sal_Int32 #define BASEPROPERTY_BORDER 6 // sal_Int16 #define BASEPROPERTY_ALIGN 7 // sal_Int16 -#define BASEPROPERTY_FONTDESCRIPTOR 8 // ::com::sun::star::awt::FontDescriptor +#define BASEPROPERTY_FONTDESCRIPTOR 8 // css::awt::FontDescriptor #define BASEPROPERTY_DROPDOWN 9 // sal_Bool #define BASEPROPERTY_MULTILINE 10 // sal_Bool #define BASEPROPERTY_STRINGITEMLIST 11 // UStringSequence @@ -65,12 +65,12 @@ namespace uno { #define BASEPROPERTY_SPIN 27 // sal_Bool #define BASEPROPERTY_STRICTFORMAT 28 // sal_Bool #define BASEPROPERTY_DECIMALACCURACY 29 // sal_Int16 -#define BASEPROPERTY_DATE 30 // ::com::sun::star::util::Date -#define BASEPROPERTY_DATEMIN 31 // ::com::sun::star::util::Date -#define BASEPROPERTY_DATEMAX 32 // ::com::sun::star::util::Date -#define BASEPROPERTY_TIME 33 // ::com::sun::star::util::Time -#define BASEPROPERTY_TIMEMIN 34 // ::com::sun::star::util::Time -#define BASEPROPERTY_TIMEMAX 35 // ::com::sun::star::util::Time +#define BASEPROPERTY_DATE 30 // css::util::Date +#define BASEPROPERTY_DATEMIN 31 // css::util::Date +#define BASEPROPERTY_DATEMAX 32 // css::util::Date +#define BASEPROPERTY_TIME 33 // css::util::Time +#define BASEPROPERTY_TIMEMIN 34 // css::util::Time +#define BASEPROPERTY_TIMEMAX 35 // css::util::Time #define BASEPROPERTY_VALUE_INT32 36 // sal_Int32 #define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 #define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 @@ -97,7 +97,7 @@ namespace uno { #define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool //#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool #define BASEPROPERTY_FORMATKEY 61 // sal_Bool -#define BASEPROPERTY_FORMATSSUPPLIER 62 // ::com::sun::star::util::XNumberFormatsSupplier +#define BASEPROPERTY_FORMATSSUPPLIER 62 // css::util::XNumberFormatsSupplier #define BASEPROPERTY_EFFECTIVE_VALUE 63 // Any (double or string) #define BASEPROPERTY_TREATASNUMBER 64 // sal_Bool #define BASEPROPERTY_EFFECTIVE_DEFAULT 65 // Any (double or string) @@ -235,12 +235,12 @@ namespace uno { TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const OUString& rPropertyName ); -const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); +const css::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); TOOLKIT_DLLPUBLIC const OUString& GetPropertyName( sal_uInt16 nPropertyId ); sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); bool DoesDependOnOthers( sal_uInt16 nPropertyId ); -bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ); +bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ); diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index a03e89655b18..bd02d6a498d0 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -73,36 +73,36 @@ class TOOLKIT_DLLPUBLIC VCLUnoHelper { public: // Toolkit - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> CreateToolkit(); + static css::uno::Reference< css::awt::XToolkit> CreateToolkit(); // Bitmap - static BitmapEx GetBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>& rxBitmap ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); + static BitmapEx GetBitmap( const css::uno::Reference< css::awt::XBitmap>& rxBitmap ); + static css::uno::Reference< css::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); // Window - static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); - static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); - static VclPtr< vcl::Window > GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( vcl::Window* pWindow ); + static VclPtr< vcl::Window > GetWindow( const css::uno::Reference< css::awt::XWindow>& rxWindow ); + static VclPtr< vcl::Window > GetWindow( const css::uno::Reference< css::awt::XWindow2>& rxWindow2 ); + static VclPtr< vcl::Window > GetWindow( const css::uno::Reference< css::awt::XWindowPeer>& rxWindowPeer ); + static css::uno::Reference< css::awt::XWindow> GetInterface( vcl::Window* pWindow ); // OutputDevice - static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ); - static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ); + static OutputDevice* GetOutputDevice( const css::uno::Reference< css::awt::XDevice>& rxDevice ); + static OutputDevice* GetOutputDevice( const css::uno::Reference< css::awt::XGraphics>& rxGraphics ); // Region - static vcl::Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); + static vcl::Region GetRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ); // Polygon - static tools::Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); + static tools::Polygon CreatePolygon( const css::uno::Sequence< sal_Int32 >& DataX, const css::uno::Sequence< sal_Int32 >& DataY ); - /** convert Font to ::com::sun::star::awt::FontDescriptor + /** convert Font to css::awt::FontDescriptor @param rFont Font to be converted @return the new FontDescriptor */ - static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const vcl::Font& rFont ); - static vcl::Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ); - static vcl::Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); - static ::com::sun::star::awt::SimpleFontMetric CreateFontMetric( const FontMetric& rFontMetric ); + static css::awt::FontDescriptor CreateFontDescriptor( const vcl::Font& rFont ); + static vcl::Font CreateFont( const css::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ); + static vcl::Font CreateFont( const css::uno::Reference< css::awt::XFont >& rxFont ); + static css::awt::SimpleFontMetric CreateFontMetric( const FontMetric& rFontMetric ); static float ConvertFontWidth( FontWidth eWidth ); static FontWidth ConvertFontWidth( float f ); static float ConvertFontWeight( FontWeight eWeight ); @@ -113,7 +113,7 @@ public: // Rectangle static bool IsZero(const css::awt::Rectangle& rRect); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( vcl::Window* pWindow ); + static css::uno::Reference< css::awt::XControlContainer> CreateControlContainer( vcl::Window* pWindow ); // MapUnits static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); @@ -128,32 +128,32 @@ public: static sal_Int16 ConvertToMeasurementUnit( FieldUnit _nFieldUnit, sal_Int16 _rFieldToUNOValueFactor ); static FieldUnit ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor ); - static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (::com::sun::star::lang::IllegalArgumentException); + static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (css::lang::IllegalArgumentException); - static ::Size /* VCLSize */ ConvertToVCLSize(::com::sun::star::awt::Size const& _aSize); - static ::com::sun::star::awt::Size ConvertToAWTSize(::Size /* VCLSize */ const& _aSize); + static ::Size /* VCLSize */ ConvertToVCLSize(css::awt::Size const& _aSize); + static css::awt::Size ConvertToAWTSize(::Size /* VCLSize */ const& _aSize); - static ::Point /* VCLPoint */ ConvertToVCLPoint(::com::sun::star::awt::Point const& _aPoint); - static ::com::sun::star::awt::Point ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint); + static ::Point /* VCLPoint */ ConvertToVCLPoint(css::awt::Point const& _aPoint); + static css::awt::Point ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint); - static ::Rectangle ConvertToVCLRect( ::com::sun::star::awt::Rectangle const & _rRect ); - static ::com::sun::star::awt::Rectangle ConvertToAWTRect( ::Rectangle const & _rRect ); + static ::Rectangle ConvertToVCLRect( css::awt::Rectangle const & _rRect ); + static css::awt::Rectangle ConvertToAWTRect( ::Rectangle const & _rRect ); - static ::com::sun::star::awt::MouseEvent + static css::awt::MouseEvent createMouseEvent( const ::MouseEvent& _rVclEvent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext + const css::uno::Reference< css::uno::XInterface >& _rxContext ); - static ::MouseEvent createVCLMouseEvent( const ::com::sun::star::awt::MouseEvent& _rAwtEvent ); + static ::MouseEvent createVCLMouseEvent( const css::awt::MouseEvent& _rAwtEvent ); - static ::com::sun::star::awt::KeyEvent + static css::awt::KeyEvent createKeyEvent( const ::KeyEvent& _rVclEvent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext + const css::uno::Reference< css::uno::XInterface >& _rxContext ); - static ::KeyEvent createVCLKeyEvent( const ::com::sun::star::awt::KeyEvent& _rAwtEvent ); + static ::KeyEvent createVCLKeyEvent( const css::awt::KeyEvent& _rAwtEvent ); }; diff --git a/include/tools/date.hxx b/include/tools/date.hxx index 0fc4109c42f7..22cec9abf78f 100644 --- a/include/tools/date.hxx +++ b/include/tools/date.hxx @@ -57,16 +57,16 @@ public: { nDate = rDate.nDate; } Date( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear ) { init(nDay, nMonth, nYear); } - Date( const ::com::sun::star::util::Date& _rDate ) + Date( const css::util::Date& _rDate ) { SAL_WARN_IF(_rDate.Year < 0, "tools.datetime", "Negative year in css::util::Date to ::Date conversion"); init(_rDate.Day, _rDate.Month, _rDate.Year); } - Date( const ::com::sun::star::util::DateTime& _rDateTime ); + Date( const css::util::DateTime& _rDateTime ); void SetDate( sal_uInt32 nNewDate ) { nDate = nNewDate; } sal_uInt32 GetDate() const { return nDate; } - ::com::sun::star::util::Date GetUNODate() const { return ::com::sun::star::util::Date(GetDay(), GetMonth(), GetYear()); } + css::util::Date GetUNODate() const { return css::util::Date(GetDay(), GetMonth(), GetYear()); } void SetDay( sal_uInt16 nNewDay ); void SetMonth( sal_uInt16 nNewMonth ); diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index b162f94db8fd..7dec15c6f0a3 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -29,7 +29,7 @@ #include <tools/toolsdllapi.h> -TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& caughtException, const char* currentFunction, const char* fileAndLineNo); +TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, const char* currentFunction, const char* fileAndLineNo); #if OSL_DEBUG_LEVEL > 0 #include <com/sun/star/configuration/CorruptedConfigurationException.hpp> @@ -55,14 +55,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& cau */ #define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \ OSL_ENSURE(c, m); \ - throw ::com::sun::star::lang::IllegalArgumentException( \ + throw css::lang::IllegalArgumentException( \ OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + ",\n" m, \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \ + css::uno::Reference< css::uno::XInterface >(), \ 0 ); } #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \ OSL_ENSURE(c, m); \ - throw ::com::sun::star::lang::IllegalArgumentException( \ + throw css::lang::IllegalArgumentException( \ OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + ",\n" m, \ ifc, \ @@ -74,14 +74,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& cau #define ENSURE_OR_THROW(c, m) \ if( !(c) ){ \ OSL_ENSURE(c, m); \ - throw ::com::sun::star::uno::RuntimeException( \ + throw css::uno::RuntimeException( \ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } + css::uno::Reference< css::uno::XInterface >() ); } #define ENSURE_OR_THROW2(c, m, ifc) \ if( !(c) ) { \ OSL_ENSURE(c, m); \ - throw ::com::sun::star::uno::RuntimeException( \ + throw css::uno::RuntimeException( \ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ ifc ); } diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx index 42ff4f49776e..e1ec0e33dc82 100644 --- a/include/tools/globname.hxx +++ b/include/tools/globname.hxx @@ -68,7 +68,7 @@ public: sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ); // create SvGlobalName from a platform independent representation - SvGlobalName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeq ); + SvGlobalName( const css::uno::Sequence< sal_Int8 >& aSeq ); SvGlobalName( const SvGUID & rId ); @@ -94,7 +94,7 @@ public: // platform independent representation of a "GlobalName" // maybe transported remotely - com::sun::star::uno::Sequence < sal_Int8 > GetByteSequence() const; + css::uno::Sequence < sal_Int8 > GetByteSequence() const; }; #endif diff --git a/include/tools/time.hxx b/include/tools/time.hxx index 5b72b9f179b6..ee88343eff43 100644 --- a/include/tools/time.hxx +++ b/include/tools/time.hxx @@ -69,14 +69,14 @@ public: Time( TimeInitSystem ); Time( sal_Int64 _nTime ) { Time::nTime = _nTime; } Time( const tools::Time& rTime ); - Time( const ::com::sun::star::util::Time& rTime ); - Time( const ::com::sun::star::util::DateTime& rDateTime ); + Time( const css::util::Time& rTime ); + Time( const css::util::DateTime& rDateTime ); Time( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec = 0, sal_uInt64 nNanoSec = 0 ); void SetTime( sal_Int64 nNewTime ) { nTime = nNewTime; } sal_Int64 GetTime() const { return nTime; } - ::com::sun::star::util::Time GetUNOTime() const { return ::com::sun::star::util::Time(GetNanoSec(),GetSec(),GetMin(),GetHour(),false); } + css::util::Time GetUNOTime() const { return css::util::Time(GetNanoSec(),GetSec(),GetMin(),GetHour(),false); } void SetHour( sal_uInt16 nNewHour ); void SetMin( sal_uInt16 nNewMin ); diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index d487851eb575..7e1869ccced1 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -176,8 +176,8 @@ public: const; OUString - getAbbreviated(com::sun::star::uno::Reference< - com::sun::star::util::XStringWidth > const & + getAbbreviated(css::uno::Reference< + css::util::XStringWidth > const & rStringWidth, sal_Int32 nWidth, DecodeMechanism eMechanism = DECODE_TO_IURI, diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx index 05e7568373d6..2b5e855193dd 100644 --- a/include/typelib/typedescription.hxx +++ b/include/typelib/typedescription.hxx @@ -72,7 +72,7 @@ public: @param rType a type */ - inline TypeDescription( const ::com::sun::star::uno::Type & rType ); + inline TypeDescription( const css::uno::Type & rType ); /** Copy constructor: @param rDescr another TypeDescription @@ -152,7 +152,7 @@ inline TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTyp typelib_typedescriptionreference_getDescription( &_pTypeDescr, pTypeDescrRef ); } -inline TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) +inline TypeDescription::TypeDescription( const css::uno::Type & rType ) : _pTypeDescr( 0 ) { if (rType.getTypeLibType()) |