diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /forms/source/component/ImageButton.cxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'forms/source/component/ImageButton.cxx')
-rw-r--r-- | forms/source/component/ImageButton.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 025f6938e0b0..7fa744c50ea3 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -84,7 +84,7 @@ StringSequence OImageButtonModel::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGEBUTTON; return aSupported; } @@ -95,14 +95,14 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) BEGIN_DESCRIBE_PROPERTIES( 5, OClickableImageBaseModel ) DECL_PROP1(BUTTONTYPE, FormButtonType, BOUND); DECL_PROP1(DISPATCHURLINTERNAL, sal_Bool, BOUND); - DECL_PROP1(TARGET_URL, ::rtl::OUString, BOUND); - DECL_PROP1(TARGET_FRAME, ::rtl::OUString, BOUND); + DECL_PROP1(TARGET_URL, OUString, BOUND); + DECL_PROP1(TARGET_FRAME, OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ -::rtl::OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility ! } @@ -116,7 +116,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeShort(0x0003); _rxOutStream->writeShort((sal_uInt16)m_eButtonType); - ::rtl::OUString sTmp(INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS)); + OUString sTmp(INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); @@ -156,8 +156,8 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t default : OSL_FAIL("OImageButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; - m_sTargetURL = ::rtl::OUString(); - m_sTargetFrame = ::rtl::OUString(); + m_sTargetURL = OUString(); + m_sTargetFrame = OUString(); break; } } @@ -186,7 +186,7 @@ StringSequence OImageButtonControl::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGEBUTTON; return aSupported; } |