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 /svx/source/accessibility | |
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 'svx/source/accessibility')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 36 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 1 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleGraphicShape.cxx | 8 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 14 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 23 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 6 | ||||
-rw-r--r-- | svx/source/accessibility/DescriptionGenerator.cxx | 6 | ||||
-rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/ShapeTypeHandler.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 18 | ||||
-rw-r--r-- | svx/source/accessibility/lookupcolorname.cxx | 12 | ||||
-rw-r--r-- | svx/source/accessibility/lookupcolorname.hxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 34 |
13 files changed, 80 insertions, 84 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 536967f84425..fe548111eacd 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -55,26 +55,26 @@ using namespace ::com::sun::star::container; namespace { //................................................................ - const ::rtl::OUString& lcl_getNamePropertyName( ) + const OUString& lcl_getNamePropertyName( ) { - static ::rtl::OUString s_sNamePropertyName( "Name" ); + static OUString s_sNamePropertyName( "Name" ); return s_sNamePropertyName; } //................................................................ - const ::rtl::OUString& lcl_getDescPropertyName( ) + const OUString& lcl_getDescPropertyName( ) { - static ::rtl::OUString s_sDescPropertyDesc( "HelpText" ); + static OUString s_sDescPropertyDesc( "HelpText" ); return s_sDescPropertyDesc; } //................................................................ - const ::rtl::OUString& lcl_getLabelPropertyName( ) + const OUString& lcl_getLabelPropertyName( ) { - static ::rtl::OUString s_sLabelPropertyLabel( "Label" ); + static OUString s_sLabelPropertyLabel( "Label" ); return s_sLabelPropertyLabel; } //................................................................ // return the property which should be used as AccessibleName - const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) + const OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) { if ( _rxPSI.is() && _rxPSI->hasPropertyByName( lcl_getLabelPropertyName() ) ) return lcl_getLabelPropertyName(); @@ -318,15 +318,15 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) } //----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException) +OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } //----------------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -348,7 +348,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) //-------------------------------------------------------------------- -::rtl::OUString +OUString AccessibleControlShape::CreateAccessibleDescription (void) throw (RuntimeException) { @@ -359,7 +359,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) case DRAWING_CONTROL: { // check if we can obtain the "Desc" property from the model - ::rtl::OUString sDesc( getControlModelStringProperty( lcl_getDescPropertyName() ) ); + OUString sDesc( getControlModelStringProperty( lcl_getDescPropertyName() ) ); if ( sDesc.isEmpty() ) { // no -> use the default aDG.Initialize (STR_ObjNameSingulUno); @@ -524,7 +524,7 @@ void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) th //-------------------------------------------------------------------- bool AccessibleControlShape::ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening, - const ::rtl::OUString& _rPropertyName ) + const OUString& _rPropertyName ) { if ( ( _bCurrentlyListening == _bNeedNewListening ) || !ensureControlModelAccess() ) // nothing to do @@ -622,14 +622,14 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib } //-------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) { ensureControlModelAccess(); // check if we can obtain the "Name" resp. "Label" property from the model - const ::rtl::OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta ); + const OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta ); - ::rtl::OUString sName( getControlModelStringProperty( rAccNameProperty ) ); + OUString sName( getControlModelStringProperty( rAccNameProperty ) ); if ( sName.isEmpty() ) { // no -> use the default sName = AccessibleShape::CreateAccessibleName(); @@ -756,9 +756,9 @@ void AccessibleControlShape::stopStateMultiplexing() } //-------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::getControlModelStringProperty( const ::rtl::OUString& _rPropertyName ) const SAL_THROW(()) +OUString AccessibleControlShape::getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(()) { - ::rtl::OUString sReturn; + OUString sReturn; try { if ( const_cast< AccessibleControlShape* >( this )->ensureControlModelAccess() ) diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index ad36a0de804a..ee90e33c9b90 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -44,7 +44,6 @@ namespace svx { namespace a11y { -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 479be2763347..eb021c36a1db 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -48,7 +48,7 @@ AccessibleGraphicShape::~AccessibleGraphicShape (void) //===== XAccessibleImage ==================================================== -::rtl::OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) +OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleShape::getAccessibleDescription (); @@ -121,7 +121,7 @@ OUString SAL_CALL -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -164,7 +164,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. -::rtl::OUString +OUString AccessibleGraphicShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -189,7 +189,7 @@ uno::Sequence<uno::Type> SAL_CALL -::rtl::OUString +OUString AccessibleGraphicShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 82265860cfa2..d8b742cc767a 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -66,7 +66,7 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) -::rtl::OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) +OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { @@ -122,7 +122,7 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -132,19 +132,19 @@ void SAL_CALL -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed(); // Get list of supported service names from base class... - uno::Sequence< ::rtl::OUString > aServiceNames = + uno::Sequence< OUString > aServiceNames = AccessibleShape::getSupportedServiceNames(); sal_Int32 nCount (aServiceNames.getLength()); // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const ::rtl::OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape"); + static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape"); aServiceNames[nCount] = sAdditionalServiceName; return aServiceNames; @@ -175,7 +175,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessibleOLEShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -209,7 +209,7 @@ uno::Sequence<uno::Type> SAL_CALL -::rtl::OUString +OUString AccessibleOLEShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 0122f325b790..c35a8aa21300 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace accessibility { @@ -222,7 +221,7 @@ void AccessibleShape::UpdateStates (void) try { drawing::FillStyle aFillStyle; - bShapeIsOpaque = ( xSet->getPropertyValue (::rtl::OUString("FillStyle")) >>= aFillStyle) + bShapeIsOpaque = ( xSet->getPropertyValue (OUString("FillStyle")) >>= aFillStyle) && aFillStyle == drawing::FillStyle_SOLID; } catch (::com::sun::star::beans::UnknownPropertyException&) @@ -371,8 +370,8 @@ uno::Reference<XAccessible> SAL_CALL } else throw lang::IndexOutOfBoundsException ( - ::rtl::OUString("shape has no child with index ") - + rtl::OUString::valueOf(nIndex), + OUString("shape has no child with index ") + + OUString::valueOf(nIndex), static_cast<uno::XWeak*>(this)); return xChild; @@ -541,7 +540,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString ( + throw uno::RuntimeException (OUString ( "AccessibleShape has no valid view forwarder"), static_cast<uno::XWeak*>(this)); ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel ( @@ -763,11 +762,11 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleShape"); + return OUString("AccessibleShape"); } @@ -961,7 +960,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, //===== protected internal ================================================== /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessibleShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -969,7 +968,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, } -::rtl::OUString +OUString AccessibleShape::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -987,7 +986,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, uno::Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString("ZOrder"))); + uno::Any aZOrder (xSet->getPropertyValue (OUString("ZOrder"))); aZOrder >>= nIndex; // Add one to be not zero based. @@ -997,7 +996,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, catch (const beans::UnknownPropertyException &) { // We throw our own exception that is a bit more informative. - throw uno::RuntimeException (::rtl::OUString ( + throw uno::RuntimeException (OUString ( "AccessibleShape has invalid index and no ZOrder property"), static_cast<uno::XWeak*>(this)); } @@ -1014,7 +1013,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, -::rtl::OUString +OUString AccessibleShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index a853b78eb5c2..5ca46abcf6b2 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -121,7 +121,7 @@ uno::Reference<XAccessible> // Check whether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) throw lang::IndexOutOfBoundsException ( - "no accessible child with index " + ::rtl::OUString::valueOf(nIndex), + "no accessible child with index " + OUString::valueOf(nIndex), mxParent); return GetChild (maVisibleChildren[nIndex],nIndex); @@ -666,8 +666,8 @@ void SAL_CALL const document::EventObject& rEventObject) throw (uno::RuntimeException) { - static const ::rtl::OUString sShapeInserted ("ShapeInserted"); - static const ::rtl::OUString sShapeRemoved ("ShapeRemoved"); + static const OUString sShapeInserted ("ShapeInserted"); + static const OUString sShapeRemoved ("ShapeRemoved"); if (rEventObject.EventName == sShapeInserted) diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 2a407d3f6b3f..87bf59e6bda5 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -89,7 +89,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) -void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) +void DescriptionGenerator::Initialize (OUString sPrefix) { msDescription = sPrefix; if (mxSet.is()) @@ -127,7 +127,7 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) -::rtl::OUString DescriptionGenerator::operator() (void) +OUString DescriptionGenerator::operator() (void) { msDescription.append (sal_Unicode ('.')); return msDescription.makeStringAndClear(); @@ -196,7 +196,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, -void DescriptionGenerator::AppendString (const ::rtl::OUString& sString) +void DescriptionGenerator::AppendString (const OUString& sString) { msDescription.append (sString); } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 61d09f9f0a23..df0d9f8104a7 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -52,7 +52,6 @@ using namespace ::cppu; using namespace ::osl; -using ::rtl::OUString; using namespace ::accessibility; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -60,7 +59,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using rtl::OUString; //===== internal ============================================================ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 719fc3eba4b3..8eaee7fd7a20 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -214,7 +214,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape } /// get the accessible base name for an object -::rtl::OUString +OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 2644acaba3d8..fe67018aa039 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -184,13 +184,13 @@ sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (Runtim return css::accessibility::AccessibleRole::SCROLL_PANE; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); @@ -409,7 +409,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -418,7 +418,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -513,14 +513,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (Runtim return COLUMN_COUNT; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) @@ -693,7 +693,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() +OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index 6c2ff2925764..d0805d2f3e1a 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -39,16 +39,16 @@ class ColorNameMap: private boost::noncopyable { public: ColorNameMap(); - rtl::OUString lookUp(long color) const; + OUString lookUp(long color) const; private: - typedef boost::unordered_map< long, rtl::OUString > Map; + typedef boost::unordered_map< long, OUString > Map; Map map_; }; ColorNameMap::ColorNameMap() { - css::uno::Sequence< rtl::OUString > aNames; + css::uno::Sequence< OUString > aNames; css::uno::Reference< css::container::XNameAccess > xNA; try @@ -94,13 +94,13 @@ ColorNameMap::ColorNameMap() { } } -rtl::OUString ColorNameMap::lookUp(long color) const { +OUString ColorNameMap::lookUp(long color) const { Map::const_iterator i(map_.find(color)); if (i != map_.end()) { return i->second; } // Did not find the given color; return its RGB tuple representation: - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(sal_Unicode('#')); buf.append(color, 16); return buf.makeStringAndClear(); @@ -112,7 +112,7 @@ struct theColorNameMap: public rtl::Static< ColorNameMap, theColorNameMap > {}; namespace accessibility { -rtl::OUString lookUpColorName(long color) { +OUString lookUpColorName(long color) { return theColorNameMap::get().lookUp(color); } diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx index 99071817f10d..30cf716beb7e 100644 --- a/svx/source/accessibility/lookupcolorname.hxx +++ b/svx/source/accessibility/lookupcolorname.hxx @@ -48,7 +48,7 @@ namespace accessibility { when no name exists, a string of the form "#RRGGBB" with two hexadecimal digits for each color component. */ -rtl::OUString lookUpColorName(long color); +OUString lookUpColorName(long color); } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 97898ea48b7c..538d66643827 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -136,8 +136,8 @@ static long PointToIndex( RECT_POINT ePoint, bool bAngleControl ) SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( const Reference< XAccessible >& rxParent, SvxRectCtl& rRepr, - const ::rtl::OUString* pName, - const ::rtl::OUString* pDesc ) : + const OUString* pName, + const OUString* pDesc ) : SvxRectCtlAccessibleContext_Base( m_aMutex ), mxParent( rxParent ), @@ -289,8 +289,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil if( !xChild.is() ) { const ChildIndexToPointData* p = IndexToPoint( nIndex, mbAngleMode ); - ::rtl::OUString aName(SVX_RESSTR(p->nResIdName)); - ::rtl::OUString aDescr(SVX_RESSTR(p->nResIdDescr)); + OUString aName(SVX_RESSTR(p->nResIdName)); + OUString aDescr(SVX_RESSTR(p->nResIdDescr)); Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) ); @@ -344,13 +344,13 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( return AccessibleRole::PANEL; } -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription; } -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -501,19 +501,19 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); + return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); // Iterate over all supported service names and return true if on of them // matches the given name. - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); int nLength = aSupportedServices.getLength(); - const ::rtl::OUString* pStr = aSupportedServices.getConstArray(); + const OUString* pStr = aSupportedServices.getConstArray(); for( int i = nLength ; i ; --i, ++pStr ) { @@ -746,8 +746,8 @@ DBG_NAME( SvxRectCtlChildAccessibleContext ) SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, const Window& rParentWindow, - const ::rtl::OUString& rName, - const ::rtl::OUString& rDescription, + const OUString& rName, + const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ) : @@ -905,13 +905,13 @@ sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) t return AccessibleRole::RADIO_BUTTON; } -::rtl::OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -::rtl::OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -1038,12 +1038,12 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { // Iterate over all supported service names and return true if on of them // matches the given name. ::osl::MutexGuard aGuard( maMutex ); - Sequence< ::rtl::OUString > aSupportedServices ( getSupportedServiceNames() ); + Sequence< OUString > aSupportedServices ( getSupportedServiceNames() ); int nLength = aSupportedServices.getLength(); for( int i = 0 ; i < nLength; ++i ) { |