diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 21:39:27 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:21 +0200 |
commit | 123c64ab007868eaed24810d1c52ca84f7a6ac52 (patch) | |
tree | 0abd24962340197364499bf4dc64f0e22ccdac70 | |
parent | 78b2d8211112df0a5938efbc8db0f8e48ae9e2e7 (diff) |
starawt -> css::awt
Change-Id: I76dd16aa2c42a649162ea2e37c824af30cdd557b
-rw-r--r-- | comphelper/source/streaming/basicio.cxx | 6 | ||||
-rw-r--r-- | include/comphelper/basicio.hxx | 5 | ||||
-rw-r--r-- | include/comphelper/types.hxx | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index d81ec90c79a9..0680af68ca04 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -27,7 +27,7 @@ namespace comphelper const css::uno::Reference<stario::XObjectOutputStream>& operator << ( const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, - const starawt::FontDescriptor& _rFont) + const css::awt::FontDescriptor& _rFont) { _rxOutStream->writeUTF( _rFont.Name ); _rxOutStream->writeShort( _rFont.Height ); @@ -52,7 +52,7 @@ const css::uno::Reference<stario::XObjectOutputStream>& operator << ( const css::uno::Reference<stario::XObjectInputStream>& operator >> ( const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, - starawt::FontDescriptor& _rFont) + css::awt::FontDescriptor& _rFont) { // schreiben des Fontdescriptors _rFont.Name = _rxInStream->readUTF(); @@ -64,7 +64,7 @@ const css::uno::Reference<stario::XObjectInputStream>& operator >> ( _rFont.Pitch = _rxInStream->readShort(); _rFont.CharacterWidth = static_cast< float >(_rxInStream->readDouble()); _rFont.Weight = static_cast< float >(_rxInStream->readDouble()); - _rFont.Slant = (starawt::FontSlant)_rxInStream->readShort(); + _rFont.Slant = (css::awt::FontSlant)_rxInStream->readShort(); _rFont.Underline = _rxInStream->readShort(); _rFont.Strikeout = _rxInStream->readShort(); _rFont.Orientation = static_cast< float >(_rxInStream->readDouble()); diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx index e5bcd77b77d5..525daf6370ae 100644 --- a/include/comphelper/basicio.hxx +++ b/include/comphelper/basicio.hxx @@ -30,7 +30,6 @@ namespace comphelper namespace stario = ::com::sun::star::io; -namespace starawt = ::com::sun::star::awt; // bool COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal); @@ -60,8 +59,8 @@ COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& oper COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue); // FontDescriptor -COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, starawt::FontDescriptor& rVal); -COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const starawt::FontDescriptor& rVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& InStream, css::awt::FontDescriptor& rVal); +COMPHELPER_DLLPUBLIC const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& OutStream, const css::awt::FontDescriptor& rVal); // sequences template <class ELEMENT> diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 25e9a48ff731..355daf2d71b3 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { namespace awt { namespace comphelper { - namespace starawt = ::com::sun::star::awt; typedef css::uno::Reference< css::uno::XInterface > InterfaceRef; typedef css::uno::Sequence< OUString > StringSequence; @@ -52,8 +51,8 @@ namespace comphelper /** compare two FontDescriptor's */ - COMPHELPER_DLLPUBLIC bool operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight); - inline bool operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight) + COMPHELPER_DLLPUBLIC bool operator ==(const css::awt::FontDescriptor& _rLeft, const css::awt::FontDescriptor& _rRight); + inline bool operator !=(const css::awt::FontDescriptor& _rLeft, const css::awt::FontDescriptor& _rRight) { return !(_rLeft == _rRight); } @@ -129,7 +128,7 @@ namespace comphelper the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) */ - COMPHELPER_DLLPUBLIC starawt::FontDescriptor getDefaultFont(); + COMPHELPER_DLLPUBLIC css::awt::FontDescriptor getDefaultFont(); /** examine a sequence for the com.sun.star.uno::Type of it's elements. */ |