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 | |
| 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')
346 files changed, 2950 insertions, 2991 deletions
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index a1df3ff8bd42..54cdd7719c99 100644 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx @@ -73,7 +73,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); //--- XServiceInfo --------------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); //--- XInterface ----------------------------------------- DECLARE_XINTERFACE( ) @@ -111,19 +111,19 @@ protected: virtual void Init( ); /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName( ) throw(::com::sun::star::uno::RuntimeException); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName( ) throw(::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription( ) throw(::com::sun::star::uno::RuntimeException); @@ -133,14 +133,14 @@ protected: #endif // DBG_UTIL /// (safely) reads the given property from the model of the UNO control - ::rtl::OUString getControlModelStringProperty( const ::rtl::OUString& _rPropertyName ) const SAL_THROW(( )); + OUString getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(( )); /// ensure that our control model exists(will be retrieved upon need only) sal_Bool ensureControlModelAccess( ) SAL_THROW(( )); /// ensures that we're listening for the given property if(and only if!) necessary bool ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening, - const ::rtl::OUString& _rPropertyName ); + const OUString& _rPropertyName ); /// starts multiplexing the state changes of our aggregate context void startStateMultiplexing( ); diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index e92181392a6f..cfe87332fe38 100644 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx @@ -45,7 +45,7 @@ public: //===== XAccessibleImage ================================================ - ::rtl::OUString SAL_CALL getAccessibleImageDescription (void) + OUString SAL_CALL getAccessibleImageDescription (void) throw (::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getAccessibleImageHeight (void) @@ -72,11 +72,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -88,12 +88,12 @@ public: protected: /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index 02cb0f758019..1c3fe797ed59 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -52,7 +52,7 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) + OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -78,11 +78,11 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -94,12 +94,12 @@ public: protected: /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index 00fe4d679dea..450b090f7562 100644 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -261,11 +261,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -352,19 +352,19 @@ protected: /** Create a base name string that contains the accessible name. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 5906b4d96060..fe239cf271c7 100644 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx @@ -72,8 +72,8 @@ public: // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL disposing( ); @@ -108,7 +108,7 @@ public: using AccessibleShape::disposing; protected: - virtual ::rtl::OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException); sdr::table::SvxTableController* getTableController(); diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index f1543f432da5..ce616409922e 100644 --- a/svx/inc/svx/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx @@ -50,8 +50,8 @@ public: }; public: - static ::rtl::OUString createDescription( ActionType eActionType - , const ::rtl::OUString& rObjectName ); + static OUString createDescription( ActionType eActionType + , const OUString& rObjectName ); }; #endif diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index ea676eb46815..fce8478719c9 100644 --- a/svx/inc/svx/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx @@ -64,7 +64,7 @@ public: An introductory description of the shape that is made more specific by later calls to <member>addProperty</member>. */ - void Initialize (::rtl::OUString sPrefix); + void Initialize (OUString sPrefix); /** Initialize the description with the specified string from the resource followed by the shape's style in parantheses and a colon. @@ -80,7 +80,7 @@ public: @return The description string in its current form. */ - ::rtl::OUString operator() (void); + OUString operator() (void); /** Add the given property name and its associated value to the description string. If the property value does not differ from the @@ -98,9 +98,9 @@ public: This which id is used to localize the property value. If it is not known a value of -1 signals to use a default representation. */ - void AddProperty (const ::rtl::OUString& sPropertyName, + void AddProperty (const OUString& sPropertyName, PropertyType aType, - const ::rtl::OUString& sLocalizedName=::rtl::OUString(), + const OUString& sLocalizedName=OUString(), long nWhichId=-1); /** Add the given property name and its associated value to the @@ -120,7 +120,7 @@ public: This which id is used to localize the property value. If it is not known a value of -1 signals to use a default representation. */ - void AddProperty (const ::rtl::OUString& sPropertyName, + void AddProperty (const OUString& sPropertyName, PropertyType aType, sal_Int32 nResourceId, long nWhichId=-1); @@ -130,7 +130,7 @@ public: String to append to the current description. It is not modified in any way. */ - void AppendString (const ::rtl::OUString& sString); + void AppendString (const OUString& sString); /** Add properties that describe line and border attributes. */ @@ -156,7 +156,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> mxSet; /// The description string that is build. - ::rtl::OUStringBuffer msDescription; + OUStringBuffer msDescription; /** This flag is used to determine whether to insert a separator e.g. a comma before the next property. @@ -165,20 +165,20 @@ private: /** Add a property value formated as color to the description string. */ - SVX_DLLPRIVATE void AddColor (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddColor (const OUString& sPropertyName, + const OUString& sLocalizedName); /** Add a property value formated as integer to the description string. */ - SVX_DLLPRIVATE void AddInteger (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddInteger (const OUString& sPropertyName, + const OUString& sLocalizedName); /** Add a property value formated as string to the description string. @param sPropertyName Name of the property. */ - SVX_DLLPRIVATE void AddString (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName, long nWhichId = -1); + SVX_DLLPRIVATE void AddString (const OUString& sPropertyName, + const OUString& sLocalizedName, long nWhichId = -1); /** Add a property value formated as fill style to the description string. If the fill style is <const>HATCH</const>, @@ -187,8 +187,8 @@ private: @param sPropertyName Name of the property. Usually this will be "FillStyle". */ - SVX_DLLPRIVATE void AddFillStyle (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddFillStyle (const OUString& sPropertyName, + const OUString& sLocalizedName); }; diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 35690ce03374..600e247db6b5 100644 --- a/svx/inc/svx/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx @@ -103,7 +103,7 @@ class EnhancedCustomShape2d : public SfxItemSet sal_Bool bReady; double fValue; }; - com::sun::star::uno::Sequence< rtl::OUString > seqEquations; + com::sun::star::uno::Sequence< OUString > seqEquations; std::vector< ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > > vNodesSharedPtr; std::vector< EquationResult > vEquationResults; @@ -209,9 +209,9 @@ class EnhancedCustomShape2d : public SfxItemSet double GetEquationValueAsDouble( const sal_Int32 nIndex ) const; sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const; - SVX_DLLPUBLIC static rtl::OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 ); + SVX_DLLPUBLIC static OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 ); - static void AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); + static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue ); diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index e2f45100bbcb..28df983df61c 100644 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -189,7 +189,7 @@ public: @return the generated function object. */ - SVX_DLLPUBLIC static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); + SVX_DLLPUBLIC static ExpressionNodeSharedPtr parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); private: // disabled constructor/destructor, since this is diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 6f0be14150b0..6be004105956 100644 --- a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx @@ -24,8 +24,8 @@ namespace EnhancedCustomShapeTypeNames { - SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& ); - SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT ); + SVX_DLLPUBLIC MSO_SPT Get( const OUString& ); + SVX_DLLPUBLIC OUString Get( const MSO_SPT ); } #endif diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index 1211589d07c6..55934efcc545 100644 --- a/svx/inc/svx/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx @@ -43,13 +43,13 @@ namespace svxform virtual ~OSystemParseContext(); // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; /** 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> diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 83e1adf66d4c..4dea0232bc90 100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -56,10 +56,10 @@ typedef AccessibleShape* (*tCreateFunction) struct ShapeTypeDescriptor { ShapeTypeId mnShapeTypeId; - rtl::OUString msServiceName; + OUString msServiceName; tCreateFunction maCreateFunction; ShapeTypeDescriptor ( - ShapeTypeId nId, const rtl::OUString& sName, tCreateFunction aFunction) + ShapeTypeId nId, const OUString& sName, tCreateFunction aFunction) : mnShapeTypeId (nId), msServiceName (sName), maCreateFunction (aFunction) @@ -95,7 +95,7 @@ public: Returns the type id of the shape with the given service name or -1 when the service name is not known. */ - ShapeTypeId GetTypeId (const ::rtl::OUString& aServiceName) const; + ShapeTypeId GetTypeId (const OUString& aServiceName) const; /** Determines the type id of the specified shape. @param xShape @@ -154,7 +154,7 @@ public: ShapeTypeDescriptor aDescriptorList[]); /// get the accessible base name for an object - static ::rtl::OUString CreateAccessibleBaseName ( + static OUString CreateAccessibleBaseName ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape) throw (::com::sun::star::uno::RuntimeException); @@ -186,8 +186,8 @@ private: given service name. */ typedef ::boost::unordered_map< - ::rtl::OUString,ShapeTypeId, - ::rtl::OUStringHash, + OUString,ShapeTypeId, + OUStringHash, ::comphelper::UStringEqual> tServiceNameToSlotId; mutable tServiceNameToSlotId maServiceNameToSlotId; @@ -199,7 +199,7 @@ 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 ::rtl::OUString& aServiceName) const; + SVX_DLLPRIVATE long GetSlotId (const OUString& aServiceName) const; /** Determine the slot id of the specified shape type. With this id internal methods can access the associated type descriptor. diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index d0cf27836b6c..8b4364b979a8 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -47,8 +47,8 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem 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 rtl::OUString maApplicationName; - const rtl::OUString maRangeText; + const OUString maApplicationName; + const OUString maRangeText; public: TYPEINFO(); @@ -60,8 +60,8 @@ public: 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 rtl::OUString& rApplicationName, - const rtl::OUString& rRangeText ); + const OUString& rApplicationName, + const OUString& rRangeText ); // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -77,8 +77,8 @@ public: 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 rtl::OUString GetApplicationName() const { return maApplicationName; } - const rtl::OUString GetRangeText() const { return maRangeText; } + const OUString GetApplicationName() const { return maApplicationName; } + const OUString GetRangeText() const { return maRangeText; } }; #endif // #ifndef _SVX_SMARTTAGITEM_HXX diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index ce60a1a3dda3..836ff820650f 100644 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx @@ -85,11 +85,11 @@ class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper2< ::com::sun::star { private: - const rtl::OUString maApplicationName; + 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::set< rtl::OUString > maDisabledSmartTagTypes; - std::multimap < rtl::OUString, ActionReference > maSmartTagMap; + 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; @@ -102,7 +102,7 @@ private: /** Prepare configuration access. */ - void PrepareConfiguration( const rtl::OUString& rConfigurationGroupName ); + void PrepareConfiguration( const OUString& rConfigurationGroupName ); /** Reads the configuration data. */ @@ -120,13 +120,13 @@ private: public: - SmartTagMgr( const rtl::OUString& rApplicationName ); + SmartTagMgr( const OUString& rApplicationName ); virtual ~SmartTagMgr(); /** Triggeres configuration reading, library loading and listener registration NOTE: MUST BE CALLED AFTER CONSTRUCTION! */ - void Init( const rtl::OUString& rConfigurationGroupName ); + void Init( const OUString& rConfigurationGroupName ); /** Dispatches the recognize call to all installed smart tag recognizers @@ -149,7 +149,7 @@ public: The length of the text to be scanned. */ - void Recognize( const rtl::OUString& rText, + void Recognize( const OUString& rText, const com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup > xMarkup, const com::sun::star::uno::Reference< com::sun::star::frame::XController > xController, const com::sun::star::lang::Locale& rLocale, @@ -166,7 +166,7 @@ public: @param rActionIndicesSequence Output parameter */ - void GetActionSequences( com::sun::star::uno::Sequence < rtl::OUString >& rSmartTagTypes, + 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; @@ -178,11 +178,11 @@ public: @param rLocale The locale. */ - rtl::OUString GetSmartTagCaption( const rtl::OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const; + OUString GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const; /** Returns true if the given smart tag type is enabled. */ - bool IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) const; + bool IsSmartTagTypeEnabled( const OUString& rSmartTagType ) const; /** Enable or disable smart tags. */ @@ -205,11 +205,11 @@ public: /** Writes configuration settings. */ void WriteConfiguration( const bool* bLabelTextWithSmartTags, - const std::vector< rtl::OUString >* pDisabledTypes ) const; + const std::vector< OUString >* pDisabledTypes ) const; /** Returns the name of the application this instance has been created by. */ - const rtl::OUString GetApplicationName() const { return maApplicationName; } + 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); diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index b3d1e94f2266..2debc5e0747d 100644 --- a/svx/inc/svx/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -43,12 +43,12 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); - void AddClipbrdFormat( sal_uIntPtr nId, const rtl::OUString& rName, + void AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, sal_uInt16 nPos = USHRT_MAX ); sal_uInt16 Count() const; sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const; - const rtl::OUString GetClipbrdFormatName( sal_uInt16 nPos ) const; + const OUString GetClipbrdFormatName( sal_uInt16 nPos ) const; }; diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index 6817189db41c..67ecb5165805 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -116,14 +116,14 @@ namespace svx /** returns either the data source name if given or the database location */ - ::rtl::OUString getDataSource() const; + OUString getDataSource() const; /** set the data source name, if it is not file URL @param _sDataSourceNameOrLocation the data source name or database location */ - void setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation); + void setDataSource(const OUString& _sDataSourceNameOrLocation); }; //........................................................................ diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index 52d44e1b8e57..f4f40673d87b 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -45,18 +45,18 @@ namespace svx { protected: ODataAccessDescriptor m_aDescriptor; - ::rtl::OUString m_sCompatibleFormat; + OUString m_sCompatibleFormat; sal_Int32 m_nFormatFlags; public: /** construct the transferable */ OColumnTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ,sal_Int32 _nFormats ); @@ -102,7 +102,7 @@ namespace svx */ OColumnTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - const ::rtl::OUString& _rFieldName, + 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, sal_Int32 _nFormats @@ -120,12 +120,12 @@ namespace svx */ static sal_Bool extractColumnDescriptor( const TransferableDataHelper& _rData - ,::rtl::OUString& _rDatasource - ,::rtl::OUString& _rDatabaseLocation - ,::rtl::OUString& _rConnectionResource + ,OUString& _rDatasource + ,OUString& _rDatabaseLocation + ,OUString& _rConnectionResource ,sal_Int32& _nCommandType - ,::rtl::OUString& _rCommand - ,::rtl::OUString& _rFieldName + ,OUString& _rCommand + ,OUString& _rFieldName ); /** extracts a column descriptor from the transferable given @@ -154,11 +154,11 @@ namespace svx private: SVX_DLLPRIVATE void implConstruct( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ); }; @@ -170,7 +170,7 @@ namespace svx class SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper { ODataAccessDescriptor m_aDescriptor; - ::rtl::OUString m_sCompatibleObjectDescription; + OUString m_sCompatibleObjectDescription; // needed to provide a SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format public: @@ -183,10 +183,10 @@ namespace svx The command, either a name of a table or query or a SQL statement. */ ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); @@ -199,10 +199,10 @@ namespace svx The command, either a name of a table or query or a SQL statement. */ ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ); /** with this ctor, only the object descriptor format will be provided @@ -241,13 +241,13 @@ namespace svx // derived classes (our class is the only one which should be contaminated with this) private: - SVX_DLLPRIVATE void construct( const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + SVX_DLLPRIVATE void construct( const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ,sal_Bool _bAddCommand - ,const ::rtl::OUString& _sActiveCommand); + ,const OUString& _sActiveCommand); }; //==================================================================== diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index 08d9b92fe26b..9be3bfbf0da2 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -46,7 +46,7 @@ namespace svx /** construct the transferable */ OComponentTransferable( - const ::rtl::OUString& _rDatasourceOrLocation + const OUString& _rDatasourceOrLocation ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent ); diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 501bc1552655..c1afd4690509 100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -98,9 +98,9 @@ namespace svxform // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); @@ -126,20 +126,20 @@ namespace svxform ) const; // ------------------------------------------------ - ::rtl::OUString quoteName( - const ::rtl::OUString& _rQuote, - const ::rtl::OUString& _rName + OUString quoteName( + const OUString& _rQuote, + const OUString& _rName ) const; // ------------------------------------------------ - ::rtl::OUString composeTableNameForSelect( + OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const; // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const; @@ -160,7 +160,7 @@ namespace svxform getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index 42b9b921e52e..b59eb65c7f59 100644 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx @@ -30,9 +30,9 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::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 ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + 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 ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SVX_FMDMOD_HXX diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index 523c672bab64..50b99f8116a6 100644 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx @@ -59,7 +59,7 @@ public: virtual sal_Bool SAL_CALL hasForms(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SVX_FMDPAGE_HXX diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index c388693cc8e5..c3f631363b2b 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -138,7 +138,7 @@ public: @return The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; /** return the description of the specified object. @param eObjType @@ -148,7 +148,7 @@ public: @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; protected: virtual void Command(const CommandEvent& rEvt); diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 4336e60fa0d9..156d5b96dd45 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -236,9 +236,9 @@ public: virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + virtual OUString SAL_CALL getImplementationName() throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); // ::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); @@ -277,24 +277,24 @@ public: 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); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); // ::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); virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException); // ::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); virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException); // ::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 ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); + 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); 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); // ::com::sun::star::frame::XDispatchProviderInterception @@ -348,7 +348,7 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow m_aSelectionListeners, m_aGridControlListeners; - ::rtl::OUString m_aMode; + OUString m_aMode; sal_Int32 m_nCursorListening; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > m_xFirstDispatchInterceptor; @@ -437,8 +437,8 @@ public: virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException); // VCLXWindow - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); @@ -477,10 +477,10 @@ public: void stopCursorListening(); // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException); // ::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); @@ -493,7 +493,7 @@ public: virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException); // ::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 ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); + 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); 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); // ::com::sun::star::frame::XDispatchProviderInterception diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index a4bbf910a4e2..2cd75167ea05 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -42,7 +42,7 @@ namespace com { namespace sun { namespace star { // Hilfsmethoden SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl, - ::rtl::OUString* pCurrentText = NULL); + 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) diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 970ccd0137fd..8ad3d2edc569 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -54,9 +54,9 @@ namespace svxform public: // no bit fields at all (want to pass the addresses to the OConfigurationValueContainer) - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > aHistory; - ::rtl::OUString sSingleSearchField; + OUString sSingleSearchField; sal_Int16 nSearchForType; sal_Int16 nPosition; @@ -101,8 +101,8 @@ namespace svxform // wrapper properties: // some of the members of FmSearchParams are must be translated to be stored in the configuration - ::rtl::OUString m_sSearchForType; - ::rtl::OUString m_sSearchPosition; + OUString m_sSearchForType; + OUString m_sSearchPosition; sal_Bool m_bIsMatchCase; sal_Bool m_bIsMatchFullHalfWidthForms; diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 7d033a456062..6fc1a2aeaa4e 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -134,28 +134,28 @@ namespace svxform { ControlTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xControl) { m_xControl = _xControl; } virtual ~ControlTextWrapper() { } - virtual ::rtl::OUString getCurrentText() const = 0; + virtual OUString getCurrentText() const = 0; }; class SimpleTextWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xText; public: SimpleTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& _xText); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; class ListBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > m_xBox; public: ListBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >& _xBox); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; class CheckBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox > m_xBox; public: CheckBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >& _xBox); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; } @@ -206,7 +206,7 @@ class SVX_DLLPUBLIC FmSearchEngine FieldCollectionIterator m_iterPreviousLocField; // field of the last finding // Kommunikation mit dem Thread, der die eigentliche Suche durchfuehrt - ::rtl::OUString m_strSearchExpression; // forward direction + OUString m_strSearchExpression; // forward direction SEARCHFOR_TYPE m_eSearchForType; // ditto SEARCH_RESULT m_srResult; // backward direction @@ -296,13 +296,13 @@ public: 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 ::rtl::OUString& strVisibleFields, + const OUString& strVisibleFields, const ::com::sun::star::uno::Reference< ::com::sun::star::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 ::rtl::OUString& strVisibleFields, + const OUString& strVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode); @@ -315,11 +315,11 @@ public: void SetProgressHandler(Link aHdl) { m_aProgressHandler = aHdl; } /// search for the next appearance (for nDirection values check DIRECTION_*-defines) - void SearchNext(const ::rtl::OUString& strExpression); + void SearchNext(const OUString& strExpression); /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL" void SearchNextSpecial(sal_Bool _bSearchForNull); /// search for the next appearance, dependent on nDirection from the start or end - void StartOver(const ::rtl::OUString& strExpression); + void StartOver(const OUString& strExpression); /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL" void StartOverSpecial(sal_Bool _bSearchForNull); /// invalidate previous search reference @@ -330,7 +330,7 @@ public: (calls InvalidatePreviousLoc) */ void RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce = sal_False); - ::rtl::OUString FormatField(sal_Int32 nWhich); + OUString FormatField(sal_Int32 nWhich); /// returns directly; once it was really aborted, ProgressHandler is called with STATE_CANCELED void CancelSearch(); @@ -338,11 +338,11 @@ 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 */ - sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const InterfaceArray& arrFields, + sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex); protected: - void Init(const ::rtl::OUString& strVisibleFields); + void Init(const OUString& strVisibleFields); void SearchNextImpl(); // this Impl method is running in SearchThread @@ -359,9 +359,9 @@ private: // starting the loop), not in every loop step SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); - SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, + SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); - SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, + SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow); @@ -375,7 +375,7 @@ private: SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::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 ::rtl::OUString FormatField(const FieldInfo& rField); + SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField); // formats the field with the NumberFormatter SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); } diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index 85e31c67cc36..bd24488c73a8 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -85,7 +85,7 @@ void displayException(const ::com::sun::star::uno::Any&, Window* _pParent = NULL sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement); -SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); +SVX_DLLPUBLIC OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); // =================================================================================================== // = class CursorWrapper - a helper class which works in common with a ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index d31c225df119..07ce4c02c106 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -93,7 +93,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 355ff6147351..cd8449117d76 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -78,7 +78,7 @@ public: void AutoCorrectFontColor( void ); - void SetPreviewText( const ::rtl::OUString& rString ); + void SetPreviewText( const OUString& rString ); void SetFontNameAsPreviewText(); void SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ); diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index 1bbbd226b405..102a6de9aa07 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -78,10 +78,10 @@ public: // FillObjList is filling rObjList with Strings of the internal Gallery Object URL static sal_Bool FillObjList( const String& rThemeName, std::vector<String> &rObjList ); static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); - static bool FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::OUString> &rObjList ); + static bool FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object - static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); + static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ); static sal_Bool InsertURL( const String& rThemeName, const String& rURL ); static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL ); diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index ac1350949f99..e116c14b8cf6 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -38,7 +38,7 @@ class GalleryThemeEntry { private: - rtl::OUString aName; + OUString aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; @@ -58,7 +58,7 @@ public: sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const rtl::OUString& GetThemeName() const { return aName; } + const OUString& GetThemeName() const { return aName; } sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } @@ -73,7 +73,7 @@ public: sal_Bool IsModified() const { return bModified; } void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsReadOnly() ); } - void SetName( const rtl::OUString& rNewName ); + void SetName( const OUString& rNewName ); sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } sal_uInt32 GetId() const { return nId; } @@ -88,8 +88,8 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; struct GalleryImportThemeEntry { - rtl::OUString aThemeName; - rtl::OUString aUIName; + OUString aThemeName; + OUString aUIName; INetURLObject aURL; }; @@ -111,7 +111,7 @@ class GalleryThemeCacheEntry; class Gallery : public SfxBroadcaster { // only for gengal utility! - friend Gallery* createGallery( const rtl::OUString& ); + friend Gallery* createGallery( const OUString& ); friend void disposeGallery( Gallery* ); typedef std::vector<GalleryThemeCacheEntry*> GalleryCacheThemeList; @@ -127,16 +127,16 @@ private: sal_uIntPtr nLastFileNumber; sal_Bool bMultiPath; - void ImplLoad( const rtl::OUString& rMultiPath ); + void ImplLoad( const OUString& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); - SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName ); + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); - SVX_DLLPUBLIC Gallery( const rtl::OUString& rMultiPath ); + SVX_DLLPUBLIC Gallery( const OUString& rMultiPath ); SVX_DLLPUBLIC ~Gallery(); public: @@ -149,7 +149,7 @@ public: const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - rtl::OUString GetThemeName( sal_uIntPtr nThemeId ) const; + OUString GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index a40e59820ac4..16f84cbe907b 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -198,8 +198,8 @@ class GalleryHint : public SfxHint private: sal_uIntPtr mnType; - rtl::OUString maThemeName; - rtl::OUString maStringData; + OUString maThemeName; + OUString maStringData; sal_uIntPtr mnData1; sal_uIntPtr mnData2; @@ -212,8 +212,8 @@ public: mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} sal_uIntPtr GetType() const { return mnType; } - const rtl::OUString& GetThemeName() const { return maThemeName; } - const rtl::OUString& GetStringData() const { return maStringData; } + const OUString& GetThemeName() const { return maThemeName; } + const OUString& GetStringData() const { return maStringData; } sal_uIntPtr GetData1() const { return mnData1; } sal_uIntPtr GetData2() const { return mnData2; } }; diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 043139390132..0326418e8e6a 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -63,8 +63,8 @@ struct GalDragParams { Region aDragRegion; sal_uIntPtr nDragObjPos; - rtl::OUString aThemeName; - rtl::OUString aFileName; + OUString aThemeName; + OUString aFileName; SgaObjKind eObjKind; }; @@ -137,8 +137,8 @@ public: SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); - SVX_DLLPUBLIC const rtl::OUString& GetName() const; - const rtl::OUString& GetRealName() const; + SVX_DLLPUBLIC const OUString& GetName() const; + const OUString& GetRealName() const; const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index a86bb1c0d9d7..d2a1b25997e0 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -72,7 +72,7 @@ class SvxColorBox : public ColorLB Timer aDelayTimer; Size aLogicalSize; sal_Bool bRelease; - ::rtl::OUString maCommand; + OUString maCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; #ifdef _SVX_ITEMWIN_CXX @@ -81,7 +81,7 @@ class SvxColorBox : public ColorLB public: SvxColorBox( Window* pParent, - const rtl::OUString& rCommand, + const OUString& rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxColorBox(); diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 65c5b5289ebe..2c449b0db745 100644 --- a/svx/inc/svx/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -56,8 +56,8 @@ public: class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { - std::vector< ::rtl::OUString > aUndoRedoList; - ::rtl::OUString aDefaultText; + std::vector< OUString > aUndoRedoList; + OUString aDefaultText; public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 6f767c70c372..2a8607c13b42 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -169,12 +169,12 @@ public: short GetListPos4Entry(sal_uInt32 nIdx); short GetListPos4Entry( const String& rFmtString ); - void GetCurrencySymbols(std::vector<rtl::OUString>& rList, sal_uInt16* pPos ); - void GetCurrencySymbols(std::vector<rtl::OUString>& rList, bool bFlag ); + void GetCurrencySymbols(std::vector<OUString>& rList, sal_uInt16* pPos ); + void GetCurrencySymbols(std::vector<OUString>& rList, bool bFlag ); sal_uInt16 FindCurrencyTableEntry( const String& rFmtString, bool &bTestBanking ); bool IsInTable(sal_uInt16 nPos, bool bTmpBanking, - ::rtl::OUString const& rFmtString); + OUString const& rFmtString); void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; } bool IsUseStarFormat( void ) { return bUseStarFormat; } diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index b788ed296760..e54bf1f654e2 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -46,12 +46,12 @@ class SdrCustomShapeDataItem : public SfxStringItem class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem { public: - typedef std::pair < const ::rtl::OUString, const ::rtl::OUString > PropertyPair; + typedef std::pair < const OUString, const OUString > PropertyPair; private: struct SVX_DLLPUBLIC PropertyEq { - bool operator()( const rtl::OUString&, const rtl::OUString& ) const; + bool operator()( const OUString&, const OUString& ) const; }; struct SVX_DLLPUBLIC PropertyPairEq { @@ -62,7 +62,7 @@ private: size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; - typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; + typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, PropertyEq > PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; @@ -94,13 +94,13 @@ private: const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; - com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName ); - com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName, const rtl::OUString& rPropName2 ); + com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ); + com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); void SetPropertyValue( const com::sun::star::beans::PropertyValue& rPropVal ); - void SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ); + void SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ); - void ClearPropertyValue( const rtl::OUString& rPropertyName ); + void ClearPropertyValue( const OUString& rPropertyName ); }; class SdrCustomShapeReplacementURLItem : public SfxStringItem diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 77cdf3c590d5..b97178357244 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -43,7 +43,7 @@ public: virtual sal_uInt16 GetValueCount() const; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index c3250ff7af60..ff6a1f9b0bfa 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -37,7 +37,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; + virtual OUString GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index 320e5fca6519..d602d28d4f5c 100644 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx @@ -63,8 +63,8 @@ namespace drawinglayer virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException); // UNO API helpers - SVX_DLLPUBLIC static rtl::OUString getImplementationName_Static(); - SVX_DLLPUBLIC static com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); + SVX_DLLPUBLIC static OUString getImplementationName_Static(); + SVX_DLLPUBLIC static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 25694f32044e..687e906bf2f0 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -45,7 +45,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index e6b0a765df50..82e002a95df2 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -46,7 +46,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 89d91970ae89..387c3c40f725 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -36,7 +36,7 @@ public: SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; + virtual OUString GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index 457104c40926..e16c23089658 100644 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx @@ -50,7 +50,7 @@ namespace svx public: /** returns the name of the property which this provider is responsible for */ - virtual ::rtl::OUString getPropertyName() const = 0; + virtual OUString getPropertyName() const = 0; /** returns the current value of the property which the provider is responsible for */ @@ -74,18 +74,18 @@ namespace svx public: PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName ) :m_rContext( _rContext ) - ,m_sPropertyName( ::rtl::OUString::createFromAscii( _pAsciiPropertyName ) ) + ,m_sPropertyName( OUString::createFromAscii( _pAsciiPropertyName ) ) { } - virtual ::rtl::OUString getPropertyName() const; + virtual OUString getPropertyName() const; virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const; protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } private: ::cppu::OWeakObject& m_rContext; - const ::rtl::OUString m_sPropertyName; + const OUString m_sPropertyName; }; //==================================================================== @@ -110,8 +110,8 @@ namespace svx ~PropertyChangeNotifier(); // listener maintanance - void addPropertyChangeListener( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); - void removePropertyChangeListener( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); + 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 ); /** registers a IPropertyValueProvider */ diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index fc1abc779a89..8e448bc8b2c0 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -97,7 +97,7 @@ public: void UpdateViewSize(); - void InsertHeaderEntry(const rtl::OUString& rText, + void InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HIB_STDSTYLE); @@ -146,7 +146,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} + void SetHeaderBarHelpId(const OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} HeaderBar& GetTheHeaderBar() {return aHeaderBar;} }; diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index b34dd89c7249..9282e3e8cc7e 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -207,8 +207,8 @@ private: String aLayoutCalcStr; String aCalcStr; - std::vector<rtl::OUString> aSearchStrings; - std::vector<rtl::OUString> aReplaceStrings; + std::vector<OUString> aSearchStrings; + std::vector<OUString> aReplaceStrings; SearchDlg_Impl* pImpl; SearchAttrItemList* pSearchList; diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index ff77060e4f5f..8f65c17a8781 100644 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog { public: SvxStandardDialog( Window* pParent, const ResId& rResId ); - SvxStandardDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~SvxStandardDialog(); short Execute(); diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index c5c776e8863d..9599ae3f3fc4 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -31,7 +31,7 @@ public: SvxStringArray( const ResId& rResId ); ~SvxStringArray(); - const rtl::OUString GetStringByPos( sal_uInt32 nPos ) const; + const OUString GetStringByPos( sal_uInt32 nPos ) const; }; diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 1997dfb4145b..3a5f09cdb6d8 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -53,7 +53,7 @@ protected: SdrDragMethod* mpCurrentSdrDragMethod; SdrUndoGeoObj* pInsPointUndo; Rectangle aDragLimit; - rtl::OUString aInsPointUndoStr; + OUString aInsPointUndoStr; SdrMarkList aFollowingEdges; // If nodes are dragged, all edges should follow as Xor SdrHdlKind eDragHdl; diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index f8fbf825bbdd..d436fd9e0810 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -226,7 +226,7 @@ public: sal_uInt32 GetNextUniqueCommentID(); // get the author name - ::rtl::OUString GetDocumentAuthorName() const; + OUString GetDocumentAuthorName() const; // for export sal_uInt32 GetUniqueCommentID() const { return mnUniqueCommentID; } @@ -317,7 +317,7 @@ public: ::com::sun::star::embed::XStorage> GetDocumentStorage() const; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - GetDocumentStream(::rtl::OUString const& rURL, + GetDocumentStream(OUString const& rURL, ::comphelper::LifecycleProxy & rProxy) const; // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void BurnInStyleSheetAttributes(); @@ -405,8 +405,8 @@ public: bool IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar = false) const; + void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar = false) const; void TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const; // RecalcPageNums wird idR. nur von der Page gerufen. diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index aae1f51df7f2..ee7e11ba194a 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -153,7 +153,7 @@ public: /* is merging default attributes from type-shype into the SdrCustomShapeGeometryItem. If pType is NULL then the type is being taken from the "Type" property of the SdrCustomShapeGeometryItem. MergeDefaultAttributes is called when creating CustomShapes via UI and after importing */ - void MergeDefaultAttributes( const rtl::OUString* pType = NULL ); + void MergeDefaultAttributes( const OUString* pType = NULL ); /* the method is checking if the geometry data is unchanged/default, in this case the data might not be stored */ enum DefaultType @@ -253,7 +253,7 @@ public: virtual SdrHdl* GetHdl( sal_uInt32 nHdlNum ) const; // #i33136# - static bool doConstructOrthogonal(const ::rtl::OUString& rName); + static bool doConstructOrthogonal(const OUString& rName); using SdrTextObj::NbcSetOutlinerParaObject; }; diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 27a4568ed40e..5d4f76d0b804 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -219,7 +219,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; //************************************************************ @@ -284,9 +284,9 @@ class SdrObjPlusData // #i68101# // object name, title and description - rtl::OUString aObjName; - rtl::OUString aObjTitle; - rtl::OUString aObjDescription; + OUString aObjName; + OUString aObjTitle; + OUString aObjDescription; public: TYPEINFO(); @@ -461,12 +461,12 @@ protected: Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // Fuer GetDragComment - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const; void ImpForcePlusData(); - rtl::OUString GetWinkStr(long nWink, bool bNoDegChar = false) const; - rtl::OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; + OUString GetWinkStr(long nWink, bool bNoDegChar = false) const; + OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; // bNotMyself=true bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -547,12 +547,12 @@ public: // An object may have a user-set Name (Get/SetName()), e.g SdrGrafObj, SdrObjGroup // or SdrOle2Obj. // It may also have a Title and a Description for accessibility purposes. - void SetName(const rtl::OUString& rStr); - rtl::OUString GetName() const; - void SetTitle(const rtl::OUString& rStr); - rtl::OUString GetTitle() const; - void SetDescription(const rtl::OUString& rStr); - rtl::OUString GetDescription() const; + void SetName(const OUString& rStr); + OUString GetName() const; + void SetTitle(const OUString& rStr); + OUString GetTitle() const; + void SetDescription(const OUString& rStr); + OUString GetDescription() const; // Fuer Gruppenobjekte bool IsGroupObject() const; @@ -838,7 +838,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; bool IsMacroHit(const SdrObjMacroHitRec& rRec) const; // Konnektoren. (siehe auch Dokumentation in SvdoEdge.HXX, SdrEdgeObj diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 5d663dcc3215..036a83e6144a 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -78,8 +78,8 @@ private: void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren GraphicAttr aGrafInfo; - rtl::OUString aFileName; // Wenn es sich um einen Link handelt, steht hier der Dateiname drin. - rtl::OUString aFilterName; + OUString aFileName; // Wenn es sich um einen Link handelt, steht hier der Dateiname drin. + OUString aFilterName; GraphicObject* pGraphic; // Zur Beschleunigung von Bitmapausgaben, besonders von gedrehten. GraphicObject* mpReplacementGraphic; SdrGraphicLink* pGraphicLink; // Und hier noch ein Pointer fuer gelinkte Grafiken @@ -137,12 +137,12 @@ public: void ForceSwapIn() const; void ForceSwapOut() const; - void SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName); + void SetGraphicLink(const OUString& rFileName, const String& rFilterName); void ReleaseGraphicLink(); bool IsLinkedGraphic() const; - const rtl::OUString& GetFileName() const; - const rtl::OUString& GetFilterName() const; + const OUString& GetFileName() const; + const OUString& GetFilterName() const; void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 77ef633d0bed..48a29cb029f7 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -60,8 +60,8 @@ public: public: - void setURL( const ::rtl::OUString& rURL ); - const ::rtl::OUString& getURL() const; + void setURL( const OUString& rURL ); + const OUString& getURL() const; void setMediaProperties( const ::avmedia::MediaItem& rState ); const ::avmedia::MediaItem& getMediaProperties() const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index b5442dc19617..ee5542c90def 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -173,9 +173,9 @@ public: void CheckFileLink_Impl(); // allows to transfer the graphics to the object helper - void SetGraphicToObj( const Graphic& aGraphic, const ::rtl::OUString& aMediaType ); + void SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ); void SetGraphicToObj( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xGrStream, - const ::rtl::OUString& aMediaType ); + const OUString& aMediaType ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const; sal_Bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ); diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 248f9589e080..f984bb2c68ad 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -111,7 +111,7 @@ public: virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual bool DoMacro(const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 425c1a3f5516..e7493f55ac90 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -143,7 +143,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0) // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0) diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 379e15824ff8..fd8ced079923 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -185,9 +185,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(const rtl::OString&) = 0; + virtual void SetEditHelpId(const OString&) = 0; //from class Window - virtual void SetHelpId( const rtl::OString& ) = 0; + virtual void SetHelpId( const OString& ) = 0; virtual void SetText( const OUString& rStr ) = 0; }; @@ -233,7 +233,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( const rtl::OString& ) = 0; + virtual void SetHelpId( const OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -491,7 +491,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) = 0; }; #endif diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 3dc610ff1e76..436370e588b1 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -40,7 +40,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 2f2d420e5da2..73bb20959fd9 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -43,7 +43,7 @@ public: SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 130f386c6621..56fe21d7478a 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -40,7 +40,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 4d2182ae14c3..bc4966228c8c 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -42,7 +42,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; @@ -62,7 +62,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 0ce1cf0f858a..24a07a252e7f 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -39,7 +39,7 @@ public: 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 = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 0a4c5ded26c6..b4bffeee4831 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -373,7 +373,7 @@ public: class SVX_DLLPUBLIC SvxSimpleUndoRedoController : public SfxToolBoxControl { private: - ::rtl::OUString aDefaultText; + OUString aDefaultText; public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 34dbb1b1a140..e41a07813404 100644 --- a/svx/inc/svx/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -27,8 +27,8 @@ class SVX_DLLPUBLIC SvxTbxCtlAlign: public SfxToolBoxControl { public: virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); virtual SfxPopupWindowType GetPopupWindowType() const; @@ -39,9 +39,9 @@ public: SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlAlign() {} private: - rtl::OUString m_aSubTbName; - rtl::OUString m_aSubTbResName; - rtl::OUString m_aCommand; + OUString m_aSubTbName; + OUString m_aSubTbResName; + OUString m_aCommand; }; #endif diff --git a/svx/inc/svx/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index 830df5cc0024..e0a1d27f1aec 100644 --- a/svx/inc/svx/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx @@ -34,12 +34,12 @@ namespace svx { private: bool m_bDocking; - ::rtl::OUString m_sToolboxResName; + OUString m_sToolboxResName; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > m_xLayouter; public: - ToolboxAccess( const ::rtl::OUString& rToolboxName ); + ToolboxAccess( const OUString& rToolboxName ); public: /** toggles the toolbox diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index f4e043bb4710..07cf3a57c5ae 100644 --- a/svx/inc/svx/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SvxTbxCtlDraw : public SfxToolBoxControl { private: - ::rtl::OUString m_sToolboxName; + OUString m_sToolboxName; void toggleToolbox(); diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 3d9c3195a93f..66fde8a2cb79 100644 --- a/svx/inc/svx/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -45,14 +45,14 @@ public: //interface XSubToolbarController: virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aSubTbName; - rtl::OUString m_aSubTbxResName; - rtl::OUString m_aCommand; + OUString m_aSubTbName; + OUString m_aSubTbxResName; + OUString m_aCommand; }; diff --git a/svx/inc/svx/txenctab.hxx b/svx/inc/svx/txenctab.hxx index de665420787b..0b8d14e89b74 100644 --- a/svx/inc/svx/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx @@ -34,7 +34,7 @@ public: SvxTextEncodingTable(); ~SvxTextEncodingTable(); - const rtl::OUString GetTextString( const rtl_TextEncoding nEnc ) const; + const OUString GetTextString( const rtl_TextEncoding nEnc ) const; rtl_TextEncoding GetTextEncoding( const String& rStr ) const; }; diff --git a/svx/inc/svx/unoapi.hxx b/svx/inc/svx/unoapi.hxx index 88708aa95c9c..2ceca3ec895d 100644 --- a/svx/inc/svx/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx @@ -55,7 +55,7 @@ SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference /** returns the SvxNumBulletItem with the given name from the pool or a null if there is no item with that name */ -SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const ::rtl::OUString& aName ) throw(); +SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& aName ) throw(); /** maps the API constant MeasureUnit to a vcl MapUnit enum. Returns false if conversion is not supported. diff --git a/svx/inc/svx/unomaster.hxx b/svx/inc/svx/unomaster.hxx index 4f6f6dbf0fde..c0f32d0f1346 100644 --- a/svx/inc/svx/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx @@ -36,16 +36,16 @@ public: virtual sal_Bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::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 ::rtl::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) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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) = 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) = 0; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 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) = 0; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void dispose() = 0; diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index 3f1a16ee6773..fe648ea4419f 100644 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx @@ -36,15 +36,15 @@ class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiS public: SvxUnoDrawMSFactory() throw() {}; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::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); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + 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); + 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); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + 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); // internal - ::com::sun::star::uno::Sequence< ::rtl::OUString > - concatServiceNames( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rServices1, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& rServices2 ) throw(); + ::com::sun::star::uno::Sequence< OUString > + concatServiceNames( ::com::sun::star::uno::Sequence< OUString >& rServices1, + ::com::sun::star::uno::Sequence< OUString >& rServices2 ) throw(); /** fills the given EventObject from the given SdrHint. @returns diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index db69e751f8c1..fcf203fa47e8 100644 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx @@ -77,16 +77,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException); // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + 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); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut ); diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 1c06c69f023c..68150aff0312 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); // Typ und Inventor bestimmen - void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const ::rtl::OUString& aName ) const throw(); + void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw(); // Erzeugen eines SdrObjects anhand einer Description. Kann von // abgeleiteten Klassen dazu benutzt werden, eigene Shapes zu @@ -129,9 +129,9 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/unopool.hxx b/svx/inc/svx/unopool.hxx index 8b3e6c43dceb..7db02b2a85dd 100644 --- a/svx/inc/svx/unopool.hxx +++ b/svx/inc/svx/unopool.hxx @@ -70,9 +70,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); protected: void init(); diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 713442216554..0414e1228211 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -37,9 +37,9 @@ class UHashMap { UHashMap() {} public: - static sal_uInt32 getId( const ::rtl::OUString& rCompareString ); - static rtl::OUString getNameFromId (sal_uInt32 nId); - static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); + static sal_uInt32 getId( const OUString& rCompareString ); + static OUString getNameFromId (sal_uInt32 nId); + static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); }; /*********************************************************************** diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 6c2a5051d061..23cbf8811a3a 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -110,8 +110,8 @@ class SVX_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, private: ::com::sun::star::awt::Size maSize; ::com::sun::star::awt::Point maPosition; - ::rtl::OUString maShapeType; - ::rtl::OUString maShapeName; + OUString maShapeType; + OUString maShapeName; /** these members are used to optimize XMultiProperty calls */ SvxShapeImpl* mpImpl; @@ -138,7 +138,7 @@ protected: ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; - sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName ); + sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); /** called from the XActionLockable interface methods on initial locking */ virtual void lock(); @@ -155,8 +155,8 @@ protected: void endSetPropertyValues(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); 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); @@ -182,7 +182,7 @@ public: void InvalidateSdrObject() { mpObj.reset( NULL ); }; const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} - void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; } + void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw (); ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); @@ -191,8 +191,8 @@ public: sal_uInt32 getShapeKind() const; // styles need this - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet ); + static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); + static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); /** same as SetFillAttribute but for property names instead of which ids, and the property found is returned instead of set at the object @@ -203,14 +203,14 @@ public: // 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 ::rtl::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); - ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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); + ::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); - ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL _setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL _getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::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); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL _getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -223,11 +223,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -242,46 +242,46 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + 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 ::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 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); + 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); + 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); + 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); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + 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); + 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); + 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); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + 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); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + 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); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + 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); // XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XGluePointsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getGluePoints( ) throw(::com::sun::star::uno::RuntimeException); @@ -322,8 +322,8 @@ protected: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); 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); @@ -341,15 +341,15 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // ::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); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); @@ -372,7 +372,7 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XShapeGroup.hpp> @@ -413,7 +413,7 @@ public: 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); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -426,7 +426,7 @@ public: virtual void SAL_CALL leaveGroup( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -451,7 +451,7 @@ public: virtual void SAL_CALL release() throw(); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -466,7 +466,7 @@ public: virtual void SAL_CALL disconnectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -494,16 +494,16 @@ public: virtual void SAL_CALL release() throw(); // XPropertySet - virtual void SAL_CALL setPropertyValue( const ::rtl::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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + 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 ::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); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + 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); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -516,7 +516,7 @@ public: virtual void SAL_CALL setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xControl ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -533,7 +533,7 @@ public: virtual ~SvxShapeDimensioning() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -546,7 +546,7 @@ public: virtual ~SvxShapeCircle() throw (); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -558,12 +558,12 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); void resetModifiedState(); - const SvGlobalName GetClassName_Impl(rtl::OUString& rHexCLSID); + const SvGlobalName GetClassName_Impl(OUString& rHexCLSID); public: SvxOle2Shape( SdrObject* pObj ) throw(); SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); @@ -571,7 +571,7 @@ public: sal_Bool createObject( const SvGlobalName &aClassName ); - sal_Bool createLink( const ::rtl::OUString& aLinkURL ); + sal_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); @@ -593,8 +593,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); 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); @@ -606,7 +606,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -624,8 +624,8 @@ protected: public: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); SvxShapePolyPolygonBezier( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_PATHLINE) throw(); virtual ~SvxShapePolyPolygonBezier() throw(); @@ -636,7 +636,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -649,8 +649,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: SvxGraphicObject( SdrObject* pObj ) throw(); @@ -672,8 +672,8 @@ protected: public: Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); virtual ~Svx3DSceneObject() throw(); @@ -698,7 +698,7 @@ public: 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); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -712,15 +712,15 @@ class Svx3DCubeObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: Svx3DCubeObject( SdrObject* pObj ) throw(); virtual ~Svx3DCubeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -732,13 +732,13 @@ public: Svx3DSphereObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); virtual ~Svx3DSphereObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -748,15 +748,15 @@ class Svx3DLatheObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: Svx3DLatheObject( SdrObject* pObj ) throw(); virtual ~Svx3DLatheObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -768,13 +768,13 @@ public: Svx3DExtrudeObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); virtual ~Svx3DExtrudeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -784,15 +784,15 @@ class Svx3DPolygonObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: Svx3DPolygonObject( SdrObject* pObj ) throw(); virtual ~Svx3DPolygonObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -814,7 +814,7 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); virtual ~SvxCustomShape() throw (); @@ -828,7 +828,7 @@ public: virtual void SAL_CALL release() throw(); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -837,14 +837,14 @@ public: virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XPropertySet - void SAL_CALL setPropertyValue( const ::rtl::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); + 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); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); //XEnhancedCustomShapeDefaulter - virtual void SAL_CALL createCustomShapeDefaults( const rtl::OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -859,8 +859,8 @@ public: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); }; #endif diff --git a/svx/inc/svx/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 3e3bfa1159ec..7db908c88a92 100644 --- a/svx/inc/svx/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx @@ -78,11 +78,11 @@ public: virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); - static ::rtl::OUString getImplementationName_Static(); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); }; ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxShapeCollection_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr ); diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 1d4f72cfb06d..c39854f76b97 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -225,14 +225,14 @@ #define LINE_PROPERTIES \ { MAP_CHAR_LEN(UNO_NAME_LINEDASH), XATTR_LINEDASH, &::getCppuType((const ::com::sun::star::drawing::LineDash*)0) , 0, MID_LINEDASH}, \ - { MAP_CHAR_LEN("LineDashName"), XATTR_LINEDASH, &::getCppuType((const ::rtl::OUString*)0) , 0, MID_NAME}, \ + { MAP_CHAR_LEN("LineDashName"), XATTR_LINEDASH, &::getCppuType((const OUString*)0) , 0, MID_NAME}, \ LINE_PROPERTIES_DEFAULTS #define LINE_PROPERTIES_START_END \ { MAP_CHAR_LEN(UNO_NAME_LINEEND), XATTR_LINEEND, SEQTYPE(::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { MAP_CHAR_LEN("LineEndName"), XATTR_LINEEND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("LineEndName"), XATTR_LINEEND, &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_LINESTART), XATTR_LINESTART, SEQTYPE(::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { MAP_CHAR_LEN("LineStartName"), XATTR_LINESTART, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, + { MAP_CHAR_LEN("LineStartName"), XATTR_LINESTART, &::getCppuType((const OUString*)0), 0, MID_NAME }, #define FILL_PROPERTIES_BMP \ { MAP_CHAR_LEN(UNO_NAME_FILLBMP_LOGICAL_SIZE), XATTR_FILLBMP_SIZELOG, &::getBooleanCppuType() , 0, 0}, \ @@ -255,17 +255,17 @@ FILL_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) , 0, MID_BITMAP}, \ - { MAP_CHAR_LEN("FillBitmapName"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ - { MAP_CHAR_LEN("FillBitmapURL"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAFURL }, \ + { MAP_CHAR_LEN("FillBitmapName"), XATTR_FILLBITMAP , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillBitmapURL"), XATTR_FILLBITMAP , &::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \ { MAP_CHAR_LEN("FillGradientStepCount"), XATTR_GRADIENTSTEPCOUNT , &::getCppuType((const sal_Int16*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { MAP_CHAR_LEN("FillGradientName"), XATTR_FILLGRADIENT , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillGradientName"), XATTR_FILLGRADIENT , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , &::getCppuType((const ::com::sun::star::drawing::Hatch*)0), 0, MID_FILLHATCH}, \ - { MAP_CHAR_LEN("FillHatchName"), XATTR_FILLHATCH , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillHatchName"), XATTR_FILLHATCH , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , &::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) , 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, &::getCppuType((const sal_Int16*)0) , 0, 0}, \ { MAP_CHAR_LEN("FillTransparenceGradient"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, #define EDGERADIUS_PROPERTIES \ @@ -322,20 +322,20 @@ #define SHAPE_DESCRIPTOR_PROPERTIES \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT , &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN("UINamePlural"), OWN_ATTR_UINAME_PLURAL , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("UINamePlural"), OWN_ATTR_UINAME_PLURAL , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ /* #i68101# */ \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, #define LINKTARGET_PROPERTIES \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, @@ -367,7 +367,7 @@ #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE1LEN), SDRATTR_MEASUREHELPLINE1LEN, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINEDIST), SDRATTR_MEASUREHELPLINEDIST, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ @@ -421,9 +421,9 @@ #define SPECIAL_GRAPHOBJ_PROPERTIES \ SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , &::getCppuType((const ::com::sun::star::text::GraphicCrop*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , &::getCppuType((const OUString*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , &::getCppuType((const OUString*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0) , 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0) , 0, 0}, diff --git a/svx/inc/svx/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index 507f73876d69..934606fe8917 100644 --- a/svx/inc/svx/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx @@ -55,15 +55,15 @@ class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImpl ::com::sun::star::document::XEmbeddedObjectResolver, ::com::sun::star::container::XNameAccess > { - typedef ::std::map< ::rtl::OUString, OutputStorageWrapper_Impl*, + typedef ::std::map< OUString, OutputStorageWrapper_Impl*, OUStringLess > SvXMLEmbeddedObjectHelper_Impl; private: ::osl::Mutex maMutex; - const ::rtl::OUString maReplacementGraphicsContainerStorageName; - const ::rtl::OUString maReplacementGraphicsContainerStorageName60; - ::rtl::OUString maCurContainerStorageName; + const OUString maReplacementGraphicsContainerStorageName; + const OUString maReplacementGraphicsContainerStorageName60; + OUString maCurContainerStorageName; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxRootStorage; // package @@ -75,25 +75,25 @@ private: SvXMLEmbeddedObjectHelper_Impl *mpStreamMap; SVX_DLLPRIVATE sal_Bool ImplGetStorageNames( - const ::rtl::OUString& rURLStr, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName, + const OUString& rURLStr, + OUString& rContainerStorageName, + OUString& rObjectStorageName, sal_Bool bInternalToExternal, sal_Bool *pGraphicRepl=0, sal_Bool *pOasisFormat=0 ) const; SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XStorage > ImplGetContainerStorage( - const ::rtl::OUString& rStorageName ); + const OUString& rStorageName ); SVX_DLLPRIVATE String ImplGetUniqueName( ::comphelper::IEmbeddedHelper*, const sal_Char* p ) const; SVX_DLLPRIVATE sal_Bool ImplReadObject( - const ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjName, + const OUString& rContainerStorageName, + OUString& rObjName, const SvGlobalName *pClassId, SvStream* pTemp ); - SVX_DLLPRIVATE ::rtl::OUString ImplInsertEmbeddedObjectURL( - const ::rtl::OUString& rURLStr ); + 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 ); @@ -126,21 +126,21 @@ public: void Flush(); // XEmbeddedObjectResolver - virtual ::rtl::OUString SAL_CALL resolveEmbeddedObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + 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); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - static void splitObjectURL(::rtl::OUString aURLNoPar, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName); + static void splitObjectURL(OUString aURLNoPar, + OUString& rContainerStorageName, + OUString& rObjectStorageName); }; #endif diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index c3175321eeb2..d14c9dc5cd23 100644 --- a/svx/inc/svx/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -55,15 +55,15 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2 { private: - typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > URLPair; + typedef ::std::pair< OUString, OUString > URLPair; typedef ::std::vector< URLPair > URLPairVector; typedef ::std::vector< GraphicObject > GraphicObjectVector; - typedef ::std::set< ::rtl::OUString > URLSet; + typedef ::std::set< OUString > URLSet; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > > GraphicOutputStreamVector; ::osl::Mutex maMutex; ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > mxRootStorage; - ::rtl::OUString maCurStorageName; + OUString maCurStorageName; URLPairVector maGrfURLs; GraphicObjectVector maGrfObjs; GraphicOutputStreamVector maGrfStms; @@ -71,21 +71,21 @@ private: SvXMLGraphicHelperMode meCreateMode; sal_Bool mbDirect; - SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const ::rtl::OUString& rURLStr, - ::rtl::OUString& rPictureStorageName, - ::rtl::OUString& rPictureStreamName ); - SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName ); - SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, + SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const OUString& rURLStr, + OUString& rPictureStorageName, + OUString& rPictureStreamName ); + SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const OUString& rPictureStorageName ); + SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, sal_Bool bTruncate ); SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const; - SVX_DLLPRIVATE Graphic ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName ); - SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, - const ::rtl::OUString& rGraphicId, + SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName ); + SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, + const OUString& rGraphicId, bool bUseGfxLink ); - SVX_DLLPRIVATE void ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName ); + SVX_DLLPRIVATE void ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ); protected: SvXMLGraphicHelper(); @@ -109,12 +109,12 @@ public: public: // XGraphicObjectResolver - virtual ::rtl::OUString SAL_CALL resolveGraphicObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); // XBinaryStreamResolver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const ::rtl::OUString& rURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException); }; @@ -133,8 +133,8 @@ namespace svx SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); -SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw(); -SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw(); +SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw(); +SVX_DLLPUBLIC OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw(); /** Create this with createInstanceWithArguments. service name "com.sun.star.comp.Svx.GraphicExportHelper", one argument which is the @@ -149,8 +149,8 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); -SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw(); -SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw(); +SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw(); +SVX_DLLPUBLIC OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw(); } #endif diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 7ccf526b6e66..93ad230ea75f 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -272,21 +272,21 @@ public: bool IsEmbedInDocument() const { return bEmbedInDocument; } void SetEmbedInDocument(bool b) { bEmbedInDocument = b; } - static rtl::OUString GetDefaultExt(XPropertyListType t); - static rtl::OUString GetDefaultExtFilter(XPropertyListType t); - rtl::OUString GetDefaultExt() const { return GetDefaultExt( eType ); } + static OUString GetDefaultExt(XPropertyListType t); + static OUString GetDefaultExtFilter(XPropertyListType t); + OUString GetDefaultExt() const { return GetDefaultExt( eType ); } virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() = 0; bool Load(); bool LoadFrom( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const rtl::OUString &rURL ); + const OUString &rURL ); bool Save(); bool SaveTo ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const rtl::OUString &rURL, - rtl::OUString *pOptName ); + const OUString &rURL, + OUString *pOptName ); virtual sal_Bool Create() = 0; virtual sal_Bool CreateBitmapsForUI() = 0; virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; @@ -297,7 +297,7 @@ public: XOutdevItemPool* pXPool = NULL ); // as above but initializes name as expected static XPropertyListRef CreatePropertyListFromURL( XPropertyListType t, - const rtl::OUString & rUrl, + const OUString & rUrl, XOutdevItemPool* pXPool = NULL ); // helper accessors diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 02365fcee169..58f17418fd53 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -42,16 +42,16 @@ class FontHeightToolBoxControl : public svt::ToolboxController, virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static() throw() + static OUString getImplementationName_Static() throw() { - return ::rtl::OUString("com.sun.star.svx.FontHeightToolBoxController"); + return OUString("com.sun.star.svx.FontHeightToolBoxController"); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index dd57f0c697fe..720d6232ed95 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -70,9 +70,9 @@ public: static SearchToolbarControllersManager& createControllersManager(); - void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); - void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); - css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL ); + void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ); + void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ); + css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL ); void saveSearchHistory(const FindTextFieldControl* m_pFindTextFieldControl); void loadSearchHistory(FindTextFieldControl* m_pFindTextFieldControl); @@ -82,7 +82,7 @@ private: typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec; typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap; SearchToolbarControllersMap aSearchToolbarControllersMap; - std::vector<rtl::OUString> m_aSearchStrings; + std::vector<OUString> m_aSearchStrings; }; @@ -100,16 +100,16 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static() throw() + static OUString getImplementationName_Static() throw() { - return ::rtl::OUString("com.sun.star.svx.FindTextToolboxController"); + return OUString("com.sun.star.svx.FindTextToolboxController"); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -148,16 +148,16 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static( ) throw() + static OUString getImplementationName_Static( ) throw() { - return ::rtl::OUString( "com.sun.star.svx.ExitFindbarToolboxController" ); + return OUString( "com.sun.star.svx.ExitFindbarToolboxController" ); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -187,17 +187,17 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static( Type eType ) throw() + static OUString getImplementationName_Static( Type eType ) throw() { - return eType == UP? ::rtl::OUString( "com.sun.star.svx.UpSearchToolboxController" ) : - ::rtl::OUString( "com.sun.star.svx.DownSearchToolboxController" ); + return eType == UP? OUString( "com.sun.star.svx.UpSearchToolboxController" ) : + OUString( "com.sun.star.svx.DownSearchToolboxController" ); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -234,22 +234,22 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); static OUString getImplementationName_Static() throw() { return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher"); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException ); // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ); // XDispatch 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 ) { diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index fad1addceeb4..4af785bb8bb9 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -25,7 +25,6 @@ #include "cppuhelper/factory.hxx" #include "uno/lbnames.h" -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 41c963b22beb..b5d2d61f1fe1 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -114,14 +114,14 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 default : { EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)'+' ); + aEquation += OUString( (sal_Unicode)'+' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); } break; } if ( b3Special || nP3 ) { - aEquation += rtl::OUString( (sal_Unicode)'-' ); + aEquation += OUString( (sal_Unicode)'-' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); } } @@ -131,12 +131,12 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); if ( b2Special || ( nP2 != 1 ) ) { - aEquation += rtl::OUString( (sal_Unicode)'*' ); + aEquation += OUString( (sal_Unicode)'*' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); } if ( b3Special || ( ( nP3 != 1 ) && ( nP3 != 0 ) ) ) { - aEquation += rtl::OUString( (sal_Unicode)'/' ); + aEquation += OUString( (sal_Unicode)'/' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); } } @@ -179,11 +179,11 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 { aEquation += "if("; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)',' ); + aEquation += OUString( (sal_Unicode)',' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); - aEquation += rtl::OUString( (sal_Unicode)',' ); + aEquation += OUString( (sal_Unicode)',' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 7 : @@ -200,7 +200,7 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); aEquation += "*"; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 8 : @@ -288,7 +288,7 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); aEquation += "*"; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 0x81 : @@ -321,14 +321,14 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 return aEquation; } -void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ) +void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ) { if ( bIsSpecialValue ) { if ( nPara & 0x400 ) { rParameter += "?"; - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara & 0xff ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara & 0xff ) ); rParameter += " "; } else @@ -347,7 +347,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS case DFF_Prop_adjust10Value : { rParameter += "$"; - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) ); rParameter += " "; } break; @@ -376,7 +376,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS } else { - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara ) ); } } @@ -443,21 +443,21 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( { const com::sun::star::beans::PropertyValue& rPropVal = rHandleProperties[ i ]; - const rtl::OUString sPosition ( "Position" ); - const rtl::OUString sMirroredX ( "MirroredX" ); - const rtl::OUString sMirroredY ( "MirroredY" ); - const rtl::OUString sSwitched ( "Switched" ); - const rtl::OUString sPolar ( "Polar" ); - const rtl::OUString sRefX ( "RefX" ); - const rtl::OUString sRefY ( "RefY" ); - const rtl::OUString sRefAngle ( "RefAngle" ); - const rtl::OUString sRefR ( "RefR" ); - const rtl::OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" ); - const rtl::OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" ); - const rtl::OUString sRangeXMinimum ( "RangeXMinimum" ); - const rtl::OUString sRangeXMaximum ( "RangeXMaximum" ); - const rtl::OUString sRangeYMinimum ( "RangeYMinimum" ); - const rtl::OUString sRangeYMaximum ( "RangeYMaximum" ); + const OUString sPosition ( "Position" ); + const OUString sMirroredX ( "MirroredX" ); + const OUString sMirroredY ( "MirroredY" ); + const OUString sSwitched ( "Switched" ); + const OUString sPolar ( "Polar" ); + const OUString sRefX ( "RefX" ); + const OUString sRefY ( "RefY" ); + const OUString sRefAngle ( "RefAngle" ); + const OUString sRefR ( "RefR" ); + const OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" ); + const OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" ); + const OUString sRangeXMinimum ( "RangeXMinimum" ); + const OUString sRangeXMaximum ( "RangeXMaximum" ); + const OUString sRangeYMinimum ( "RangeYMinimum" ); + const OUString sRangeYMaximum ( "RangeYMaximum" ); if ( rPropVal.Name == sPosition ) { @@ -561,7 +561,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ////////////////////// // AdjustmentValues // ////////////////////// - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; @@ -569,7 +569,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////// // Coordsize // /////////////// - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) @@ -579,12 +579,12 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha nCoordWidthG = labs( aViewBox.Width ); nCoordHeightG = labs( aViewBox.Height); } - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); ////////////////////// // Path/Coordinates // ////////////////////// - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny ) *pAny >>= seqCoordinates; @@ -592,7 +592,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////////////// // Path/GluePoints // ///////////////////// - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny ) *pAny >>= seqGluePoints; @@ -600,7 +600,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/Segments // /////////////////// - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) *pAny >>= seqSegments; @@ -608,7 +608,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ////////////////////// // Path/SubViewSize // ////////////////////// - const rtl::OUString sSubViewSize( "SubViewSize" ); + const OUString sSubViewSize( "SubViewSize" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSubViewSize ); if ( pAny ) *pAny >>= seqSubViewSize; @@ -616,7 +616,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/StretchX // /////////////////// - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny ) { @@ -628,7 +628,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/StretchY // /////////////////// - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny ) { @@ -640,7 +640,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////////////// // Path/TextFrames // ///////////////////// - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny ) *pAny >>= seqTextFrames; @@ -648,7 +648,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////// // Equations // /////////////// - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny ) *pAny >>= seqEquations; @@ -656,7 +656,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////// // Handles // ///////////// - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny ) *pAny >>= seqHandles; @@ -760,11 +760,11 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : aP.Y() -= aS.Height() / 2; aLogicRect = Rectangle( aP, aS ); - const rtl::OUString sType( "Type" ); - const rtl::OUString sMirroredX( "MirroredX" ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sType( "Type" ); + const OUString sMirroredX( "MirroredX" ); + const OUString sMirroredY( "MirroredY" ); - rtl::OUString sShapeType; + OUString sShapeType; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) { @@ -1379,7 +1379,7 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex // and writing them back into the GeometryItem SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&) (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sAdjustmentValues; aPropVal.Value <<= seqAdjustmentValues; @@ -1844,7 +1844,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm case UNKNOWN : default : { - rtl::OStringBuffer aString("CustomShapes::unknown PolyFlagValue :"); + OStringBuffer aString("CustomShapes::unknown PolyFlagValue :"); aString.append(static_cast<sal_Int32>(nCommand)); OSL_FAIL(aString.getStr()); } diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index e6885a39166b..510e97664190 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -62,8 +62,8 @@ namespace { void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; - const rtl::OUString sOrigin( "Origin" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sOrigin ); + const OUString sOrigin( "Origin" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sOrigin ); if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) ) { rOriginX = 0.50; @@ -74,8 +74,8 @@ void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOr void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; - const rtl::OUString sRotateAngle( "RotateAngle" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sRotateAngle ); + const OUString sRotateAngle( "RotateAngle" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sRotateAngle ); if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) ) { rAngleX = 0.0; @@ -88,8 +88,8 @@ void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& void GetSkew( SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; - const rtl::OUString sSkew( "Skew" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sSkew ); + const OUString sSkew( "Skew" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sSkew ); if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) ) { rSkewAmount = 50; @@ -102,8 +102,8 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; double fDepth = 0, fFraction = 0; - const rtl::OUString sDepth( "Depth" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sDepth ); + const OUString sDepth( "Depth" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sDepth ); if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) { rForwardDepth = fDepth * fFraction; @@ -122,10 +122,10 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d } } -double GetDouble( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, double fDefault, const double* pMap ) +double GetDouble( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault, const double* pMap ) { double fRetValue = fDefault; - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= fRetValue; if ( pMap ) @@ -136,27 +136,27 @@ double GetDouble( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPrope drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault ) { drawing::ShadeMode eRet( eDefault ); - const rtl::OUString sShadeMode( "ShadeMode" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sShadeMode ); + const OUString sShadeMode( "ShadeMode" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sShadeMode ); if ( pAny ) *pAny >>= eRet; return eRet; } -sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, const sal_Bool bDefault ) +sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const sal_Bool bDefault ) { sal_Bool bRetValue = bDefault; - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= bRetValue; return bRetValue; } -drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, +drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Position3D& rDefault, const double* pMap ) { drawing::Position3D aRetValue( rDefault ); - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= aRetValue; if ( pMap ) @@ -168,10 +168,10 @@ drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const rtl: return aRetValue; } -drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, const drawing::Direction3D& rDefault ) +drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Direction3D& rDefault ) { drawing::Direction3D aRetValue( rDefault ); - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= aRetValue; return aRetValue; @@ -185,8 +185,8 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus , pMap( pM ) { SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sProjectionMode( "ProjectionMode" ); - Any* pAny = rGeometryItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sProjectionMode ); + const OUString sProjectionMode( "ProjectionMode" ); + Any* pAny = rGeometryItem.GetPropertyValueByName( OUString(aExtrusion), sProjectionMode ); if ( pAny ) *pAny >>= eProjectionMode; @@ -199,7 +199,7 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus fOriginX = fOriginX * pCustomShape->GetLogicRect().GetWidth(); fOriginY = fOriginY * pCustomShape->GetLogicRect().GetHeight(); - const rtl::OUString sViewPoint( "ViewPoint" ); + const OUString sViewPoint( "ViewPoint" ); drawing::Position3D aViewPointDefault( 3472, -3472, 25000 ); drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) ); fViewPoint.setX(aViewPoint.PositionX); @@ -316,7 +316,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con fDepth = 1.0; drawing::ProjectionMode eProjectionMode( drawing::ProjectionMode_PARALLEL ); - const rtl::OUString sProjectionMode( "ProjectionMode" ); + const OUString sProjectionMode( "ProjectionMode" ); Any* pAny = rGeometryItem.GetPropertyValueByName( aExtrusion, sProjectionMode ); if ( pAny ) *pAny >>= eProjectionMode; @@ -332,7 +332,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con bool bUseTwoFillStyles( false ); drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) ); - const rtl::OUString aExtrusionColor( "Color" ); + const OUString aExtrusionColor( "Color" ); sal_Bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, sal_False ); XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) ); @@ -546,7 +546,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con { aNewTransform.translate( -fOriginX, fOriginY, 0.0 ); // now set correct camera position - const rtl::OUString sViewPoint( "ViewPoint" ); + const OUString sViewPoint( "ViewPoint" ); drawing::Position3D aViewPointDefault( 3472, -3472, 25000 ); drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) ); double fViewPointX = aViewPoint.PositionX; @@ -564,33 +564,33 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // light // /////////// - const rtl::OUString sBrightness( "Brightness" ); + const OUString sBrightness( "Brightness" ); double fAmbientIntensity = GetDouble( rGeometryItem, sBrightness, 22178.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); + const OUString sFirstLightDirection( "FirstLightDirection" ); drawing::Direction3D aFirstLightDirectionDefault( 50000, 0, 10000 ); drawing::Direction3D aFirstLightDirection( GetDirection3D( rGeometryItem, sFirstLightDirection, aFirstLightDirectionDefault ) ); if ( aFirstLightDirection.DirectionZ == 0.0 ) aFirstLightDirection.DirectionZ = 1.0; - const rtl::OUString sFirstLightLevel( "FirstLightLevel" ); + const OUString sFirstLightLevel( "FirstLightLevel" ); double fLightIntensity = GetDouble( rGeometryItem, sFirstLightLevel, 43712.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" ); + const OUString sFirstLightHarsh( "FirstLightHarsh" ); /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, sal_False ); - const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + const OUString sSecondLightDirection( "SecondLightDirection" ); drawing::Direction3D aSecondLightDirectionDefault( -50000, 0, 10000 ); drawing::Direction3D aSecondLightDirection( GetDirection3D( rGeometryItem, sSecondLightDirection, aSecondLightDirectionDefault ) ); if ( aSecondLightDirection.DirectionZ == 0.0 ) aSecondLightDirection.DirectionZ = -1; - const rtl::OUString sSecondLightLevel( "SecondLightLevel" ); + const OUString sSecondLightLevel( "SecondLightLevel" ); double fLight2Intensity = GetDouble( rGeometryItem, sSecondLightLevel, 43712.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" ); - const rtl::OUString sLightFace( "LightFace" ); + const OUString sSecondLightHarsh( "SecondLightHarsh" ); + const OUString sLightFace( "LightFace" ); /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, sal_False ); /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, sal_False ); @@ -623,8 +623,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) ); pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) ); - const rtl::OUString sSpecularity( "Specularity" ); - const rtl::OUString sMetal( "Metal" ); + const OUString sSpecularity( "Specularity" ); + const OUString sMetal( "Metal" ); double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100; sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False ); @@ -681,7 +681,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward)); } - const rtl::OUString sRotationCenter( "RotationCenter" ); + const OUString sRotationCenter( "RotationCenter" ); drawing::Direction3D aRotationCenterDefault( 0, 0, 0 ); // default seems to be wrong, a fractional size of shape has to be used!! drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, sRotationCenter, aRotationCenterDefault ) ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx index 9c5faa150c21..c65b05e14743 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx @@ -66,11 +66,11 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); // XCustomShapeEngine @@ -84,11 +84,11 @@ public: throw ( css::uno::RuntimeException ); }; -rtl::OUString EnhancedCustomShapeEngine_getImplementationName() +OUString EnhancedCustomShapeEngine_getImplementationName() throw ( css::uno::RuntimeException ); -sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException ); -css::uno::Sequence< rtl::OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames() throw( css::uno::RuntimeException ); #endif diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 7c26fe15726b..d095dad35ecc 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -64,7 +64,7 @@ struct FWCharacterData // representing a single character }; struct FWParagraphData // representing a single paragraph { - rtl::OUString aString; + OUString aString; std::vector< FWCharacterData > vCharacters; Rectangle aBoundRect; sal_Int16 nFrameDirection; @@ -219,7 +219,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F std::vector< FWParagraphData >::iterator aParagraphIEnd( rTextArea.vParagraphs.end() ); while( aParagraphIter != aParagraphIEnd ) { - const rtl::OUString& rText = aParagraphIter->aString; + const OUString& rText = aParagraphIter->aString; if ( !rText.isEmpty() ) { // generating vcl/font @@ -282,7 +282,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F for ( i = 0; i < rText.getLength(); i++ ) { FWCharacterData aCharacterData; - rtl::OUString aCharText( (sal_Unicode)rText[ i ] ); + OUString aCharText( (sal_Unicode)rText[ i ] ); if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) ) { sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN ); @@ -427,8 +427,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) sal_Bool bSameLetterHeights = sal_False; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sTextPath( "TextPath" ); - const rtl::OUString sSameLetterHeights( "SameLetterHeights" ); + const OUString sTextPath( "TextPath" ); + const OUString sSameLetterHeights( "SameLetterHeights" ); com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights ); if ( pAny ) *pAny >>= bSameLetterHeights; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index cc8038e89385..a8c9cadc06a4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -838,13 +838,13 @@ public: { case ENUM_FUNC_ADJUSTMENT : { - rtl::OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new AdjustmentExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); } break; case ENUM_FUNC_EQUATION : { - rtl::OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new EquationExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); } break; @@ -1176,13 +1176,13 @@ namespace EnhancedCustomShape { -ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) +ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiFunction( - rtl::OUStringToOString( rFunction, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiFunction( + OUStringToOString( rFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiFunction.getStr() ); StringIteratorT aEnd( rAsciiFunction.getStr()+rAsciiFunction.getLength() ); diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index f083bc68151e..9c06dab28a9f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -282,7 +282,7 @@ static const NameTypeTable pNameTypeTableArray[] = // gallery: fontwork-arch-left-pour // gallery: fontwork-arch-right-pour -MSO_SPT EnhancedCustomShapeTypeNames::Get( const rtl::OUString& rShapeType ) +MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString& rShapeType ) { if ( !pHashMap ) { // init hash map @@ -310,11 +310,11 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const rtl::OUString& rShapeType ) return eRetValue; } -rtl::OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) +OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) { return eShapeType <= mso_sptTextBox - ? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) - : rtl::OUString(); + ? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) + : OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 7a29065718da..87dab72ad024 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -144,14 +144,14 @@ void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ ) return sal_True; } -::rtl::OUString SAL_CALL SvxTbxCtlCustomShapes::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxTbxCtlCustomShapes::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { // Provide the controlled sub-toolbar name, so we are notified whenever // this toolbar executes a function. return m_aSubTbName; } -void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rCommand ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const OUString& rCommand ) throw (::com::sun::star::uno::RuntimeException) { // remind the new command m_aCommand = rCommand; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index fcccacb048e3..ba192eb321b3 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -249,8 +249,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - aStbStatus.InsertItem( 2, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); - aStbStatus.InsertItem( 3, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); aStbStatus.InsertItem( 4, 20, SIB_CENTER | SIB_IN ); Resize(); @@ -562,7 +562,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); - aStr.Append( rtl::OUString(" / ") ); + aStr.Append( OUString(" / ") ); aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 2, aStr ); @@ -579,7 +579,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); - aStr.Append( rtl::OUString(" x ") ); + aStr.Append( OUString(" x ") ); aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 3, aStr ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 1afcbca20378..f8434defeeac 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -399,7 +399,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) int x = pix.X(); int y = pix.Y(); - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( i ) ); String aCharStr(buf.makeStringAndClear()); int nTextWidth = GetTextWidth(aCharStr); @@ -722,7 +722,7 @@ void SvxShowCharSet::ReleaseAccessible() boost::shared_ptr<svx::SvxShowCharSetItem> xItem(new svx::SvxShowCharSetItem(*this, m_pAccessible->getTable(), sal::static_int_cast< sal_uInt16 >(_nPos))); aFind = m_aItems.insert(ItemsMap::value_type(_nPos, xItem)).first; - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) ); aFind->second->maText = buf.makeStringAndClear(); Point pix = MapIndexToPixel( _nPos ); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index f1e863921717..aedc3187398b 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -456,7 +456,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) - aToken = rtl::OUString(pCurToken, nCurTokenLen); + aToken = OUString(pCurToken, nCurTokenLen); else aToken.Erase(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index ae2103614984..d5007a275807 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -567,7 +567,7 @@ void RecoveryCore::impl_stopListening() } //=============================================== -css::util::URL RecoveryCore::impl_getParsedURL(const ::rtl::OUString& sURL) +css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) { css::util::URL aURL; aURL.Complete = sURL; @@ -635,12 +635,12 @@ void SAL_CALL PluginProgress::removeEventListener( const css::uno::Reference< cs } //=============================================== -void SAL_CALL PluginProgress::start(const ::rtl::OUString&, +void SAL_CALL PluginProgress::start(const OUString&, sal_Int32 nRange) throw(css::uno::RuntimeException) { if (m_xProgress.is()) - m_xProgress->start(::rtl::OUString(), nRange); + m_xProgress->start(OUString(), nRange); } //=============================================== @@ -652,7 +652,7 @@ void SAL_CALL PluginProgress::end() } //=============================================== -void SAL_CALL PluginProgress::setText(const ::rtl::OUString& sText) +void SAL_CALL PluginProgress::setText(const OUString& sText) throw(css::uno::RuntimeException) { if (m_xProgress.is()) @@ -971,9 +971,9 @@ RecoveryDialog::RecoveryDialog(Window* pParent, FreeResource(); - ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" ); - ::rtl::OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); - ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled" ); + OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" ); + OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); + OUString CFG_ENTRY_ENABLED( "Enabled" ); sal_Bool bCrashRepEnabled( sal_False ); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( @@ -1442,7 +1442,7 @@ void BrokenRecoveryDialog::impl_refresh() sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_aFileListLB.SetEntryData( nPos, (void*)&rInfo ); } - m_sSavePath = ::rtl::OUString(); + m_sSavePath = OUString(); m_aOkBtn.GrabFocus(); } @@ -1453,7 +1453,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded() } //=============================================== -::rtl::OUString BrokenRecoveryDialog::getSaveDirURL() +OUString BrokenRecoveryDialog::getSaveDirURL() { return m_sSavePath; } @@ -1462,7 +1462,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded() IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) { String sPhysicalPath = comphelper::string::strip(m_aSaveDirED.GetText(), ' '); - rtl::OUString sURL; + OUString sURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL ); m_sSavePath = sURL; while (m_sSavePath.isEmpty()) @@ -1932,7 +1932,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() /////////////////////////////////////////////////////////////////////// - static ::rtl::OUString GetCrashConfigDir() + static OUString GetCrashConfigDir() { #if defined(WNT) @@ -1956,17 +1956,17 @@ void BrokenRecoveryDialog::impl_askForSavePath() #define PRVFILE ".crash_report_preview" #endif - static ::rtl::OUString GetPreviewURL() + static OUString GetPreviewURL() { - ::rtl::OUString aURL = GetCrashConfigDir(); + OUString aURL = GetCrashConfigDir(); - aURL += ::rtl::OUString( "/" ); - aURL += ::rtl::OUString( PRVFILE ); + aURL += OUString( "/" ); + aURL += OUString( PRVFILE ); return aURL; } - static String LoadCrashFile( const ::rtl::OUString &rURL ) + static String LoadCrashFile( const OUString &rURL ) { String aFileContent; ::osl::File aFile( rURL ); @@ -1974,7 +1974,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() printf( "Loading %s:", OString( rURL.getStr(), rURL.getLength(), osl_getThreadTextEncoding() ).getStr() ); if ( ::osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) ) { - ::rtl::OString aContent; + OString aContent; ::osl::FileBase::RC result; sal_uInt64 aBytesRead; @@ -1986,12 +1986,12 @@ void BrokenRecoveryDialog::impl_askForSavePath() if ( ::osl::FileBase::E_None == result ) { - ::rtl::OString aTemp( aBuffer, static_cast< xub_StrLen >( aBytesRead ) ); + OString aTemp( aBuffer, static_cast< xub_StrLen >( aBytesRead ) ); aContent += aTemp; } } while ( ::osl::FileBase::E_None == result && aBytesRead ); - ::rtl::OUString ustrContent( aContent.getStr(), aContent.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString ustrContent( aContent.getStr(), aContent.getLength(), RTL_TEXTENCODING_UTF8 ); aFileContent = ustrContent; aFile.close(); @@ -2019,7 +2019,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() String aPreview = LoadCrashFile( GetPreviewURL() ); ErrorRepSendDialog *pMainDlg = (ErrorRepSendDialog *)_pParent; - String aSeperator = ::rtl::OUString( "\r\n\r\n================\r\n\r\n" ); + String aSeperator = OUString( "\r\n\r\n================\r\n\r\n" ); String aContent = pMainDlg->GetDocType(); if ( aContent.Len() > 0 ) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 451efe79cbd2..d9867c2f9e8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -572,7 +572,7 @@ const SvxFont& SvxFontPrevWindow::GetFont() const // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString ) +void SvxFontPrevWindow::SetPreviewText( const OUString& rString ) { pImpl->aText = rString; pImpl->bTextInited = true; @@ -770,12 +770,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) long nTextWidth = 0; if(pImpl->cStartBracket) { - rtl::OUString sBracket(pImpl->cStartBracket); + OUString sBracket(pImpl->cStartBracket); nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } if(pImpl->cEndBracket) { - rtl::OUString sBracket(pImpl->cEndBracket); + OUString sBracket(pImpl->cEndBracket); nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); @@ -792,7 +792,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cStartBracket) { - rtl::OUString sBracket(pImpl->cStartBracket); + OUString sBracket(pImpl->cStartBracket); rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); _nX += nStartBracketWidth; } @@ -806,7 +806,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cEndBracket) { Point aTmpPoint( _nX + 1, nY - nOffset - 4); - rtl::OUString sBracket(pImpl->cEndBracket); + OUString sBracket(pImpl->cEndBracket); rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); } pImpl->aCJKFont.SetSize( aOldSize ); @@ -951,7 +951,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, if( GetWhich( rSet, SID_CHAR_DLG_PREVIEW_STRING, nWhich ) ) { const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); - ::rtl::OUString aString = rItem.GetValue(); + OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); else @@ -1188,7 +1188,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) if( ISITEMSET ) { const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); - ::rtl::OUString aString = rItem.GetValue(); + OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); else diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index f95c7685147a..b83a0db07931 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -63,7 +63,7 @@ IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< X pItemInfo = new SfxItemInfo[ 1 ]; memset( pItemInfo, 0, sizeof( SfxItemInfo ) ); - pIMapPool = new SfxItemPool( rtl::OUString("IMapItemPool"), + pIMapPool = new SfxItemPool( OUString("IMapItemPool"), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo ); pIMapPool->FreezeIdRanges(); } @@ -640,8 +640,8 @@ void IMapWindow::DoMacroAssign() SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); - aNamesItem.AddEvent( rtl::OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT ); - aNamesItem.AddEvent( rtl::OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT ); + aNamesItem.AddEvent( OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT ); + aNamesItem.AddEvent( OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT ); aSet.Put( aNamesItem ); SvxMacroItem aMacroItem(SID_ATTR_MACROITEM); diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index d84d512b94e2..91aff686c092 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -41,7 +41,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFil // replace filename String sInfoText = m_aInfoText.GetText(); - sInfoText.SearchAndReplaceAll(rtl::OUString("%FILENAME"), _rFileName); + sInfoText.SearchAndReplaceAll(OUString("%FILENAME"), _rFileName); m_aInfoText.SetText( sInfoText ); // load state of "warning on" checkbox from misc options diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 64cbdf1b67d8..f6ceeae7f3bc 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -207,14 +207,14 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : aNumFldDivisionY.SetModifyHdl( LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); - ::rtl::OUString sFlResolution( aFlResolution.GetDisplayText() ); - ::rtl::OUString sFtDrawX(aFtDrawX.GetDisplayText()); - ::rtl::OUString sFtDrawY(aFtDrawY.GetDisplayText()); + OUString sFlResolution( aFlResolution.GetDisplayText() ); + OUString sFtDrawX(aFtDrawX.GetDisplayText()); + OUString sFtDrawY(aFtDrawY.GetDisplayText()); aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution ); aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution ); - ::rtl::OUString sFlDivision( aFlDivision.GetDisplayText() ); - ::rtl::OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); - ::rtl::OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); + OUString sFlDivision( aFlDivision.GetDisplayText() ); + OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); + OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); aNumFldDivisionX.SetAccessibleName( sFtDivisionX + sFlDivision ); aNumFldDivisionY.SetAccessibleName( sFtDivisionY + sFlDivision ); } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 2a9436e42ecb..e4469cdf58e7 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -307,10 +307,10 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s Size aDrawSize( 0, aRect.GetHeight() / 6); aFont.SetSize(aDrawSize); SetFont(aFont); - String sText(rtl::OUString("ABC")); + String sText(OUString("ABC")); Point aMove(1, GetTextHeight()); sal_Unicode cArrow = 0x2193; - long nAWidth = GetTextWidth(rtl::OUString(sText.GetChar(0))); + long nAWidth = GetTextWidth(OUString(sText.GetChar(0))); switch(pImpl->nFrameDirection) { case FRMDIR_HORI_LEFT_TOP: @@ -340,7 +340,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s sText.Append(cArrow); for(sal_uInt16 i = 0; i < sText.Len(); i++) { - rtl::OUString sDraw(sText.GetChar(i)); + OUString sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); bool bHorizontal = 0 == aMove.Y(); diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 08221d1a6751..8782fcb343db 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -168,7 +168,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) // add the All-Filter String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ) ); - maFileDlg.AddFilter(aAllFilter, rtl::OUString("*.*")); + maFileDlg.AddFilter(aAllFilter, OUString("*.*")); // and activate him maFileDlg.SetCurrentFilter( aAllFilter ); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 89fe57a53839..22826bb9f417 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -99,7 +99,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( rtl::OUString('%') ); + SetCustomUnitText( OUString('%') ); SetUnit( FUNIT_CUSTOM ); } else diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index aa729ac9d498..2a19a5332561 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::style; using namespace com::sun::star::view; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using rtl::OUString; SFX_IMPL_CHILDWINDOW( SvxRubyChildWindow, SID_RUBY_DIALOG ); @@ -846,7 +845,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) break; case RubyAdjust_INDENT_BLOCK: { - long nCharWidth = GetTextWidth(rtl::OUString("X")); + long nCharWidth = GetTextWidth(OUString("X")); if(nOutTextWidth < (nRightEnd - nLeftStart - nCharWidth)) { nCharWidth /= 2; @@ -862,7 +861,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nSpace = ((nRightEnd - nLeftStart) - GetTextWidth(sOutputText)) / (nCount - 1); for(xub_StrLen i = 0; i < nCount; i++) { - rtl::OUString sChar(sOutputText.GetChar(i)); + OUString sChar(sOutputText.GetChar(i)); DrawText( Point( nLeftStart , nYOutput), sChar); long nCharWidth = GetTextWidth(sChar); nLeftStart += nCharWidth + nSpace; diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index e0c581a0159f..3271f6803f9c 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -189,9 +189,9 @@ namespace svx{ { fprintf( fp, "[Options]\n" ); fprintf( fp, "UseProxy=%s\n", 2 == maParams.miHTTPConnectionType ? "true" : "false" ); - fprintf( fp, "ProxyServer=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).getStr() ); - fprintf( fp, "ProxyPort=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).getStr() ); - fprintf( fp, "ReturnAddress=%s\n", rtl::OUStringToOString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ProxyServer=%s\n", OUStringToOString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ProxyPort=%s\n", OUStringToOString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ReturnAddress=%s\n", OUStringToOString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf( fp, "AllowContact=%s\n", IsContactAllowed() ? "true" : "false" ); fclose( fp ); } @@ -201,8 +201,8 @@ namespace svx{ bool ErrorRepSendDialog::SendReport() { - rtl::OUString sSubEnvVar("ERRORREPORT_SUBJECT"); - rtl::OUString strSubject(GetDocType()); + OUString sSubEnvVar("ERRORREPORT_SUBJECT"); + OUString strSubject(GetDocType()); osl_setEnvironment(sSubEnvVar.pData, strSubject.pData); char szBodyFile[L_tmpnam] = ""; @@ -210,22 +210,22 @@ namespace svx{ if ( fp ) { - rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); + OString strUTF8(OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); size_t nWritten = fwrite(strUTF8.getStr(), 1, strUTF8.getLength(), fp); OSL_VERIFY(nWritten == static_cast<size_t>(strUTF8.getLength())); fclose( fp ); - rtl::OUString sBodyEnvVar("ERRORREPORT_BODYFILE"); - rtl::OUString strBodyFile(rtl::OStringToOUString(rtl::OString(szBodyFile), + OUString sBodyEnvVar("ERRORREPORT_BODYFILE"); + OUString strBodyFile(OStringToOUString(OString(szBodyFile), osl_getThreadTextEncoding())); osl_setEnvironment(sBodyEnvVar.pData, strBodyFile.pData); } int ret = -1; - rtl::OUString path1("$BRAND_BASE_DIR/program/crashrep"); + OUString path1("$BRAND_BASE_DIR/program/crashrep"); rtl::Bootstrap::expandMacros(path1); - rtl::OString path2; + OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == osl::FileBase::E_None) && path1.convertToString( @@ -233,7 +233,7 @@ namespace svx{ (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { - rtl::OStringBuffer cmd; + OStringBuffer cmd; tools::appendUnixShellWord(&cmd, path2); cmd.append(" -debug -load -send -noui"); ret = system(cmd.getStr()); diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index b49a2612931e..0a02388a3c86 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -112,7 +112,7 @@ namespace svx{ TEXT("ReturnAddress"), szBuffer, sizeof(szBuffer) ) ) - maEMailAddrED.SetText(rtl::OUString((sal_Unicode *)szBuffer)); + maEMailAddrED.SetText(OUString((sal_Unicode *)szBuffer)); DWORD fAllowContact = sal_False; RegReadValue( @@ -196,7 +196,7 @@ namespace svx{ if ( fp ) { - rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), + OString strUTF8(OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); fwrite( strUTF8.getStr(), 1, strUTF8.getLength(), fp ); diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index c32ed7463c2f..46f308d86a6b 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -209,7 +209,7 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) } bPaintFlag=sal_True; } -void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText, +void SvxSimpleTable::InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol, HeaderBarItemBits nBits) { sal_Int32 nEnd = rText.indexOf( sal_Unicode( '\t' ) ); @@ -222,7 +222,7 @@ void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText, sal_Int32 nIndex = 0; do { - rtl::OUString aString = rText.getToken(0, '\t', nIndex); + OUString aString = rText.getToken(0, '\t', nIndex); aHeaderBar.InsertItem(nHeaderItemId++, aString, 0, nBits, nCol); } while ( nIndex >= 0 ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 0040b3278427..9e7296061f1f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -117,17 +117,17 @@ struct SearchDlg_Impl bDeltaCalculated( sal_False ), pRanges ( NULL ) { - aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent1"); - aCommand1URL.Protocol = rtl::OUString("vnd.sun.search:"); - aCommand1URL.Path = rtl::OUString("SearchViaComponent1"); - aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent2"); - aCommand2URL.Protocol = rtl::OUString("vnd.sun.search:"); - aCommand2URL.Path = rtl::OUString("SearchViaComponent2"); + aCommand1URL.Complete = aCommand1URL.Main = OUString("vnd.sun.search:SearchViaComponent1"); + aCommand1URL.Protocol = OUString("vnd.sun.search:"); + aCommand1URL.Path = OUString("SearchViaComponent1"); + aCommand2URL.Complete = aCommand2URL.Main = OUString("vnd.sun.search:SearchViaComponent2"); + aCommand2URL.Protocol = OUString("vnd.sun.search:"); + aCommand2URL.Path = OUString("SearchViaComponent2"); } ~SearchDlg_Impl() { delete[] pRanges; } }; -void ListToStrArr_Impl( sal_uInt16 nId, std::vector<rtl::OUString>& rStrLst, ComboBox& rCBox ) +void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox& rCBox ) { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); @@ -144,12 +144,12 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<rtl::OUString>& rStrLst, Com } } -void StrArrToList_Impl( sal_uInt16 nId, const std::vector<rtl::OUString>& rStrLst ) +void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst ) { DBG_ASSERT( !rStrLst.empty(), "check in advance"); std::vector<String> aLst; - for (std::vector<rtl::OUString>::const_iterator i = rStrLst.begin(); i != rStrLst.end(); ++i) + for (std::vector<OUString>::const_iterator i = rStrLst.begin(); i != rStrLst.end(); ++i) aLst.push_back(String(*i)); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); @@ -433,7 +433,7 @@ void SvxSearchDialog::Construct_Impl() // vnd.sun.star::SearchViaComponent1 and 2 are supported const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame(); const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame, uno::UNO_QUERY); - rtl::OUString sTarget("_self"); + OUString sTarget("_self"); bool bSearchComponent1 = false; bool bSearchComponent2 = false; @@ -456,24 +456,24 @@ void SvxSearchDialog::Construct_Impl() uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider = configuration::theDefaultProvider::get( comphelper::getComponentContext(xMgr) ); uno::Sequence< uno::Any > aArgs(1); - ::rtl::OUString sPath( "/org.openoffice.Office.Common/SearchOptions/"); + OUString sPath( "/org.openoffice.Office.Common/SearchOptions/"); aArgs[0] <<= sPath; uno::Reference< uno::XInterface > xIFace = xConfigurationProvider->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), aArgs); uno::Reference< container::XNameAccess> xDirectAccess(xIFace, uno::UNO_QUERY); if(xDirectAccess.is()) { - ::rtl::OUString sTemp; - ::rtl::OUString sProperty( "ComponentSearchGroupLabel"); + OUString sTemp; + OUString sProperty( "ComponentSearchGroupLabel"); uno::Any aRet = xDirectAccess->getByName(sProperty); aRet >>= sTemp; aSearchComponentFL.SetText( sTemp ); - aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel1")); + aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel1")); aRet >>= sTemp; aSearchComponent1PB.SetText( sTemp ); - aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel2")); + aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel2")); aRet >>= sTemp; aSearchComponent2PB.SetText( sTemp ); } @@ -1527,9 +1527,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { uno::Sequence < beans::PropertyValue > aArgs(2); beans::PropertyValue* pArgs = aArgs.getArray(); - pArgs[0].Name = ::rtl::OUString("SearchString"); - pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText()); - pArgs[1].Name = ::rtl::OUString("ParentWindow"); + pArgs[0].Name = OUString("SearchString"); + pArgs[0].Value <<= OUString(aSearchLB.GetText()); + pArgs[1].Name = OUString("ParentWindow"); pArgs[1].Value <<= VCLUnoHelper::GetInterface( this ); if(pBtn == &aSearchComponent1PB) { @@ -1706,11 +1706,11 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) if ( !rStr.Len() ) return; - std::vector<rtl::OUString>* pArr = _bSearch ? &aSearchStrings : &aReplaceStrings; + std::vector<OUString>* pArr = _bSearch ? &aSearchStrings : &aReplaceStrings; ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB; // ignore identical strings - for (std::vector<rtl::OUString>::const_iterator i = pArr->begin(); i != pArr->end(); ++i) + for (std::vector<OUString>::const_iterator i = pArr->begin(); i != pArr->end(); ++i) { if ((*i).equals(rStr)) return; diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 695b546e647d..40a1390ad2cf 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -42,7 +42,7 @@ SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) { } -SvxStandardDialog::SvxStandardDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) +SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : SfxModalDialog(pParent, rID, rUIXMLDescription) { } diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 9e93b691025e..b38b45de9310 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -48,11 +48,11 @@ SvxStringArray::~SvxStringArray() //------------------------------------------------------------------------ -const rtl::OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const +const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index cfddf3fab190..a135586b947f 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -62,7 +62,6 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::text; using namespace com::sun::star::container; using namespace com::sun::star::style; -using rtl::OUString; #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 @@ -93,7 +92,7 @@ static const sal_Unicode aBulletTypes[] = static Font& lcl_GetDefaultBulletFont() { static sal_Bool bInit = 0; - static Font aDefBulletFont( rtl::OUString("StarSymbol"), + static Font aDefBulletFont( OUString("StarSymbol"), String(), Size( 0, 14 ) ); if(!bInit) { @@ -303,9 +302,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } Sequence< PropertyValue > aProperties(2); PropertyValue* pProperties = aProperties.getArray(); - pProperties[0].Name = rtl::OUString("NumberingType"); + pProperties[0].Name = OUString("NumberingType"); pProperties[0].Value <<= aNumberingTypes[i]; - pProperties[1].Name = rtl::OUString("Value"); + pProperties[1].Name = OUString("Value"); pProperties[1].Value <<= (sal_Int32)1; try { diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 39ca05ac3169..2dfdebe603a8 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -161,13 +161,13 @@ void SvxSwFrameExample::InitAllRects_Impl() { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() - 2)); SetFont(aFont); - aParaPrtArea.SetSize(Size(GetTextWidth(rtl::OUString(DEMOTEXT)), GetTextHeight())); + aParaPrtArea.SetSize(Size(GetTextWidth(OUString(DEMOTEXT)), GetTextHeight())); } else { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() / 2)); SetFont(aFont); - aAutoCharFrame.SetSize(Size(GetTextWidth(rtl::OUString('A')), GetTextHeight())); + aAutoCharFrame.SetSize(Size(GetTextWidth(OUString('A')), GetTextHeight())); aAutoCharFrame.SetPos(Point(aParaPrtArea.Left() + (aParaPrtArea.GetWidth() - aAutoCharFrame.GetWidth()) / 2, aParaPrtArea.Top() + (aParaPrtArea.GetHeight() - aAutoCharFrame.GetHeight()) / 2)); } @@ -207,7 +207,7 @@ void SvxSwFrameExample::InitAllRects_Impl() } else { - sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(rtl::OUString(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(OUString(DEMOTEXT)); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L))); @@ -665,11 +665,11 @@ void SvxSwFrameExample::Paint(const Rectangle&) aPara.Bottom() -= nDiff; } if (nAnchor == TextContentAnchorType_AT_CHARACTER && bIgnoreWrap) - DrawText(aAutoCharFrame, rtl::OUString('A')); + DrawText(aAutoCharFrame, OUString('A')); } else { - DrawText(aParaPrtArea, rtl::OUString(DEMOTEXT)); + DrawText(aParaPrtArea, OUString(DEMOTEXT)); DrawRect_Impl(aDrawObj, m_aBlankCol, m_aBlankFrameCol ); } diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 1252b93a17bf..c67f0997ceed 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -39,14 +39,14 @@ SvxTextEncodingTable::~SvxTextEncodingTable() //------------------------------------------------------------------------ -const rtl::OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const +const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const { sal_uInt32 nPos = FindIndex( (long)nEnc ); if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 81a809263ab0..b5e9b8e20539 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -47,11 +47,11 @@ namespace svx //= OColumnTransferable //==================================================================== //-------------------------------------------------------------------- - OColumnTransferable::OColumnTransferable(const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + OColumnTransferable::OColumnTransferable(const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ,sal_Int32 _nFormats) :m_nFormatFlags(_nFormats) { @@ -62,7 +62,7 @@ namespace svx OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats ) :m_nFormatFlags(_nFormats) { - ::rtl::OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName; + OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName; if ( _rDescriptor.has( daDataSource ) ) _rDescriptor[ daDataSource ] >>= sDataSource; if ( _rDescriptor.has( daDatabaseLocation ) ) _rDescriptor[ daDatabaseLocation ] >>= sDatabaseLocation; if ( _rDescriptor.has( daConnectionResource ) ) _rDescriptor[ daConnectionResource ] >>= sConnectionResource; @@ -88,15 +88,15 @@ namespace svx //-------------------------------------------------------------------- OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm, - const ::rtl::OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn, + const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn, const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats) :m_nFormatFlags(_nFormats) { OSL_ENSURE(_rxForm.is(), "OColumnTransferable::OColumnTransferable: invalid form!"); // collect the necessary information from the form - ::rtl::OUString sCommand; + OUString sCommand; sal_Int32 nCommandType = CommandType::TABLE; - ::rtl::OUString sDatasource,sURL; + OUString sDatasource,sURL; sal_Bool bTryToParse = sal_True; try @@ -119,14 +119,14 @@ namespace svx try { Reference< XTablesSupplier > xSupTab; - _rxForm->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupTab; + _rxForm->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab; if(xSupTab.is()) { Reference< XNameAccess > xNames = xSupTab->getTables(); if (xNames.is()) { - Sequence< ::rtl::OUString > aTables = xNames->getElementNames(); + Sequence< OUString > aTables = xNames->getElementNames(); if (1 == aTables.getLength()) { sCommand = aTables[0]; @@ -158,23 +158,23 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; } //-------------------------------------------------------------------- - void OColumnTransferable::implConstruct( const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + void OColumnTransferable::implConstruct( const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - , const ::rtl::OUString& _rFieldName) + ,const OUString& _rCommand + , const OUString& _rFieldName) { const sal_Unicode cSeparator = sal_Unicode(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); - m_sCompatibleFormat = ::rtl::OUString(); + m_sCompatibleFormat = OUString(); m_sCompatibleFormat += _rDatasource; m_sCompatibleFormat += sSeparator; m_sCompatibleFormat += _rCommand; @@ -193,7 +193,7 @@ namespace svx cCommandType = '2'; break; } - m_sCompatibleFormat += ::rtl::OUString(&cCommandType, 1); + m_sCompatibleFormat += OUString(&cCommandType, 1); m_sCompatibleFormat += sSeparator; m_sCompatibleFormat += _rFieldName; @@ -291,7 +291,7 @@ namespace svx } // only the old (compatible) format exists -> use the other extract method ... - ::rtl::OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource; + OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource; sal_Int32 nCommandType = CommandType::COMMAND; ODataAccessDescriptor aDescriptor; @@ -314,12 +314,12 @@ namespace svx //-------------------------------------------------------------------- sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData - ,::rtl::OUString& _rDatasource - ,::rtl::OUString& _rDatabaseLocation - ,::rtl::OUString& _rConnectionResource + ,OUString& _rDatasource + ,OUString& _rDatabaseLocation + ,OUString& _rConnectionResource ,sal_Int32& _nCommandType - ,::rtl::OUString& _rCommand - ,::rtl::OUString& _rFieldName) + ,OUString& _rCommand + ,OUString& _rFieldName) { if ( _rData.HasFormat(getDescriptorFormatId()) ) { @@ -384,20 +384,20 @@ namespace svx //= ODataAccessObjectTransferable //==================================================================== ODataAccessObjectTransferable::ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ) { construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand); } //-------------------------------------------------------------------- ODataAccessObjectTransferable::ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection) { OSL_ENSURE(_rxConnection.is(),"Wrong ctor used.!"); @@ -408,9 +408,9 @@ namespace svx ODataAccessObjectTransferable::ODataAccessObjectTransferable(const Reference< XPropertySet >& _rxLivingForm) { // collect some properties of the form - ::rtl::OUString sDatasourceName,sConnectionResource; + OUString sDatasourceName,sConnectionResource; sal_Int32 nObjectType = CommandType::COMMAND; - ::rtl::OUString sObjectName; + OUString sObjectName; Reference< XConnection > xConnection; try { @@ -427,7 +427,7 @@ namespace svx } // check if the SQL-statement is modified - ::rtl::OUString sCompleteStatement; + OUString sCompleteStatement; try { _rxLivingForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sCompleteStatement; @@ -553,7 +553,7 @@ namespace svx void ODataAccessObjectTransferable::addCompatibleSelectionDescription( const Sequence< Any >& _rSelRows ) { const sal_Unicode cSeparator(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); const Any* pSelRows = _rSelRows.getConstArray(); const Any* pSelRowsEnd = pSelRows + _rSelRows.getLength(); @@ -562,7 +562,7 @@ namespace svx sal_Int32 nSelectedRow( 0 ); OSL_VERIFY( *pSelRows >>= nSelectedRow ); - m_sCompatibleObjectDescription += ::rtl::OUString::valueOf((sal_Int32)nSelectedRow); + m_sCompatibleObjectDescription += OUString::valueOf((sal_Int32)nSelectedRow); m_sCompatibleObjectDescription += sSeparator; } } @@ -573,13 +573,13 @@ namespace svx m_aDescriptor.clear(); } // ----------------------------------------------------------------------------- - void ODataAccessObjectTransferable::construct( const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + void ODataAccessObjectTransferable::construct( const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection ,sal_Bool _bAddCommand - ,const ::rtl::OUString& _sActiveCommand) + ,const OUString& _sActiveCommand) { m_aDescriptor.setDataSource(_rDatasource); // build the descriptor (the property sequence) @@ -592,8 +592,8 @@ namespace svx // extract the single values from the sequence - ::rtl::OUString sObjectName; - ::rtl::OUString sDatasourceName = _rDatasource; + OUString sObjectName; + OUString sDatasourceName = _rDatasource; sObjectName = _rCommand; // for compatibility: create a string which can be used for the SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format @@ -602,7 +602,7 @@ namespace svx // statements are - in this old and ugly format - described as queries const sal_Unicode cSeparator = sal_Unicode(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); const sal_Unicode cTableMark = '1'; const sal_Unicode cQueryMark = '0'; @@ -610,23 +610,23 @@ namespace svx // build the descriptor string m_sCompatibleObjectDescription += sDatasourceName; m_sCompatibleObjectDescription += sSeparator; - m_sCompatibleObjectDescription += bTreatAsStatement ? ::rtl::OUString() : sObjectName; + m_sCompatibleObjectDescription += bTreatAsStatement ? OUString() : sObjectName; m_sCompatibleObjectDescription += sSeparator; switch (_nCommandType) { case CommandType::TABLE: - m_sCompatibleObjectDescription += ::rtl::OUString(&cTableMark, 1); + m_sCompatibleObjectDescription += OUString(&cTableMark, 1); break; case CommandType::QUERY: - m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1); + m_sCompatibleObjectDescription += OUString(&cQueryMark, 1); break; case CommandType::COMMAND: - m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1); + m_sCompatibleObjectDescription += OUString(&cQueryMark, 1); // think of it as a query break; } m_sCompatibleObjectDescription += sSeparator; - m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : ::rtl::OUString(); + m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : OUString(); m_sCompatibleObjectDescription += sSeparator; } @@ -640,7 +640,7 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 1f0b1df05096..182e74fd49d1 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -47,7 +47,7 @@ namespace svx //= OComponentTransferable //==================================================================== //-------------------------------------------------------------------- - OComponentTransferable::OComponentTransferable(const ::rtl::OUString& _rDatasourceOrLocation + OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) { m_aDescriptor.setDataSource(_rDatasourceOrLocation); @@ -62,12 +62,12 @@ namespace svx static sal_uInt32 s_nFormFormat = (sal_uInt32)-1; if ( _bExtractForm && (sal_uInt32)-1 == s_nFormFormat ) { - s_nFormFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); + s_nFormFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } else if ( !_bExtractForm && (sal_uInt32)-1 == s_nReportFormat) { - s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); + s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } return _bExtractForm ? s_nFormFormat : s_nReportFormat; @@ -82,7 +82,7 @@ namespace svx Reference<XPropertySet> xProp; m_aDescriptor[daComponent] >>= xProp; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bForm; + xProp->getPropertyValue(OUString("IsForm")) >>= bForm; } catch(Exception) {} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index f0ec0421841d..b3c259deda8b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -89,7 +89,7 @@ using namespace ::svx; //============================================================================== //------------------------------------------------------------------------------ -::rtl::OUString FieldServiceFromId(sal_Int32 nID) +OUString FieldServiceFromId(sal_Int32 nID) { switch (nID) { @@ -104,7 +104,7 @@ using namespace ::svx; case SID_FM_PATTERNFIELD : return FM_COL_PATTERNFIELD; case SID_FM_FORMATTEDFIELD : return FM_COL_FORMATTEDFIELD; } - return ::rtl::OUString(); + return OUString(); } //============================================================================== @@ -193,7 +193,7 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) try { Reference< ::com::sun::star::beans::XPropertySet > xColumn(xColumns->getByIndex(nPos),UNO_QUERY); - ::rtl::OUString aHelpText; + OUString aHelpText; xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText; if ( aHelpText.isEmpty() ) xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText; @@ -248,7 +248,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } // extract the descriptor - ::rtl::OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource; + OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource; sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPreparedStatement > xStatement; Reference< XResultSet > xResultSet; @@ -284,8 +284,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { // the transferable did not contain the connection -> build an own one try { - ::rtl::OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); - xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(), + OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); + xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(),OUString(), comphelper::getComponentContext( static_cast<FmGridControl*>(GetParent())->getServiceManager() )); } catch(NoSuchElementException&) @@ -336,7 +336,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) // not interested in any results Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY); - xStatProps->setPropertyValue(rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); + xStatProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0))); xResultSet = xStatement->executeQuery(); Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY); @@ -381,12 +381,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) //------------------------------------------------------------------------------ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) { - ::rtl::OUString sCommand, sFieldName,sURL; + OUString sCommand, sFieldName,sURL; sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPropertySet > xField; Reference< XConnection > xConnection; - ::rtl::OUString sDatasouce = m_pImpl->aDropData.getDataSource(); + OUString sDatasouce = m_pImpl->aDropData.getDataSource(); if ( sDatasouce.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) ) m_pImpl->aDropData[daConnectionResource] >>= sURL; m_pImpl->aDropData[daCommand] >>= sCommand; @@ -509,7 +509,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) bDateNTimeCol = nPreferedType == SID_FM_TWOFIELDS_DATE_N_TIME; sal_uInt16 nColCount = bDateNTimeCol ? 2 : 1; - ::rtl::OUString sFieldService; + OUString sFieldService; while (nColCount--) { if (bDateNTimeCol) @@ -537,10 +537,10 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) if (bDateNTimeCol) { String sTimePostfix( SVX_RES( RID_STR_POSTFIX_TIME ) ); - xCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sTimePostfix ) ) ); + xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sTimePostfix ) ) ); String sDatePostfix( SVX_RES( RID_STR_POSTFIX_DATE ) ); - xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sDatePostfix ) ) ); + xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sDatePostfix ) ) ); } else xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName)); @@ -571,9 +571,9 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) sRealName += '_'; sRealName += sPurePostfix; if (i) - xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName))); + xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName))); else - xCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName))); + xCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName))); } } else @@ -794,7 +794,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe PopupMenu* pControlMenu = rMenu.GetPopupMenu(SID_FM_CHANGECOL); delete pControlMenu; - ::rtl::OUString aFieldType; + OUString aFieldType; sal_Bool bReplace = sal_False; InspectorAction eInspectorAction = eNone; Reference< XPropertySet > xColumnToInspect; @@ -940,7 +940,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe { FormControlFactory factory( ::comphelper::getProcessServiceFactory() ); - ::rtl::OUString sLabel = factory.getDefaultUniqueName_ByComponentType( + OUString sLabel = factory.getDefaultUniqueName_ByComponentType( Reference< XNameAccess >( xCols, UNO_QUERY_THROW ), xNewCol ); xNewCol->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel ) ); xNewCol->setPropertyValue( FM_PROP_NAME, makeAny( sLabel ) ); @@ -1155,7 +1155,7 @@ void FmGridControl::DeleteSelectedRows() ::com::sun::star::util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); xTransformer->parseStrict( aUrl ); - Reference< ::com::sun::star::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, rtl::OUString(), 0); + Reference< ::com::sun::star::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, OUString(), 0); Reference< ::com::sun::star::form::XConfirmDeleteListener > xConfirm(xDispatch, UNO_QUERY); if (xConfirm.is()) { @@ -1608,7 +1608,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta Reference< ::com::sun::star::beans::XPropertySet > xCol; ::cppu::extractInterface(xCol, xColumns->getByIndex(i)); - rtl::OUString aName( + OUString aName( comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL))); aWidth = xCol->getPropertyValue(FM_PROP_WIDTH); @@ -1646,7 +1646,7 @@ void FmGridControl::InitColumnByField( DBG_ASSERT( _rxFieldsByNames == _rxFieldsByIndex, "FmGridControl::InitColumnByField: invalid container interfaces!" ); // lookup the column which belongs to the control source - ::rtl::OUString sFieldName; + OUString sFieldName; _rxColumnModel->getPropertyValue( FM_PROP_CONTROLSOURCE ) >>= sFieldName; Reference< XPropertySet > xField; _rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField; @@ -1698,13 +1698,13 @@ void FmGridControl::InitColumnByField( } // the control type is determined by the ColumnServiceName - static ::rtl::OUString s_sPropColumnServiceName( "ColumnServiceName" ); + static OUString s_sPropColumnServiceName( "ColumnServiceName" ); if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) ) return; _pColumn->setModel( _rxColumnModel ); - ::rtl::OUString sColumnServiceName; + OUString sColumnServiceName; _rxColumnModel->getPropertyValue( s_sPropColumnServiceName ) >>= sColumnServiceName; sal_Int32 nTypeId = getColumnTypeByModelName( sColumnServiceName ); @@ -1897,9 +1897,9 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const ::rtl::OUString& _sPropName) + OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const OUString& _sPropName) { - ::rtl::OUString sRetText; + OUString sRetText; if ( _pPeer && _nPosition != -1) { Reference<XIndexContainer> xIndex = _pPeer->getColumns(); @@ -1915,9 +1915,9 @@ namespace } } // Object data and state ------------------------------------------------------ -::rtl::OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_BROWSEBOX: @@ -1942,9 +1942,9 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_BROWSEBOX: diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index fba1ffcfa8d4..4211c26f7f3c 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -409,10 +409,10 @@ Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId( ) throw(Runtim // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& ServiceName) throw() +sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) throw() { ::comphelper::StringSequence aSupported = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSupported.getConstArray(); + const OUString * pArray = aSupported.getConstArray(); for( sal_Int32 i = 0; i < aSupported.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -420,17 +420,17 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw() +OUString SAL_CALL FmXGridControl::getImplementationName() throw() { - return ::rtl::OUString("com.sun.star.form.FmXGridControl"); + return OUString("com.sun.star.form.FmXGridControl"); } //------------------------------------------------------------------------------ ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw() { - Sequence< ::rtl::OUString > aServiceNames(2); + Sequence< OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; - aServiceNames[1] = ::rtl::OUString("com.sun.star.awt.UnoControl"); + aServiceNames[1] = OUString("com.sun.star.awt.UnoControl"); return aServiceNames; } @@ -449,9 +449,9 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) } //------------------------------------------------------------------------------ -::rtl::OUString FmXGridControl::GetComponentServiceName() +OUString FmXGridControl::GetComponentServiceName() { - ::rtl::OUString aName("DBGrid"); + OUString aName("DBGrid"); return aName; } @@ -501,7 +501,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException ) { if ( !mxModel.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); DBG_ASSERT(/*(0 == m_nPeerCreationLevel) && */!mbCreatingPeer, "FmXGridControl::createPeer : recursion!"); // I think this should never assert, now that we're using the base class' mbCreatingPeer in addition to @@ -791,7 +791,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString( "design" ) : ::rtl::OUString( "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? OUString( "design" ) : OUString( "alive" ); } // --- </mutex_lock> --- @@ -855,7 +855,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine } //------------------------------------------------------------------------------ -Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) @@ -982,7 +982,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun // ::com::sun::star::util::XModeSelector //------------------------------------------------------------------------------ -void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); if (!xPeer.is()) @@ -992,10 +992,10 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException ) +OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); - return xPeer.is() ? xPeer->getMode() : ::rtl::OUString(); + return xPeer.is() ? xPeer->getMode() : OUString(); } //------------------------------------------------------------------------------ @@ -1006,7 +1006,7 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXGridControl::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False; @@ -1113,9 +1113,9 @@ void FmXGridPeer::columnChanged() //------------------------------------------------------------------ namespace fmgridif { - const ::rtl::OUString getDataModeIdentifier() + const OUString getDataModeIdentifier() { - static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( "DataMode" ); + static OUString s_sDataModeIdentifier = OUString( "DataMode" ); return s_sDataModeIdentifier; } } @@ -1423,7 +1423,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type case TypeClass_STRING : { String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() ); - pReturnArray[i] <<= ::rtl::OUString(sText); + pReturnArray[i] <<= OUString(sText); } break; // everything else is requested in the DatabaseVariant @@ -1674,7 +1674,7 @@ Reference< XIndexContainer > FmXGridPeer::getColumns() throw( RuntimeException //------------------------------------------------------------------------------ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) { - static const ::rtl::OUString aPropsListenedTo[] = + static const OUString aPropsListenedTo[] = { OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY) }; @@ -1683,8 +1683,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) // before adding a listener Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); Property aPropDesc; - const ::rtl::OUString* pProps = aPropsListenedTo; - const ::rtl::OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] ); + const OUString* pProps = aPropsListenedTo; + const OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] ); for (; pProps != pPropsEnd; ++pProps) { if ( xInfo->hasPropertyByName( *pProps ) ) @@ -1701,7 +1701,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) { // the same props as in addColumnListeners ... linux has problems with global static UStrings, so // we have to do it this way .... - static ::rtl::OUString aPropsListenedTo[] = + static OUString aPropsListenedTo[] = { OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY) }; @@ -1904,7 +1904,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept } //------------------------------------------------------------------------------ -void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& Value) throw( RuntimeException ) +void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1960,12 +1960,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - ::rtl::OUString sHelpURL; + OUString sHelpURL; OSL_VERIFY( Value >>= sHelpURL ); INetURLObject aHID( sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) sHelpURL = aHID.GetURLPath(); - pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + pGrid->SetHelpId( OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { @@ -2117,7 +2117,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() } //------------------------------------------------------------------------------ -Any FmXGridPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) +Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; if (GetWindow()) @@ -2439,7 +2439,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, // ::com::sun::star::util::XModeSelector //------------------------------------------------------------------------------ -void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { if (!supportsMode(Mode)) throw NoSupportException(); @@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException } //------------------------------------------------------------------------------ -::rtl::OUString FmXGridPeer::getMode() throw( RuntimeException ) +OUString FmXGridPeer::getMode() throw( RuntimeException ) { return m_aMode; } @@ -2472,18 +2472,18 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException if (!aModes.getLength()) { aModes.realloc(2); - ::rtl::OUString* pModes = aModes.getArray(); - pModes[0] = ::rtl::OUString( "DataMode" ); - pModes[1] = ::rtl::OUString( "FilterMode" ); + OUString* pModes = aModes.getArray(); + pModes[0] = OUString( "DataMode" ); + pModes[1] = OUString( "FilterMode" ); } return aModes; } //------------------------------------------------------------------------------ -sal_Bool FmXGridPeer::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::comphelper::StringSequence aModes(getSupportedModes()); - const ::rtl::OUString* pModes = aModes.getConstArray(); + const OUString* pModes = aModes.getConstArray(); for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) @@ -2535,7 +2535,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) } //------------------------------------------------------------------------------ -Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatch > xResult; @@ -2767,7 +2767,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() static Sequence< ::com::sun::star::util::URL> aSupported; if (aSupported.getLength() == 0) { - static ::rtl::OUString sSupported[] = { + static OUString sSupported[] = { FMURL_RECORD_MOVEFIRST, FMURL_RECORD_MOVEPREV, FMURL_RECORD_MOVENEXT, @@ -2808,7 +2808,7 @@ void FmXGridPeer::UpdateDispatches() Reference< ::com::sun::star::frame::XDispatch > xNewDispatch; for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs) { - xNewDispatch = queryDispatch(*pSupportedURLs, rtl::OUString(), 0); + xNewDispatch = queryDispatch(*pSupportedURLs, OUString(), 0); if (xNewDispatch != m_pDispatchers[i]) { if (m_pDispatchers[i].is()) @@ -2851,7 +2851,7 @@ void FmXGridPeer::ConnectToDispatcher() for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs) { m_pStateCache[i] = 0; - m_pDispatchers[i] = queryDispatch(*pSupportedURLs, rtl::OUString(), 0); + m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0); if (m_pDispatchers[i].is()) { m_pDispatchers[i]->addStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 6c054e0a68f2..17b565f87fa3 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -30,7 +30,7 @@ const ::comphelper::StringSequence& getColumnTypes() static ::comphelper::StringSequence aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { - ::rtl::OUString* pNames = aColumnTypes.getArray(); + OUString* pNames = aColumnTypes.getArray(); pNames[TYPE_CHECKBOX] = FM_COL_CHECKBOX; pNames[TYPE_COMBOBOX] = FM_COL_COMBOBOX; pNames[TYPE_CURRENCYFIELD] = FM_COL_CURRENCYFIELD; @@ -49,16 +49,16 @@ const ::comphelper::StringSequence& getColumnTypes() // Vergleichen von PropertyInfo extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) { - return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond); + return ((OUString*)pFirst)->compareTo(*(OUString*)pSecond); } namespace { //------------------------------------------------------------------------------ - sal_Int32 lcl_findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList) + sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList) { - const ::rtl::OUString* pStrList = rList.getConstArray(); - ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString), + const OUString* pStrList = rList.getConstArray(); + OUString* pResult = (OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(OUString), &NameCompare); if (pResult) @@ -69,10 +69,10 @@ namespace } //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) +sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { - const ::rtl::OUString aModelPrefix("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix("stardiv.one.form.component."); + const OUString aModelPrefix("com.sun.star.form.component."); + const OUString aCompatibleModelPrefix("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FM_COMPONENT_EDIT) @@ -85,7 +85,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); #endif - ::rtl::OUString aColumnType = (nPrefixPos != -1) + OUString aColumnType = (nPrefixPos != -1) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index ff983b6b894d..7dac3c29f184 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -397,7 +397,7 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT))); m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT))); - m_aRecordCount.SetText(rtl::OUString('?')); + m_aRecordCount.SetText(OUString('?')); m_nDefaultWidth = ArrangeControls(); @@ -473,9 +473,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width()); // count an extra hairspace (U+200A) left and right - const rtl::OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000)); - const rtl::OUString hairSpace(static_cast<sal_Unicode>(0x200A)); - rtl::OUString textPattern(hairSpace); + const OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000)); + const OUString hairSpace(static_cast<sal_Unicode>(0x200A)); + OUString textPattern(hairSpace); textPattern += sevenDigits; textPattern += hairSpace; nTextWidth = m_aAbsolute.GetTextWidth( textPattern ); @@ -695,7 +695,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) else aText = m_aAbsolute.CreateFieldText(pParent->GetRowCount()); if(!pParent->m_bRecordCountFinal) - aText += rtl::OUString(" *"); + aText += OUString(" *"); } else aText = String(); @@ -1455,7 +1455,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // retrieve the datebase of the Numberformatter try { - xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString("NullDate")) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= m_aNullDate; } catch(Exception&) { @@ -3488,7 +3488,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) DeactivateCell(); - ::rtl::OUString aName; + OUString aName; pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName; InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos); pColumn->m_bHidden = sal_False; diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 14976d972f97..fecc0e6f158f 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -48,7 +48,7 @@ namespace svx const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SOT_FORMATSTR_ID_XFORMS == nFormatId ) { - return SetString(rtl::OUString("XForms-Transferable"), _rFlavor); + return SetString(OUString("XForms-Transferable"), _rFlavor); } return sal_False; } diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index db849212bdb4..49017c41acef 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -59,7 +59,7 @@ OSystemParseContext::~OSystemParseContext() } //----------------------------------------------------------------------------- -::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const +OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const { String aMsg; SolarMutexGuard aGuard; @@ -83,7 +83,7 @@ OSystemParseContext::~OSystemParseContext() } //----------------------------------------------------------------------------- -::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const +OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const { size_t nIndex = 0; switch ( _eKey ) @@ -119,14 +119,14 @@ OSystemParseContext::~OSystemParseContext() OSL_ENSURE( nIndex < m_aLocalizedKeywords.size(), "OSystemParseContext::getIntlKeywordAscii: invalid index!" ); - rtl::OString sKeyword; + OString sKeyword; if ( nIndex < m_aLocalizedKeywords.size() ) - sKeyword = rtl::OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8); + sKeyword = OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8); return sKeyword; } // ----------------------------------------------------------------------------- -IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const +IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OString& rToken) const { static IParseContext::InternationalKeyCode Intl_TokenID[] = { @@ -142,7 +142,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const :: sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0]; for (sal_uInt32 i = 0; i < nCount; i++) { - ::rtl::OString aKey = getIntlKeywordAscii(Intl_TokenID[i]); + OString aKey = getIntlKeywordAscii(Intl_TokenID[i]); if (rToken.equalsIgnoreAsciiCase(aKey)) return Intl_TokenID[i]; } diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index cc0148df4122..d9cd76a98d0b 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -55,7 +55,7 @@ namespace svx Sequence< PropertyValue > m_aAsSequence; Reference< XPropertySet > m_xAsSet; - typedef ::std::map< ::rtl::OUString, PropertyMapEntry* > MapString2PropertyEntry; + typedef ::std::map< OUString, PropertyMapEntry* > MapString2PropertyEntry; public: ODADescriptorImpl(); @@ -193,16 +193,16 @@ namespace svx { CONST_CHAR("ActiveConnection"), daConnection, &::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("BookmarkSelection"), daBookmarkSelection, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Column"), daColumnObject, &::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("CommandType"), daCommandType, &::getCppuType( static_cast< sal_Int32* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Component"), daComponent, &::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Cursor"), daCursor, &::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("EscapeProcessing"), daEscapeProcessing, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Selection"), daSelection, &::getCppuType( static_cast< Sequence< Any >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -210,7 +210,7 @@ namespace svx PropertyMapEntry* pEntry = s_aDesriptorProperties; while ( pEntry->mpName ) { - s_aProperties[ ::rtl::OUString::createFromAscii( pEntry->mpName ) ] = pEntry; + s_aProperties[ OUString::createFromAscii( pEntry->mpName ) ] = pEntry; ++pEntry; } } @@ -244,7 +244,7 @@ namespace svx // build the property value PropertyValue aReturn; - aReturn.Name = ::rtl::OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US ); + aReturn.Name = OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US ); aReturn.Handle = pProperty->mnHandle; aReturn.Value = _rPos->second; aReturn.State = PropertyState_DIRECT_VALUE; @@ -387,9 +387,9 @@ namespace svx } //-------------------------------------------------------------------- - ::rtl::OUString ODataAccessDescriptor::getDataSource() const + OUString ODataAccessDescriptor::getDataSource() const { - ::rtl::OUString sDataSourceName; + OUString sDataSourceName; if ( has(daDataSource) ) (*this)[daDataSource] >>= sDataSourceName; else if ( has(daDatabaseLocation) ) @@ -397,7 +397,7 @@ namespace svx return sDataSourceName; } //-------------------------------------------------------------------- - void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation) + void ODataAccessDescriptor::setDataSource(const OUString& _sDataSourceNameOrLocation) { if ( !_sDataSourceNameOrLocation.isEmpty() ) { @@ -405,7 +405,7 @@ namespace svx (*this)[ (( aURL.GetProtocol() == INET_PROT_FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation; } else - (*this)[ daDataSource ] <<= ::rtl::OUString(); + (*this)[ daDataSource ] <<= OUString(); } //........................................................................ diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 36b1a7abdc05..1fb0127e80a0 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -79,8 +79,8 @@ namespace svx const ::comphelper::ComponentContext m_aContext; ::svt::OFileURLControl& m_rLocationInput; PushButton& m_rBrowseButton; - Sequence< ::rtl::OUString > m_aFilterExtensions; - ::rtl::OUString m_sFilterUIName; + Sequence< OUString > m_aFilterExtensions; + OUString m_sFilterUIName; bool m_bNeedExistenceCheck; }; @@ -97,8 +97,8 @@ namespace svx impl_initFilterProperties_nothrow(); // forward the allowed extensions to the input control - ::rtl::OUStringBuffer aExtensionList; - for ( const ::rtl::OUString* pExtension = m_aFilterExtensions.getConstArray(); + OUStringBuffer aExtensionList; + for ( const OUString* pExtension = m_aFilterExtensions.getConstArray(); pExtension != m_aFilterExtensions.getConstArray() + m_aFilterExtensions.getLength(); ++pExtension ) @@ -122,7 +122,7 @@ namespace svx //-------------------------------------------------------------------- bool DatabaseLocationInputController_Impl::prepareCommit() { - ::rtl::OUString sURL( impl_getCurrentURL() ); + OUString sURL( impl_getCurrentURL() ); if ( sURL.isEmpty() ) return false; @@ -162,9 +162,9 @@ namespace svx ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_aContext.getUNOContext(), - ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) + OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) ); - ::rtl::OUString sDatabaseFilter; + OUString sDatabaseFilter; OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter ); // get the type this filter is responsible for @@ -172,7 +172,7 @@ namespace svx m_aContext.createComponent( "com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW ); ::comphelper::NamedValueCollection aFilterProperties( xFilterFactory->getByName( sDatabaseFilter ) ); - ::rtl::OUString sDocumentType = aFilterProperties.getOrDefault( "Type", ::rtl::OUString() ); + OUString sDocumentType = aFilterProperties.getOrDefault( "Type", OUString() ); // get the extension(s) for this type Reference< XNameAccess > xTypeDetection( @@ -194,7 +194,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = ::rtl::OUString( "*.odb" ); + m_aFilterExtensions[0] = OUString( "*.odb" ); } } @@ -240,7 +240,7 @@ namespace svx ); aFileDlg.SetDisplayDirectory( impl_getCurrentURL() ); - aFileDlg.AddFilter( m_sFilterUIName, ::rtl::OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() ); + aFileDlg.AddFilter( m_sFilterUIName, OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() ); aFileDlg.SetCurrentFilter( m_sFilterUIName ); if ( aFileDlg.Execute() == ERRCODE_NONE ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c48dbbf42615..82e46e711212 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -383,7 +383,7 @@ namespace svxform aExpImg = aCollImg = _rImgLst.GetImage( IID_OTHER ); } - ::rtl::OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); + OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); if ( !sName.isEmpty() ) { ItemNode* pNode = new ItemNode( xChild ); @@ -400,7 +400,7 @@ namespace svxform { Reference< css::xml::dom::XNode > xAttr = xMap->item(j); pNode = new ItemNode( xAttr ); - ::rtl::OUString sAttrName = + OUString sAttrName = m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails ); m_aItemList.InsertEntry( sAttrName, aExpImg, aCollImg, @@ -686,7 +686,7 @@ namespace svxform try { String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - ::rtl::OUString sTemp; + OUString sTemp; pNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sNewName += String( sTemp ); sNewName += sDelim; @@ -755,7 +755,7 @@ namespace svxform const ImageList& rImageList = m_pNaviWin->GetItemImageList(); sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); - ::rtl::OUString sName; + OUString sName; try { sName = m_xUIHelper->getNodeDisplayName( @@ -814,13 +814,13 @@ namespace svxform class lcl_ReplaceString : public lcl_ResourceString { - rtl::OUString m_sDoc_UI; - rtl::OUString m_sInstance_UI; - rtl::OUString m_sNone_UI; + OUString m_sDoc_UI; + OUString m_sInstance_UI; + OUString m_sNone_UI; - rtl::OUString m_sDoc_API; - rtl::OUString m_sInstance_API; - rtl::OUString m_sNone_API; + OUString m_sDoc_API; + OUString m_sInstance_API; + OUString m_sNone_API; lcl_ReplaceString() : lcl_ResourceString(), @@ -862,7 +862,7 @@ namespace svxform /** convert submission replace string from API value to UI value. Use 'none' as default. */ - rtl::OUString toUI( const rtl::OUString& rStr ) const + OUString toUI( const OUString& rStr ) const { if( rStr == m_sDoc_API ) return m_sDoc_UI; @@ -874,7 +874,7 @@ namespace svxform /** convert submission replace string from UI to API. Use 'none' as default. */ - rtl::OUString toAPI( const rtl::OUString& rStr ) const + OUString toAPI( const OUString& rStr ) const { if( rStr == m_sDoc_UI ) return m_sDoc_API; @@ -887,13 +887,13 @@ namespace svxform class lcl_MethodString : public lcl_ResourceString { - rtl::OUString m_sPost_UI; - rtl::OUString m_sPut_UI; - rtl::OUString m_sGet_UI; + OUString m_sPost_UI; + OUString m_sPut_UI; + OUString m_sGet_UI; - rtl::OUString m_sPost_API; - rtl::OUString m_sPut_API; - rtl::OUString m_sGet_API; + OUString m_sPost_API; + OUString m_sPut_API; + OUString m_sGet_API; lcl_MethodString() : lcl_ResourceString(), @@ -932,7 +932,7 @@ namespace svxform } /** convert from API to UI; put is default. */ - rtl::OUString toUI( const rtl::OUString& rStr ) const + OUString toUI( const OUString& rStr ) const { if( rStr == m_sGet_API ) return m_sGet_UI; @@ -943,7 +943,7 @@ namespace svxform } /** convert from UI to API; put is default */ - rtl::OUString toAPI( const rtl::OUString& rStr ) const + OUString toAPI( const OUString& rStr ) const { if( rStr == m_sGet_UI ) return m_sGet_API; @@ -962,7 +962,7 @@ namespace svxform Image aImage = rImageList.GetImage( IID_ELEMENT ); ItemNode* pNode = new ItemNode( _rEntry ); - rtl::OUString sTemp; + OUString sTemp; if ( DGTSubmission == m_eGroup ) { @@ -1007,7 +1007,7 @@ namespace svxform try { String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - ::rtl::OUString sName; + OUString sName; _rEntry->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sName += String( sTemp ); sName += sDelim; @@ -1029,7 +1029,7 @@ namespace svxform void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = NULL; - rtl::OUString sTemp; + OUString sTemp; if ( DGTSubmission == m_eGroup ) { @@ -1319,7 +1319,7 @@ namespace svxform if ( aAny >>= xPropSet ) { String sEntry; - rtl::OUString sTemp; + OUString sTemp; xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sEntry += String( sTemp ); sEntry += sDelim; @@ -1360,10 +1360,10 @@ namespace svxform const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst ) { String sRet; - rtl::OUString sTemp; - rtl::OUString sInstModel = PN_INSTANCE_MODEL; - rtl::OUString sInstName = PN_INSTANCE_ID; - rtl::OUString sInstURL = PN_INSTANCE_URL; + OUString sTemp; + OUString sInstModel = PN_INSTANCE_MODEL; + OUString sInstName = PN_INSTANCE_ID; + OUString sInstURL = PN_INSTANCE_URL; const PropertyValue* pProps = _xPropSeq.getConstArray(); const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength(); for ( ; pProps != pPropsEnd; ++pProps ) @@ -1382,7 +1382,7 @@ namespace svxform #if OSL_DEBUG_LEVEL > 0 css::xml::dom::NodeType eNodeType = xRoot->getNodeType(); (void)eNodeType; #endif - ::rtl::OUString sNodeName = + OUString sNodeName = m_xUIHelper->getNodeDisplayName( xRoot, m_pNaviWin->IsShowDetails() ); if ( sNodeName.isEmpty() ) sNodeName = xRoot->getNodeName(); @@ -1631,7 +1631,7 @@ namespace svxform bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos(); - ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); + OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); Reference< css::xforms::XModel > xModel; try { @@ -1683,7 +1683,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( "ExternalData" ), + OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); @@ -1713,7 +1713,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); sal_Bool bExternalData = sal_False; OSL_VERIFY( xModelProps->getPropertyValue( - ::rtl::OUString( "ExternalData" ) ) >>= bExternalData ); + OUString( "ExternalData" ) ) >>= bExternalData ); bDocumentData = ( bExternalData == sal_False ); } catch( const Exception& ) @@ -1733,7 +1733,7 @@ namespace svxform Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW ); Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( "ExternalData" ), + OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); bIsDocModified = true; } @@ -1804,8 +1804,8 @@ namespace svxform if ( aDlg.Execute() == RET_OK ) { sal_uInt16 nInst = GetNewPageId(); - ::rtl::OUString sName = aDlg.GetName(); - ::rtl::OUString sURL = aDlg.GetURL(); + OUString sName = aDlg.GetName(); + OUString sURL = aDlg.GetURL(); bool bLinkOnce = aDlg.IsLinkInstance(); try { @@ -1841,7 +1841,7 @@ namespace svxform if ( aDlg.Execute() == RET_OK ) { String sNewName = aDlg.GetName(); - ::rtl::OUString sURL = aDlg.GetURL(); + OUString sURL = aDlg.GetURL(); bool bLinkOnce = aDlg.IsLinkInstance(); try { @@ -2061,9 +2061,9 @@ namespace svxform if ( xContainer.is() ) { m_xDataContainer = xContainer; - Sequence< ::rtl::OUString > aNameList = m_xDataContainer->getElementNames(); + Sequence< OUString > aNameList = m_xDataContainer->getElementNames(); sal_Int32 i, nCount = aNameList.getLength(); - ::rtl::OUString* pNames = aNameList.getArray(); + OUString* pNames = aNameList.getArray(); for ( i = 0; i < nCount; ++i ) { Any aAny = m_xDataContainer->getByName( pNames[i] ); @@ -2089,7 +2089,7 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::SetPageModel() { - rtl::OUString sModel( m_aModelsBox.GetSelectEntry() ); + OUString sModel( m_aModelsBox.GetSelectEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2122,7 +2122,7 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::InitPages() { - rtl::OUString sModel( m_aModelsBox.GetSelectEntry() ); + OUString sModel( m_aModelsBox.GetSelectEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2197,8 +2197,8 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::CreateInstancePage( const Sequence< PropertyValue >& _xPropSeq ) { - rtl::OUString sInstName; - rtl::OUString sID( PN_INSTANCE_ID ); + OUString sInstName; + OUString sID( PN_INSTANCE_ID ); const PropertyValue* pProps = _xPropSeq.getConstArray(); const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength(); for ( ; pProps != pPropsEnd; ++pProps ) @@ -2214,7 +2214,7 @@ namespace svxform if ( sInstName.isEmpty() ) { SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" ); - String sTemp = rtl::OUString("untitled"); + String sTemp = OUString("untitled"); sTemp += OUString::number( nPageId ); sInstName = sTemp; } @@ -2555,7 +2555,7 @@ namespace svxform if ( pBox && m_xTempBinding.is() ) { - ::rtl::OUString sTemp, sPropName; + OUString sTemp, sPropName; if ( &m_aRequiredCB == pBox ) sPropName = PN_REQUIRED_EXPR; else if ( &m_aRelevantCB == pBox ) @@ -2571,7 +2571,7 @@ namespace svxform if ( bIsChecked && sTemp.isEmpty() ) sTemp = TRUE_VALUE; else if ( !bIsChecked && !sTemp.isEmpty() ) - sTemp = ::rtl::OUString(); + sTemp = OUString(); m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) ); } @@ -2581,7 +2581,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn ) { - ::rtl::OUString sTemp, sPropName; + OUString sTemp, sPropName; if ( &m_aDefaultBtn == pBtn ) sPropName = PN_BINDING_EXPR; else if ( &m_aRequiredBtn == pBtn ) @@ -2617,7 +2617,7 @@ namespace svxform { m_xTempBinding->setPropertyValue( - sPropName, makeAny( ::rtl::OUString( sNewCondition ) ) ); + sPropName, makeAny( OUString( sNewCondition ) ) ); } } return 0; @@ -2637,7 +2637,7 @@ namespace svxform Reference< XPropertySetInfo > xFromInfo = xFrom->getPropertySetInfo(); for ( sal_Int32 i = 0; i < nProperties; ++i ) { - const ::rtl::OUString& rName = pProperties[i].Name; + const OUString& rName = pProperties[i].Name; // if both set have the property, copy the value // (catch and ignore exceptions, if any) @@ -2662,7 +2662,7 @@ namespace svxform { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); - ::rtl::OUString sNewName( m_aNameED.GetText() ); + OUString sNewName( m_aNameED.GetText() ); if ( ( !bIsHandleBinding && !bIsHandleText && !m_xUIHelper->isValidXMLName( sNewName ) ) || ( bIsHandleBinding && sNewName.isEmpty() ) ) @@ -2676,7 +2676,7 @@ namespace svxform return 0; } - ::rtl::OUString sDataType( m_aDataTypeLB.GetSelectEntry() ); + OUString sDataType( m_aDataTypeLB.GetSelectEntry() ); m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) ); if ( bIsHandleBinding ) @@ -2685,7 +2685,7 @@ namespace svxform copyPropSet( m_xTempBinding, m_pItemNode->m_xPropSet ); try { - ::rtl::OUString sValue = m_aNameED.GetText(); + OUString sValue = m_aNameED.GetText(); m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID, makeAny( sValue ) ); sValue = m_aDefaultED.GetText(); m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR, makeAny( sValue ) ); @@ -2792,7 +2792,7 @@ namespace svxform if ( m_eItemType != DITText ) { - ::rtl::OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) ); + OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) ); m_aNameED.SetText( sName ); } m_aDefaultED.SetText( m_pItemNode->m_xNode->getNodeValue() ); @@ -2820,7 +2820,7 @@ namespace svxform SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" ); } } - rtl::OUString sTemp; + OUString sTemp; try { Reference< XPropertySetInfo > xInfo = m_pItemNode->m_xPropSet->getPropertySetInfo(); @@ -2853,7 +2853,7 @@ namespace svxform if ( m_xTempBinding.is() ) { - ::rtl::OUString sTemp; + OUString sTemp; try { if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp ) @@ -2928,16 +2928,16 @@ namespace svxform xModel->getDataTypeRepository(); if ( xDataTypes.is() ) { - Sequence< ::rtl::OUString > aNameList = xDataTypes->getElementNames(); + Sequence< OUString > aNameList = xDataTypes->getElementNames(); sal_Int32 i, nCount = aNameList.getLength(); - ::rtl::OUString* pNames = aNameList.getArray(); + OUString* pNames = aNameList.getArray(); for ( i = 0; i < nCount; ++i ) m_aDataTypeLB.InsertEntry( pNames[i] ); } if ( m_xTempBinding.is() ) { - rtl::OUString sTemp; + OUString sTemp; if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp ) { sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) ); @@ -2988,7 +2988,7 @@ namespace svxform //======================================================================== AddConditionDialog::AddConditionDialog( - Window* pParent, const ::rtl::OUString& _rPropertyName, + Window* pParent, const OUString& _rPropertyName, const Reference< XPropertySet >& _rPropSet ) : ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_CONDITION ) ), @@ -3022,7 +3022,7 @@ namespace svxform { try { - rtl::OUString sTemp; + OUString sTemp; if ( ( m_xBinding->getPropertyValue( m_sPropertyName ) >>= sTemp ) && !sTemp.isEmpty() ) { @@ -3085,7 +3085,7 @@ namespace svxform try { if ( m_xBinding.is() ) - m_xBinding->setPropertyValue( m_sPropertyName, makeAny( ::rtl::OUString( m_aConditionED.GetText() ) ) ); + m_xBinding->setPropertyValue( m_sPropertyName, makeAny( OUString( m_aConditionED.GetText() ) ) ); } catch( const Exception& ) { @@ -3220,7 +3220,7 @@ namespace svxform { SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); - ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); + OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); m_aRemovedList.push_back( sPrefix ); m_aNamespacesList.GetModel()->Remove( pEntry ); } @@ -3247,8 +3247,8 @@ namespace svxform for( i = 0; i < nEntryCount; ++i ) { SvTreeListEntry* pEntry = m_aNamespacesList.GetEntry(i); - ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); - ::rtl::OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) ); + OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); + OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) ); if ( m_rNamespaces->hasByName( sPrefix ) ) m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) ); @@ -3270,13 +3270,13 @@ namespace svxform { try { - Sequence< ::rtl::OUString > aAllNames = m_rNamespaces->getElementNames(); - const ::rtl::OUString* pAllNames = aAllNames.getConstArray(); - const ::rtl::OUString* pAllNamesEnd = pAllNames + aAllNames.getLength(); + Sequence< OUString > aAllNames = m_rNamespaces->getElementNames(); + const OUString* pAllNames = aAllNames.getConstArray(); + const OUString* pAllNamesEnd = pAllNames + aAllNames.getLength(); for ( ; pAllNames != pAllNamesEnd; ++pAllNames ) { - ::rtl::OUString sURL; - ::rtl::OUString sPrefix = *pAllNames; + OUString sURL; + OUString sPrefix = *pAllNames; if ( m_rNamespaces->hasByName( sPrefix ) ) { Any aAny = m_rNamespaces->getByName( sPrefix ); @@ -3422,7 +3422,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl) { - rtl::OUString sName(m_aNameED.GetText()); + OUString sName(m_aNameED.GetText()); if(sName.isEmpty()) { ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME)); @@ -3454,7 +3454,7 @@ namespace svxform if ( m_xSubmission.is() ) { - rtl::OUString sTemp = m_aNameED.GetText(); + OUString sTemp = m_aNameED.GetText(); try { m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny( sTemp ) ); @@ -3510,7 +3510,7 @@ namespace svxform if ( aAny >>= xPropSet ) { String sEntry; - rtl::OUString sTemp; + OUString sTemp; xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sEntry += String( sTemp ); sEntry += sDelim; @@ -3553,7 +3553,7 @@ namespace svxform if ( m_pItemNode && m_pItemNode->m_xPropSet.is() ) { m_xSubmission = m_pItemNode->m_xPropSet; - rtl::OUString sTemp; + OUString sTemp; try { m_xSubmission->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index aab897135bb1..e28da50ab4b3 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -116,7 +116,7 @@ namespace svxform OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!"); #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName( SVLIBRARY( "dbtools" ) + const OUString sModuleName( SVLIBRARY( "dbtools" ) ); // load the dbtools library @@ -126,7 +126,7 @@ namespace svxform if (NULL != s_hDbtoolsModule) { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc( "createDataAccessToolsFactory" ); + const OUString sFactoryCreationFunc( "createDataAccessToolsFactory" ); // reinterpret_cast<createDataAccessToolsFactoryFunction> s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)( osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData)); @@ -198,8 +198,8 @@ namespace svxform } //-------------------------------------------------------------------- - Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const + Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName, + const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) ) { Reference< XConnection > xReturn; @@ -237,25 +237,25 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString OStaticDataAccessTools::quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) const + OUString OStaticDataAccessTools::quoteName(const OUString& _rQuote, const OUString& _rName) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xDataAccessTools->quoteName(_rQuote, _rName); return sReturn; } // ------------------------------------------------ - ::rtl::OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const + OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xDataAccessTools->composeTableNameForSelect( _rxConnection, _xTable ); return sReturn; } //---------------------------------------------------------------- - Reference< XDataSource > OStaticDataAccessTools::getDataSource( const ::rtl::OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const + Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const { Reference< XDataSource > xReturn; if ( ensureLoaded() ) @@ -283,7 +283,7 @@ namespace svxform //---------------------------------------------------------------- Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, + const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { Reference< XNameAccess > aFields; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2a2b0eb3fb10..3e36b09792cd 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -124,7 +124,7 @@ sal_uInt32 OFilterItemExchange::getFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!"); } return s_nFormat; @@ -204,8 +204,8 @@ TYPEINIT1(FmFilterItem, FmFilterData); //------------------------------------------------------------------------ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory, FmFilterItems* pParent, - const ::rtl::OUString& aFieldName, - const ::rtl::OUString& aText, + const OUString& aFieldName, + const OUString& aText, const sal_Int32 _nComponentIndex ) :FmFilterData(_rxFactory,pParent, aText) ,m_aFieldName(aFieldName) @@ -321,7 +321,7 @@ public: void setText(sal_Int32 nPos, const FmFilterItem* pFilterItem, - const ::rtl::OUString& rText); + const OUString& rText); }; //------------------------------------------------------------------------ @@ -364,7 +364,7 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC //------------------------------------------------------------------------ void FmFilterAdapter::setText(sal_Int32 nRowPos, const FmFilterItem* pFilterItem, - const ::rtl::OUString& rText) + const OUString& rText) { FmFormItem* pFormItem = PTR_CAST( FmFormItem, pFilterItem->GetParent()->GetParent() ); @@ -389,9 +389,9 @@ void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( Runtim //------------------------------------------------------------------------ namespace { - ::rtl::OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl ) + OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl ) { - ::rtl::OUString sLabelName; + OUString sLabelName; try { Reference< XControl > xControl( _rxControl, UNO_SET_THROW ); @@ -463,7 +463,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th else { // searching the component by field name - ::rtl::OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) ); + OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) ); pFilterItem = new FmFilterItem( m_pModel->getORB(), pFilter, aFieldName, _Event.PredicateExpression, _Event.FilterComponent ); m_pModel->Insert(pFilter->GetChildren().end(), pFilterItem); @@ -542,7 +542,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) TYPEINIT1(FmFilterModel, FmParentData); //------------------------------------------------------------------------ FmFilterModel::FmFilterModel(const Reference< XMultiServiceFactory >& _rxFactory) - :FmParentData(_rxFactory,NULL, ::rtl::OUString()) + :FmParentData(_rxFactory,NULL, OUString()) ,OSQLParserClient(comphelper::getComponentContext(_rxFactory)) ,m_xORB(_rxFactory) ,m_pAdapter(NULL) @@ -626,7 +626,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar Reference< XFormController > xController( xControllers->getByIndex(i), UNO_QUERY_THROW ); Reference< XPropertySet > xFormProperties( xController->getModel(), UNO_QUERY_THROW ); - ::rtl::OUString aName; + OUString aName; OSL_VERIFY( xFormProperties->getPropertyValue( FM_PROP_NAME ) >>= aName ); // Insert a new item for the form @@ -638,8 +638,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar // insert the existing filters for the form String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ); - Sequence< Sequence< ::rtl::OUString > > aExpressions = xFilterController->getPredicateExpressions(); - for ( const Sequence< ::rtl::OUString >* pConjunctionTerm = aExpressions.getConstArray(); + Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions(); + for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray(); pConjunctionTerm != aExpressions.getConstArray() + aExpressions.getLength(); ++pConjunctionTerm ) @@ -648,8 +648,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar FmFilterItems* pFilterItems = new FmFilterItems( m_xORB, pFormItem, aTitle ); Insert( pFormItem->GetChildren().end(), pFilterItems ); - const Sequence< ::rtl::OUString >& rDisjunction( *pConjunctionTerm ); - for ( const ::rtl::OUString* pDisjunctiveTerm = rDisjunction.getConstArray(); + const Sequence< OUString >& rDisjunction( *pConjunctionTerm ); + for ( const OUString* pDisjunctiveTerm = rDisjunction.getConstArray(); pDisjunctiveTerm != rDisjunction.getConstArray() + rDisjunction.getLength(); ++pDisjunctiveTerm ) @@ -662,7 +662,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar // determine the display name of the control const Reference< XControl > xFilterControl( xFilterController->getFilterComponent( nComponentIndex ) ); - const ::rtl::OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) ); + const OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) ); // insert a new entry FmFilterItem* pANDCondition = new FmFilterItem( m_xORB, pFilterItems, sDisplayName, *pDisjunctiveTerm, nComponentIndex ); @@ -823,7 +823,7 @@ void FmFilterModel::Remove(FmFilterData* pData) { ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1; FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos ); - m_pAdapter->setText( nPos, pFilterItem, ::rtl::OUString() ); + m_pAdapter->setText( nPos, pFilterItem, OUString() ); Remove( removePos ); } } @@ -853,7 +853,7 @@ void FmFilterModel::Remove(FmFilterData* pData) sal_Int32 nParentPos = j - rParentParentItems.begin(); // EmptyText removes the filter - m_pAdapter->setText(nParentPos, pFilterItem, ::rtl::OUString()); + m_pAdapter->setText(nParentPos, pFilterItem, OUString()); Remove( i ); } } @@ -896,13 +896,13 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr Reference< XPropertySet > xField( lcl_getBoundField_nothrow( xFilterController->getFilterComponent( pItem->GetComponentIndex() ) ), UNO_SET_THROW ); // parse the given text as filter predicate - ::rtl::OUString aErr, aTxt( rText ); + OUString aErr, aTxt( rText ); ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( aErr, aTxt, xFormatter, xField ); rErrorMsg = aErr; rText = aTxt; if ( xParseNode.is() ) { - ::rtl::OUString aPreparedText; + OUString aPreparedText; Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); xParseNode->parseNodeToPredicateStr( aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() ); @@ -925,7 +925,7 @@ void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem) } //------------------------------------------------------------------------ -void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText) +void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) { ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChildren(); ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent()); @@ -1217,7 +1217,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rS } //------------------------------------------------------------------------ -sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); m_pEditingCurrently = NULL; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 2832b4047d30..c18e01056a25 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -106,7 +106,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::svxform; -::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) +OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { sal_uInt16 nClassNameResourceId = 0; @@ -182,7 +182,7 @@ using namespace ::svxform; nClassNameResourceId = RID_STR_CONTROL; break; } - return ::rtl::OUString( String( SVX_RES( nClassNameResourceId ) ) ); + return OUString( String( SVX_RES( nClassNameResourceId ) ) ); } //======================================================================== @@ -208,7 +208,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame") ), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(OUString("com.sun.star.frame.Frame") ), UNO_QUERY); if (m_xMeAsFrame.is()) { // create an intermediate window, which is to be the container window of the frame @@ -221,7 +221,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); m_xMeAsFrame->initialize( m_xFrameContainerWindow ); - m_xMeAsFrame->setName(::rtl::OUString("form property browser") ); + m_xMeAsFrame->setName(OUString("form property browser") ); if ( _pBindings->GetDispatcher() ) { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > @@ -282,10 +282,10 @@ FmPropBrw::~FmPropBrw() Reference<XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) - , ::rtl::OUString( "DialogParentWindow" ) - , ::rtl::OUString( "ControlContext" ) - , ::rtl::OUString( "ControlShapeAccess" ) }; + const OUString pProps[] = { OUString( "ContextDocument" ) + , OUString( "DialogParentWindow" ) + , OUString( "ControlContext" ) + , OUString( "ControlShapeAccess" ) }; for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i ) xName->removeByName( pProps[i] ); } @@ -298,9 +298,9 @@ FmPropBrw::~FmPropBrw() } //----------------------------------------------------------------------- -::rtl::OUString FmPropBrw::getCurrentPage() const +OUString FmPropBrw::getCurrentPage() const { - ::rtl::OUString sCurrentPage; + OUString sCurrentPage; try { if ( m_xBrowserController.is() ) @@ -512,8 +512,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ); - const ::rtl::OUString sPropertyName( "DirectHelp" ); + const OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ); + const OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -564,10 +564,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlContext" ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( OUString( "ControlContext" ), makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -589,7 +589,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) if ( !m_xBrowserController.is() ) { - ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); + OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True ); } else diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index aaaaf3adb1d0..df4a49bbeaaf 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -414,7 +414,7 @@ namespace svxform // update the explanation for invalidity (this is always done, even if the validity did not change) Reference< XValidator > xValidator = _rxValidatable->getValidator(); OSL_ENSURE( xValidator.is(), "ControlBorderManager::validityChanged: invalid, but no validator?" ); - ::rtl::OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : ::rtl::OUString(); + OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : OUString(); xPeer->setProperty( FM_PROP_HELPTEXT, makeAny( sExplainInvalidity ) ); } catch( const Exception& ) diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index a630f5b580b7..87a69ac93420 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -91,30 +91,30 @@ namespace svxform } //.................................................................... - static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, ::rtl::OUString& _rFamilyName, ::rtl::OUString& _rStyleName ) SAL_THROW(( Exception )) + static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName ) SAL_THROW(( Exception )) { bool bSuccess = true; Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY ); if ( xDocumentSI.is() ) { - if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.TextDocument" ) ) - || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.WebDocument" ) ) + if ( xDocumentSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) ) + || xDocumentSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "ParagraphStyles" ); - _rStyleName = ::rtl::OUString( "Standard" ); + _rFamilyName = OUString( "ParagraphStyles" ); + _rStyleName = OUString( "Standard" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) + else if ( xDocumentSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "CellStyles" ); - _rStyleName = ::rtl::OUString( "Default" ); + _rFamilyName = OUString( "CellStyles" ); + _rStyleName = OUString( "Default" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ) ) - || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ) ) + else if ( xDocumentSI->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) ) + || xDocumentSI->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "graphics" ); - _rStyleName = ::rtl::OUString( "standard" ); + _rFamilyName = OUString( "graphics" ); + _rStyleName = OUString( "standard" ); } else bSuccess = false; @@ -154,7 +154,7 @@ namespace svxform break; } - ::rtl::OUString sCharLocalePropertyName = ::rtl::OUString::createFromAscii( pCharLocalePropertyName ); + OUString sCharLocalePropertyName = OUString::createFromAscii( pCharLocalePropertyName ); Locale aDocumentCharLocale; if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { @@ -163,7 +163,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = ::rtl::OUString( "CharLocale" ); + sCharLocalePropertyName = OUString( "CharLocale" ); if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -179,7 +179,7 @@ namespace svxform Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel->setPropertyValue( - ::rtl::OUString( "FontDescriptor" ), + OUString( "FontDescriptor" ), makeAny( aFontDesc ) ); } @@ -201,9 +201,9 @@ namespace svxform Reference< XNameAccess > xStyleFamilies( xSuppStyleFamilies->getStyleFamilies(), UNO_SET_THROW ); // the names of the family, and the style - depends on the document type we live in - ::rtl::OUString sFamilyName, sStyleName; + OUString sFamilyName, sStyleName; if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) ) - throw RuntimeException( ::rtl::OUString( "unknown document type!" ), NULL ); + throw RuntimeException( OUString( "unknown document type!" ), NULL ); // the concrete style Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); @@ -231,10 +231,10 @@ namespace svxform // let's see what the configuration says about the visual effect OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( "VisualEffect" ) ); + Any aVisualEffect = aConfig.getNodeValue( OUString( "VisualEffect" ) ); if ( aVisualEffect.hasValue() ) { - ::rtl::OUString sVisualEffect; + OUString sVisualEffect; OSL_VERIFY( aVisualEffect >>= sVisualEffect ); sal_Int16 nVisualEffect = VisualEffect::NONE; @@ -282,7 +282,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - ::rtl::OUString sConfigName = ::rtl::OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); + OUString sConfigName = OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO @@ -293,7 +293,7 @@ namespace svxform bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType ) { OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( "DynamicBorderColors" ) ); + Any aDynamicBorderColor = aConfig.getNodeValue( OUString( "DynamicBorderColors" ) ); bool bDynamicBorderColor = false; OSL_VERIFY( aDynamicBorderColor >>= bDynamicBorderColor ); return bDynamicBorderColor; @@ -305,7 +305,7 @@ namespace svxform if ( _eDocType == eUnknownDocumentType ) return false; OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( "UseDocumentTextMetrics" ) ); + Any aUseRefDevice = aConfig.getNodeValue( OUString( "UseDocumentTextMetrics" ) ); bool bUseRefDevice = false; OSL_VERIFY( aUseRefDevice >>= bUseRefDevice ); return bUseRefDevice; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index ba26c79908aa..4fa6fd8455e9 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -28,7 +28,7 @@ using namespace ::svxform; //----------------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; if ( ServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) @@ -46,15 +46,15 @@ using namespace ::svxform; } //----------------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const ::rtl::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 ) +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::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 ) { return SvxUnoDrawMSFactory::createInstanceWithArguments(ServiceSpecifier, Arguments ); } //----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { - static const ::rtl::OUString aSvxComponentServiceNameList[] = + static const OUString aSvxComponentServiceNameList[] = { FM_SUN_COMPONENT_TEXTFIELD, FM_SUN_COMPONENT_FORM, @@ -79,12 +79,12 @@ using namespace ::svxform; static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount ); - ::rtl::OUString* pStrings = aSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount ); + OUString* pStrings = aSeq.getArray(); for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ ) pStrings[nIdx] = aSvxComponentServiceNameList[nIdx]; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); + ::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); return concatServiceNames( aParentSeq, aSeq ); } diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index 13ccf0d0a043..35a6f7bba458 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -131,7 +131,7 @@ namespace svxform const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) { - if ( xSI->supportsService( ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) ) + if ( xSI->supportsService( OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) ) return pModuleInfo->eType; ++pModuleInfo; } @@ -168,7 +168,7 @@ namespace svxform } //-------------------------------------------------------------------- - DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const ::rtl::OUString& _rModuleIdentifier ) + DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const OUString& _rModuleIdentifier ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) @@ -181,16 +181,16 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType ) + OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) { if ( pModuleInfo->eType == _eType ) - return ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ); + return OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ); ++pModuleInfo; } - return ::rtl::OUString(); + return OUString(); } //........................................................................ diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 531d2d3b6a96..5d239f5b6042 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -83,7 +83,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) throw () { - ::rtl::OUString aShapeType( xDescr->getShapeType() ); + OUString aShapeType( xDescr->getShapeType() ); if ( aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ShapeControl" ) ) // compatibility || aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) @@ -128,7 +128,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } // ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index f4f387995313..c137183caf2f 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -334,7 +334,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!"); } return s_nFormat; @@ -346,7 +346,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!"); } return s_nFormat; @@ -358,7 +358,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index b2979cc36fbe..26b8b906e2ee 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -137,7 +137,7 @@ FmNavRemovedHint::~FmNavRemovedHint() TYPEINIT1( FmNavNameChangedHint, SfxHint ); DBG_NAME(FmNavNameChangedHint); //------------------------------------------------------------------------ -FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName ) +FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ) :pEntryData( pData ) ,aNewName( rNewName ) { @@ -351,12 +351,12 @@ FmFormData::FmFormData( Reference< XPropertySet > xSet(m_xForm, UNO_QUERY); if (xSet.is()) { - ::rtl::OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ))); + OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ))); SetText(aEntryName); } } else - SetText( ::rtl::OUString() ); + SetText( OUString() ); } //------------------------------------------------------------------------ diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index fad3aa96fe14..5f0641a9910d 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -58,7 +58,7 @@ using namespace ::svxform; TYPEINIT1(FmFormObj, SdrUnoObj); DBG_NAME(FmFormObj); //------------------------------------------------------------------ -FmFormObj::FmFormObj(const ::rtl::OUString& rModelName) +FmFormObj::FmFormObj(const OUString& rModelName) :SdrUnoObj ( rModelName ) ,m_nPos ( -1 ) ,m_pLastKnownRefDevice ( NULL ) @@ -133,7 +133,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - static const ::rtl::OUString sRefDevicePropName( "ReferenceDevice" ); + static const OUString sRefDevicePropName( "ReferenceDevice" ); if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) ) { VCLXDevice* pUnoRefDevice = new VCLXDevice; @@ -359,7 +359,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) Reference< XInterface > xSourceContainer = xSourceAsChild->getParent(); m_xEnvironmentHistory = Reference< XIndexContainer >( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.form.Forms") ), + ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.form.Forms") ), UNO_QUERY); DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !"); @@ -418,7 +418,7 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj) //------------------------------------------------------------------ namespace { - rtl::OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) + OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) { Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY); Reference< ::com::sun::star::container::XIndexAccess> xParent; @@ -457,7 +457,7 @@ namespace Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > _rTopLevelDestContainer) { Reference< XInterface > xTopLevelSouce; - rtl::OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce); + OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce); if (!xTopLevelSouce.is()) // something went wrong, maybe _rSourceContainer isn't part of a valid forms hierarchy return Reference< XInterface > (); @@ -469,7 +469,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > sal_Int32 nTokIndex = 0; do { - rtl::OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex ); + OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex ); sal_uInt16 nIndex = (sal_uInt16)aToken.toInt32(); // get the DSS of the source form (we have to find an aquivalent for) @@ -564,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > { // create and insert (into the destination) a copy of the form xCurrentDestForm.set( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString( "com.sun.star.form.component.DataForm" ) ), + ::comphelper::getProcessServiceFactory()->createInstance(OUString( "com.sun.star.form.component.DataForm" ) ), UNO_QUERY_THROW ); ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm ); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 1ea085758c55..39be34a73722 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -108,7 +108,7 @@ FmFormObjFactory::~FmFormObjFactory() \************************************************************************/ namespace { - void lcl_initProperty( FmFormObj* _pObject, const ::rtl::OUString& _rPropName, const Any& _rValue ) + void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) { try { @@ -127,9 +127,9 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { if (pObjFactory->nInventor == FmFormInventor) { - ::rtl::OUString sServiceSpecifier; + OUString sServiceSpecifier; - typedef ::std::vector< ::std::pair< ::rtl::OUString, Any > > PropertyValueArray; + typedef ::std::vector< ::std::pair< OUString, Any > > PropertyValueArray; PropertyValueArray aInitialProperties; switch ( pObjFactory->nIdentifier ) diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index e144bdbec5f3..8fd082ea217b 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -114,7 +114,7 @@ namespace size_t lhsCount = m_aComponentInfo.childCount( _components.first ); size_t rhsCount = m_aComponentInfo.childCount( _components.second ); if ( lhsCount != rhsCount ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); return lhsCount; } @@ -144,7 +144,7 @@ namespace Reference< XControlModel > lhsControlModel( _component.first, UNO_QUERY ); Reference< XControlModel > rhsControlModel( _component.second, UNO_QUERY ); if ( lhsControlModel.is() != rhsControlModel.is() ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); if ( lhsControlModel.is() ) m_rControlModelMap[ lhsControlModel ] = rhsControlModel; @@ -328,7 +328,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate { m_bAttemptedFormCreation = true; - const ::rtl::OUString sFormsCollectionServiceName("com.sun.star.form.Forms"); + const OUString sFormsCollectionServiceName("com.sun.star.form.Forms"); m_xForms = Reference< XNameContainer > ( ::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ), UNO_QUERY @@ -404,7 +404,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if ( xForms->hasElements() ) { // suche die Standardform - ::rtl::OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) ); try { @@ -436,7 +436,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -449,7 +449,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) ); // and the "Standard" name - ::rtl::OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); Reference< XIndexContainer > xContainer( xForms, UNO_QUERY ); @@ -480,7 +480,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() //------------------------------------------------------------------------------ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase, - const ::rtl::OUString& rDBTitle, const ::rtl::OUString& rCursorSource, sal_Int32 nCommandType ) + const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findPlaceInFormComponentHierarchy" ); // if the control already is child of a form, don't do anything @@ -520,7 +520,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -545,8 +545,8 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo Reference< ::com::sun::star::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); - ::rtl::OUString sName = FormControlFactory::getUniqueName( xNamedSet, - bTableOrQuery ? rCursorSource : ::rtl::OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) ); + OUString sName = FormControlFactory::getUniqueName( xNamedSet, + bTableOrQuery ? rCursorSource : OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); @@ -575,7 +575,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo //------------------------------------------------------------------------------ Reference< XForm > FmFormPageImpl::findFormForDataSource( const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase, - const ::rtl::OUString& _rCursorSource, sal_Int32 nCommandType) + const OUString& _rCursorSource, sal_Int32 nCommandType) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findFormForDataSource" ); Reference< XForm > xResultForm; @@ -585,8 +585,8 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( return xResultForm; OSL_ENSURE(_rxDatabase.is(), "FmFormPageImpl::findFormForDataSource: invalid data source!"); - ::rtl::OUString sLookupName; // the name of the data source we're looking for - ::rtl::OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on + OUString sLookupName; // the name of the data source we're looking for + OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on try { Reference< XPropertySet > xDSProps(_rxDatabase, UNO_QUERY); @@ -627,7 +627,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( if (sLookupName == sFormDataSourceName) { // jetzt noch ueberpruefen ob CursorSource und Type uebereinstimmen - ::rtl::OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND)); + OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND)); sal_Int32 nType = ::comphelper::getINT32(xFormProps->getPropertyValue(FM_PROP_COMMANDTYPE)); if (aCursorSource.isEmpty() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form { @@ -656,7 +656,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( } //------------------------------------------------------------------------------ -::rtl::OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls) +OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls) { #if OSL_DEBUG_LEVEL > 0 try @@ -669,7 +669,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( DBG_UNHANDLED_EXCEPTION(); } #endif - ::rtl::OUString sName; + OUString sName; Reference< ::com::sun::star::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); if (xSet.is()) { @@ -682,7 +682,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( sal_Int16 nClassId( FormComponentType::CONTROL ); xSet->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId; - ::rtl::OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType( + OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType( Reference< XNameAccess >( xControls, UNO_QUERY ), xSet ); // bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben! diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 574afae82813..bbb7610fc15e 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -107,7 +107,7 @@ namespace svxform @return <TRUE/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously */ - bool impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const; + bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const; /** determines whether the instance is already disposed */ @@ -189,7 +189,7 @@ namespace svxform } //-------------------------------------------------------------------- - bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const + bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const { bool bAllowAsynchronousCall = false; try @@ -197,8 +197,8 @@ namespace svxform ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW ); - ::rtl::OUString sMethodDescription( _rListenerType ); - sMethodDescription += ::rtl::OUString( "::" ); + OUString sMethodDescription( _rListenerType ); + sMethodDescription += OUString( "::" ); sMethodDescription += _rMethodName; Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW ); @@ -224,7 +224,7 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const ::rtl::OUString vbaInterOp("VBAInterop"); + static const OUString vbaInterOp("VBAInterop"); if ( _rEvent.ScriptType.equals(vbaInterOp) ) return; // not handled here @@ -385,10 +385,10 @@ namespace svxform class NewStyleUNOScript : public IScript { SfxObjectShell& m_rObjectShell; - const ::rtl::OUString m_sScriptCode; + const OUString m_sScriptCode; public: - NewStyleUNOScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode ) + NewStyleUNOScript( SfxObjectShell& _rObjectShell, const OUString& _rScriptCode ) :m_rObjectShell( _rObjectShell ) ,m_sScriptCode( _rScriptCode ) { @@ -411,7 +411,7 @@ namespace svxform { Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW ); Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW ); - aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); + aCaller = xProps->getPropertyValue( OUString("Name") ); } catch( Exception& ) {} } @@ -446,8 +446,8 @@ namespace svxform } else { - ::rtl::OUString sScriptCode = _rEvent.ScriptCode; - ::rtl::OUString sMacroLocation; + OUString sScriptCode = _rEvent.ScriptCode; + OUString sMacroLocation; // is there a location in the script name ("application" or "document")? sal_Int32 nPrefixLen = sScriptCode.indexOf( ':' ); @@ -469,19 +469,19 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = ::rtl::OUString( "application" ); + sMacroLocation = OUString( "application" ); else - sMacroLocation = ::rtl::OUString( "document" ); + sMacroLocation = OUString( "document" ); } - ::rtl::OUStringBuffer aScriptURI; + OUStringBuffer aScriptURI; aScriptURI.appendAscii( "vnd.sun.star.script:" ); aScriptURI.append( sScriptCode ); aScriptURI.appendAscii( "?language=Basic" ); aScriptURI.appendAscii( "&location=" ); aScriptURI.append( sMacroLocation ); - const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() ); + const OUString sScriptURI( aScriptURI.makeStringAndClear() ); pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) ); } diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index dac2e255754e..14834685e6a3 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -29,8 +29,8 @@ #define REGISTER_SERVICE(ImplName, ServiceName) \ sString = (ServiceName); \ xSingleFactory = ::cppu::createSingleFactory(xServiceFactory, \ - ::rtl::OUString(), ImplName##_NewInstance_Impl, \ - ::com::sun::star::uno::Sequence< ::rtl::OUString>(&sString, 1)); \ + OUString(), ImplName##_NewInstance_Impl, \ + ::com::sun::star::uno::Sequence< OUString>(&sString, 1)); \ if (xSingleFactory.is()) \ xSet->insert(::com::sun::star::uno::makeAny(xSingleFactory)); @@ -47,8 +47,8 @@ namespace svxform #define DECL_SELFAWARE_SERVICE( ClassName ) \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClassName##_Create( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); \ - ::rtl::OUString SAL_CALL ClassName##_GetImplementationName(); \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \ + OUString SAL_CALL ClassName##_GetImplementationName(); \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \ #define REGISTER_SELFAWARE_SERVICE( ClassName ) \ @@ -72,15 +72,15 @@ namespace svxform if (!xSet.is()) return; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aServices; + ::com::sun::star::uno::Sequence< OUString> aServices; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xSingleFactory; - ::rtl::OUString sString; + OUString sString; // ------------------------------------------------------------------------ // FormController REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) ); - REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( "com.sun.star.form.FormController" ) ); + REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) ); // ------------------------------------------------------------------------ // FormController diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index ca72d6757eaf..273aca1f58c1 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -223,7 +223,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) { m_pImpl->acquire(); SetPool( &SFX_APP()->GetPool() ); - SetName( rtl::OUString("Form") ); + SetName( OUString("Form") ); SetView(m_pFormView); } @@ -773,7 +773,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, ::rtl::OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; @@ -1138,7 +1138,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) } else if ( SID_FM_RECORD_TOTAL == nWhich ) { - ::rtl::OUString sTotalCount; + OUString sTotalCount; aState.State >>= sTotalCount; rSet.Put( SfxStringItem( nWhich, sTotalCount ) ); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 1685ace8d980..bed1a3190605 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -410,7 +410,7 @@ namespace const Type* pCurrentListeners = pCurrentArray->getConstArray(); for (j=0; j<pCurrentArray->getLength(); ++j, ++pCurrentListeners) { - rtl::OUString aListener = (*pCurrentListeners).getTypeName(); + OUString aListener = (*pCurrentListeners).getTypeName(); sal_Int32 nTokens = comphelper::string::getTokenCount(aListener, '.'); if (nTokens) aListener = comphelper::string::getToken(aListener, nTokens - 1, '.'); @@ -420,9 +420,9 @@ namespace continue; // now check the methods - Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners); + Sequence< OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners); - const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray(); + const OUString* pMethodsNames = aMethodsNames.getConstArray(); for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames) { if ((*pMethodsNames).compareTo(pCurrent->EventMethod) != COMPARE_EQUAL) @@ -447,7 +447,7 @@ namespace } //------------------------------------------------------------------------------ - ::rtl::OUString getServiceNameByControlType(sal_Int16 nType) + OUString getServiceNameByControlType(sal_Int16 nType) { switch (nType) { @@ -474,7 +474,7 @@ namespace case OBJ_FM_SPINBUTTON : return FM_SUN_COMPONENT_SPINBUTTON; case OBJ_FM_NAVIGATIONBAR : return FM_SUN_COMPONENT_NAVIGATIONBAR; } - return ::rtl::OUString(); + return OUString(); } } @@ -483,7 +483,7 @@ namespace // 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) sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl, - ::rtl::OUString* _pCurrentText ) + OUString* _pCurrentText ) { if ( !_rxControl.is() ) return sal_False; @@ -511,9 +511,9 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun { switch ( (::TriState)xCheckBox->getState() ) { - case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString("0" ); break; - case STATE_CHECK: *_pCurrentText = ::rtl::OUString("1" ); break; - default: *_pCurrentText = ::rtl::OUString(); break; + case STATE_NOCHECK: *_pCurrentText = OUString("0" ); break; + case STATE_CHECK: *_pCurrentText = OUString("1" ); break; + default: *_pCurrentText = OUString(); break; } } return sal_True; @@ -639,7 +639,7 @@ DBG_NAME(FmXFormShell); //------------------------------------------------------------------------ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(::rtl::OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) + ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( 0 ) ,m_nActivationEvent( 0 ) @@ -676,8 +676,8 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) // cache the current configuration settings we're interested in implAdjustConfigCache(); // and register for changes on this settings - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); EnableNotification(aNames); } @@ -1165,7 +1165,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent if ( !pFormObject ) return false; - ::rtl::OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) ); + OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) ); Reference< XControlModel> xNewModel( ::comphelper::getProcessServiceFactory()->createInstance( sNewName ), UNO_QUERY ); if (!xNewModel.is()) return false; @@ -1473,11 +1473,11 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > { Sequence< Any > aDialogArgs( 3 ); aDialogArgs[0] <<= NamedValue( - ::rtl::OUString( "TabbingModel" ), + OUString( "TabbingModel" ), makeAny( _rxForForm ) ); aDialogArgs[1] <<= NamedValue( - ::rtl::OUString( "ControlContext" ), + OUString( "ControlContext" ), makeAny( getControlContainerForView() ) ); @@ -1485,13 +1485,13 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > if ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) xParentWindow = VCLUnoHelper::GetInterface ( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow() ); aDialogArgs[2] <<= NamedValue( - ::rtl::OUString( "ParentWindow" ), + OUString( "ParentWindow" ), makeAny( xParentWindow ) ); Reference< dialogs::XExecutableDialog > xDialog( ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ), + OUString( "com.sun.star.form.ui.TabOrderDialog" ), aDialogArgs ), UNO_QUERY @@ -1517,7 +1517,7 @@ void FmXFormShell::ExecuteSearch() FmFormArray aEmpty; m_aSearchForms.swap( aEmpty ); ::std::vector< OUString > aContextNames; - impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), ::rtl::OUString(), m_aSearchForms, aContextNames ); + impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), OUString(), m_aSearchForms, aContextNames ); OSL_POSTCOND( m_aSearchForms.size() == aContextNames.size(), "FmXFormShell::ExecuteSearch: nonsense!" ); if ( m_aSearchForms.size() != aContextNames.size() ) @@ -1618,7 +1618,7 @@ void FmXFormShell::ExecuteSearch() Reference< XIndexAccess> xColControls(xGridPeer, UNO_QUERY); Reference< XInterface> xCurControl; xColControls->getByIndex(nViewCol) >>= xCurControl; - ::rtl::OUString sInitialText; + OUString sInitialText; if (IsSearchableControl(xCurControl, &sInitialText)) strInitialText = sInitialText.getStr(); } @@ -1679,7 +1679,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { try { - Any aVal( xSet->getPropertyValue(::rtl::OUString("TwoDigitDateStart")) ); + Any aVal( xSet->getPropertyValue(OUString("TwoDigitDateStart")) ); aVal >>= n; return sal_True; } @@ -1712,7 +1712,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal); } catch(Exception&) { @@ -1753,7 +1753,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal); } catch(Exception&) { @@ -2159,7 +2159,7 @@ void FmXFormShell::startListening() // TODO: this is strange - shouldn't this depend on a isLoaded instead of // a "has command value"? Finally, the command value only means that it was // intended to be loaded, not that it actually *is* loaded - ::rtl::OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND)); + OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND)); if (!aSource.isEmpty()) { m_bDatabaseBar = sal_True; @@ -2421,7 +2421,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn FmFormPage* pCurrentPage = m_pShell->GetCurPage(); DBG_ASSERT(pCurrentPage!=NULL, "FmXFormShell::OnSearchContextRequest : no page !"); // Search all SdrControls of this page... - ::rtl::OUString sControlSource, aName; + OUString sControlSource, aName; SdrObjListIter aPageIter( *pCurrentPage ); while ( aPageIter.IsMore() ) @@ -2949,7 +2949,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod //------------------------------------------------------------------------------ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) + const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) { try { @@ -2961,8 +2961,8 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt if ( nCount == 0 ) return; - ::rtl::OUString sCurrentFormName; - ::rtl::OUStringBuffer aNextLevelPrefix; + OUString sCurrentFormName; + OUStringBuffer aNextLevelPrefix; for ( sal_Int32 i=0; i<nCount; ++i ) { // is the current child a form? @@ -2974,7 +2974,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt sCurrentFormName = xNamed->getName(); // the name of the current form - ::rtl::OUStringBuffer sCompleteCurrentName( sCurrentFormName ); + OUStringBuffer sCompleteCurrentName( sCurrentFormName ); if ( !_rCurrentLevelPrefix.isEmpty() ) { sCompleteCurrentName.appendAscii( " (" ); @@ -3032,7 +3032,7 @@ void FmXFormShell::startFiltering() { Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) - xModeSelector->setMode( ::rtl::OUString( "FilterMode" ) ); + xModeSelector->setMode( OUString( "FilterMode" ) ); } } @@ -3102,7 +3102,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if ( pAdapter.is() ) { const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList(); - ::std::vector < ::rtl::OUString > aOriginalFilters; + ::std::vector < OUString > aOriginalFilters; ::std::vector < sal_Bool > aOriginalApplyFlags; if (bSave) @@ -3125,7 +3125,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if (aOriginalFilters.size() == aOriginalApplyFlags.size()) // the first getPropertyValue failed -> use two dummies - aOriginalFilters.push_back( ::rtl::OUString() ); + aOriginalFilters.push_back( OUString() ); aOriginalApplyFlags.push_back( sal_False ); } } @@ -3138,7 +3138,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) - xModeSelector->setMode( ::rtl::OUString( "DataMode" ) ); + xModeSelector->setMode( OUString( "DataMode" ) ); } if (bSave) // execute the filter { @@ -3162,7 +3162,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if (!isRowSetAlive(xFormSet)) { // something went wrong -> restore the original state - ::rtl::OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ]; + OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ]; sal_Bool bOriginalApplyFlag = aOriginalApplyFlags[ j - rControllers.begin() ]; try { @@ -3194,7 +3194,7 @@ void FmXFormShell::CreateExternalView() // the frame the external view is displayed in sal_Bool bAlreadyExistent = m_xExternalViewController.is(); Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame; - ::rtl::OUString sFrameName("_beamer"); + OUString sFrameName("_beamer"); sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE; Reference< runtime::XFormController > xCurrentNavController( getNavController()); @@ -3278,7 +3278,7 @@ void FmXFormShell::CreateExternalView() URL aClearURL; aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW; - Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); if (xClear.is()) xClear->dispatch(aClearURL, Sequence< PropertyValue>()); } @@ -3295,10 +3295,10 @@ void FmXFormShell::CreateExternalView() // collect the dispatchers we will need URL aAddColumnURL; aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN; - Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); URL aAttachURL; aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM; - Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); if (xAddColumnDispatch.is() && xAttachDispatch.is()) { @@ -3309,7 +3309,7 @@ void FmXFormShell::CreateExternalView() sal_Int16 nAddedColumns = 0; // for radio buttons we need some special structures - typedef std::map< OUString, Sequence< ::rtl::OUString> > MapUString2UstringSeq; + typedef std::map< OUString, Sequence< OUString> > MapUString2UstringSeq; typedef std::map< OUString, OUString > FmMapUString2UString; typedef std::map< OUString, sal_Int16 > FmMapUString2Int16; @@ -3321,7 +3321,7 @@ void FmXFormShell::CreateExternalView() FmXBoundFormFieldIterator aModelIterator(xCurrentNavController->getModel()); Reference< XPropertySet> xCurrentModelSet; Any aCurrentBoundField; - ::rtl::OUString sColumnType,aGroupName,sControlSource; + OUString sColumnType,aGroupName,sControlSource; Sequence< Property> aProps; Reference< XPropertySet> xCurrentBoundField; while ((xCurrentModelSet = Reference< XPropertySet>(aModelIterator.Next(), UNO_QUERY)).is()) @@ -3340,13 +3340,13 @@ void FmXFormShell::CreateExternalView() aGroupName = getLabelName(xCurrentModelSet); // add the reference value of the radio button to the list source sequence - Sequence< ::rtl::OUString>& aThisGroupLabels = aRadioListSources[aGroupName]; + Sequence< OUString>& aThisGroupLabels = aRadioListSources[aGroupName]; sal_Int32 nNewSizeL = aThisGroupLabels.getLength() + 1; aThisGroupLabels.realloc(nNewSizeL); aThisGroupLabels.getArray()[nNewSizeL - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_REFVALUE)); // add the label to the value list sequence - Sequence< ::rtl::OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName]; + Sequence< OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName]; sal_Int32 nNewSizeC = aThisGroupControlSources.getLength() + 1; aThisGroupControlSources.realloc(nNewSizeC); aThisGroupControlSources.getArray()[nNewSizeC - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_LABEL)); @@ -3462,7 +3462,7 @@ void FmXFormShell::CreateExternalView() aColumnProps.realloc(pColumnProps - aColumnProps.getArray()); // columns props are a dispatch argument - pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aColumnProps); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3532,9 +3532,9 @@ void FmXFormShell::CreateExternalView() // column type : listbox pDispatchArgs->Name = FMARG_ADDCOL_COLUMNTYPE; - ::rtl::OUString fColName = FM_COL_LISTBOX; + OUString fColName = FM_COL_LISTBOX; pDispatchArgs->Value <<= fColName; -// pDispatchArgs->Value <<= (::rtl::OUString)FM_COL_LISTBOX; +// pDispatchArgs->Value <<= (OUString)FM_COL_LISTBOX; ++pDispatchArgs; // column position @@ -3549,7 +3549,7 @@ void FmXFormShell::CreateExternalView() ++pDispatchArgs; // the - pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aListBoxDescription); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3599,21 +3599,21 @@ void FmXFormShell::CreateExternalView() void FmXFormShell::implAdjustConfigCache() { // get (cache) the wizard usage flag - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); Sequence< Any > aFlags = GetProperties(aNames); if (1 == aFlags.getLength()) m_bUseWizards = ::cppu::any2bool(aFlags[0]); } //------------------------------------------------------------------------ -void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames) +void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) { if ( impl_checkDisposed() ) return; - const ::rtl::OUString* pSearch = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pSearchTil = pSearch + _rPropertyNames.getLength(); + const OUString* pSearch = _rPropertyNames.getConstArray(); + const OUString* pSearchTil = pSearch + _rPropertyNames.getLength(); for (;pSearch < pSearchTil; ++pSearch) if (0 == pSearch->compareToAscii("FormControlPilotsEnabled")) { @@ -3631,8 +3631,8 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { m_bUseWizards = _bUseThem; - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); Sequence< Any > aValues(1); aValues[0] = ::cppu::bool2any(m_bUseWizards); PutProperties(aNames, aValues); @@ -3795,8 +3795,8 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels return; } - static const ::rtl::OUString sClassIdPropertyName = FM_PROP_CLASSID; - static const ::rtl::OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD; + static const OUString sClassIdPropertyName = FM_PROP_CLASSID; + static const OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD; sal_Int32 nCount = _rxModels->getCount(); Reference< XPropertySet > xCurrent; Reference< XPropertySetInfo > xCurrentInfo; @@ -3876,7 +3876,7 @@ namespace if ( xConn.is() ) return sal_True; - ::rtl::OUString sPropertyValue; + OUString sPropertyValue; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue ); if ( !sPropertyValue.isEmpty() ) return sal_True; @@ -4076,7 +4076,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) ); if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL) { - m_sCurrentValue = ::rtl::OUString(); + m_sCurrentValue = OUString(); return sal_True; } } diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index effb1bd4336b..32f58ced4229 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -112,7 +112,7 @@ namespace svxform return s_aSearchPositionMap; } - static sal_Int16 lcl_implMapAsciiValue( const ::rtl::OUString& _rAsciiValue, const Ascii2Int16* _pMap ) + static sal_Int16 lcl_implMapAsciiValue( const OUString& _rAsciiValue, const Ascii2Int16* _pMap ) { // search the map for the given ascii value const Ascii2Int16* pSearch = _pMap; @@ -125,9 +125,9 @@ namespace svxform } OSL_FAIL( - ( ::rtl::OString( "lcl_implMapAsciiValue: could not convert the ascii value " ) - += ::rtl::OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US ) - += ::rtl::OString( " !" ) + ( OString( "lcl_implMapAsciiValue: could not convert the ascii value " ) + += OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US ) + += OString( " !" ) ).getStr() ); return -1; @@ -146,9 +146,9 @@ namespace svxform } OSL_FAIL( - ( ::rtl::OString( "lcl_implMapIntValue: could not convert the integer value " ) - += ::rtl::OString::valueOf( (sal_Int32)_nValue ) - += ::rtl::OString( " !" ) + ( OString( "lcl_implMapIntValue: could not convert the integer value " ) + += OString::valueOf( (sal_Int32)_nValue ) + += OString( " !" ) ).getStr() ); static const sal_Char* s_pDummy = ""; @@ -248,10 +248,10 @@ namespace svxform void FmSearchConfigItem::implTranslateToConfig( ) { // the search-for string - m_sSearchForType = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) ); + m_sSearchForType = OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) ); // the search position - m_sSearchPosition = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) ); + m_sSearchPosition = OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) ); // the transliteration flags diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index bdd0d75528d9..2e393f0fdc08 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -169,7 +169,7 @@ SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTe } //------------------------------------------------------------------------ -::rtl::OUString SimpleTextWrapper::getCurrentText() const +OUString SimpleTextWrapper::getCurrentText() const { return m_xText->getText(); } @@ -183,7 +183,7 @@ ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox } //------------------------------------------------------------------------ -::rtl::OUString ListBoxWrapper::getCurrentText() const +OUString ListBoxWrapper::getCurrentText() const { return m_xBox->getSelectedItem(); } @@ -197,15 +197,15 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB } //------------------------------------------------------------------------ -::rtl::OUString CheckBoxWrapper::getCurrentText() const +OUString CheckBoxWrapper::getCurrentText() const { switch ((TriState)m_xBox->getState()) { - case STATE_NOCHECK: return rtl::OUString("0"); - case STATE_CHECK: return rtl::OUString("1"); + case STATE_NOCHECK: return OUString("0"); + case STATE_CHECK: return OUString("1"); default: break; } - return rtl::OUString(); + return OUString(); } //======================================================================== @@ -239,9 +239,9 @@ sal_Bool FmSearchEngine::MoveCursor() catch(::com::sun::star::sdbc::SQLException const& e) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( "FmSearchEngine::MoveCursor : catched a DatabaseException (")); - sDebugMessage.append(rtl::OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US)); + sDebugMessage.append(OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US)); sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !")); OSL_FAIL(sDebugMessage.getStr()); #else @@ -252,9 +252,9 @@ sal_Bool FmSearchEngine::MoveCursor() catch(Exception const& e) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( "FmSearchEngine::MoveCursor : catched an Exception (")); - sDebugMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); + sDebugMessage.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !")); OSL_FAIL(sDebugMessage.getStr()); #else @@ -331,15 +331,15 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } //------------------------------------------------------------------------ -::rtl::OUString FmSearchEngine::FormatField(const FieldInfo& rField) +OUString FmSearchEngine::FormatField(const FieldInfo& rField) { DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !"); if (!m_xFormatter.is()) - return ::rtl::OUString(); + return OUString(); // sonst werden Datumsflder zum Beispiel zu irgendeinem Default-Wert formatiert - ::rtl::OUString sReturn; + OUString sReturn; try { if (rField.bDoubleHandling) @@ -350,7 +350,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } else { - ::rtl::OUString sValue = rField.xContents->getString(); + OUString sValue = rField.xContents->getString(); if (!rField.xContents->wasNull()) sReturn = m_xFormatter->formatString(rField.nFormatKey, sValue); } @@ -364,7 +364,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } //------------------------------------------------------------------------ -::rtl::OUString FmSearchEngine::FormatField(sal_Int32 nWhich) +OUString FmSearchEngine::FormatField(sal_Int32 nWhich) { if (m_bUsingTextComponents) { @@ -465,7 +465,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor } //------------------------------------------------------------------------ -FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, +FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd) { // die Startposition merken @@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri } // der aktuell zu vergleichende Inhalt - ::rtl::OUString sCurrentCheck; + OUString sCurrentCheck; if (m_bFormatter) sCurrentCheck = FormatField(nFieldPos); else @@ -543,7 +543,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri } //------------------------------------------------------------------------ -FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, +FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd) { DBG_ASSERT(m_bLevenshtein || m_bRegular, @@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O } // der aktuell zu vergleichende Inhalt - ::rtl::OUString sCurrentCheck; + OUString sCurrentCheck; if (m_bFormatter) sCurrentCheck = FormatField(nFieldPos); else @@ -671,7 +671,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O DBG_NAME(FmSearchEngine); //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, - const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, + const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) @@ -710,7 +710,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, - const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, + const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) ,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() ) @@ -826,7 +826,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) } //------------------------------------------------------------------------ -void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) +void FmSearchEngine::Init(const OUString& sVisibleFields) { // analyze the fields // additionally, create the mapping: because the list of used columns can be shorter than the list @@ -871,12 +871,12 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::Init : invalid cursor (no columns supplier) !"); Reference< ::com::sun::star::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); - Sequence< ::rtl::OUString > seqFieldNames = xAllFieldNames->getElementNames(); - ::rtl::OUString* pFieldNames = seqFieldNames.getArray(); + Sequence< OUString > seqFieldNames = xAllFieldNames->getElementNames(); + OUString* pFieldNames = seqFieldNames.getArray(); - ::rtl::OUString sCurrentField; - ::rtl::OUString sVis(sVisibleFields.getStr()); + OUString sCurrentField; + OUString sVis(sVisibleFields.getStr()); sal_Int32 nIndex = 0; do { @@ -978,13 +978,13 @@ void FmSearchEngine::SearchNextImpl() DBG_ASSERT(m_xSearchCursor.is(), "FmSearchEngine::SearchNextImpl : habe ungueltigen Iterator !"); // die Parameter der Suche - ::rtl::OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const + OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const if (!GetCaseSensitive()) // norm the string strSearchExpression = m_aCharacterClassficator.lowercase(strSearchExpression); if (!m_bRegular && !m_bLevenshtein) - { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den ::rtl::OUString anpassen + { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den OUString anpassen if (!m_bWildcard) { // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen @@ -1144,7 +1144,7 @@ void FmSearchEngine::CancelSearch() } //------------------------------------------------------------------------ -sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, const InterfaceArray& arrFields, +sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex) { DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !"); @@ -1188,7 +1188,7 @@ void FmSearchEngine::ImplStartNextSearch() } //------------------------------------------------------------------------ -void FmSearchEngine::SearchNext(const ::rtl::OUString& strExpression) +void FmSearchEngine::SearchNext(const OUString& strExpression) { m_strSearchExpression = strExpression; m_eSearchForType = SEARCHFOR_STRING; @@ -1203,7 +1203,7 @@ void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull) } //------------------------------------------------------------------------ -void FmSearchEngine::StartOver(const ::rtl::OUString& strExpression) +void FmSearchEngine::StartOver(const OUString& strExpression) { try { diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index be8046f2498a..3e7f1aa2f8db 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -430,9 +430,9 @@ namespace svx } //.................................................................... - ::rtl::OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) + OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) { - ::rtl::OUString sSlotUnoName; + OUString sSlotUnoName; SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( NULL ); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); @@ -456,15 +456,15 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = ::rtl::OUString( ".uno:" ); - sSlotUnoName += ::rtl::OUString::createFromAscii( pAsciiUnoName ); + sSlotUnoName = OUString( ".uno:" ); + sSlotUnoName += OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" ); + OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" ); sMessage += "(slot id: "; - sMessage += ::rtl::OString::valueOf( (sal_Int32)_nSlotId ); + sMessage += OString::valueOf( (sal_Int32)_nSlotId ); sMessage += ")"; OSL_FAIL( sMessage.getStr() ); } @@ -534,7 +534,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( "RichText" ); + OUString sRichTextPropertyName = OUString( "RichText" ); if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -593,13 +593,13 @@ namespace svx { SfxSlotId nSlotId( aFeature->first ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sUnoSlotName; + OUString sUnoSlotName; if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = ::rtl::OUString( "<unknown>" ); - ::rtl::OString sUnoSlotNameAscii( "\"" ); - sUnoSlotNameAscii += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sUnoSlotName = OUString( "<unknown>" ); + OString sUnoSlotNameAscii( "\"" ); + sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; #endif @@ -632,7 +632,7 @@ namespace svx { #if OSL_DEBUG_LEVEL > 0 bool bFeatureIsEnabled = aFeature->second->isFeatureEnabled(); - ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); + OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); sMessage += sUnoSlotNameAscii; if ( !bFeatureIsEnabled ) sMessage += " (disabled)"; @@ -644,7 +644,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); + OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); sMessage += sUnoSlotNameAscii; sMessage += ", but could not translate it into an item!"; OSL_TRACE( "%s", sMessage.getStr() ); @@ -732,7 +732,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = ::rtl::OUString( "Enable" ); + aArgs[ 0 ].Name = OUString( "Enable" ); aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } @@ -743,14 +743,14 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" ); - sError += "\n SlotID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nSlotForItemSet ); - sError += "\n WhichID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nWhich ); + OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" ); + sError += "\n SlotID: "; sError += OString::valueOf( (sal_Int32)nSlotForItemSet ); + sError += "\n WhichID: "; sError += OString::valueOf( (sal_Int32)nWhich ); sError += "\n UNO name: "; - ::rtl::OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet ); + OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet ); if ( !sUnoSlotName.isEmpty() ) - sError += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sError += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); else sError += "unknown (no SfxSlot)"; OSL_FAIL( sError.getStr() ); @@ -798,18 +798,18 @@ namespace svx case SID_COPY: case SID_CUT: { - ::rtl::OUString sSelectedText( m_xActiveTextComponent->getSelectedText() ); + OUString sSelectedText( m_xActiveTextComponent->getSelectedText() ); ::svt::OStringTransfer::CopyString( sSelectedText, lcl_getWindow( m_xActiveControl ) ); if ( SID_CUT == _nSlot ) { awt::Selection aSelection( m_xActiveTextComponent->getSelection() ); - m_xActiveTextComponent->insertText( aSelection, ::rtl::OUString() ); + m_xActiveTextComponent->insertText( aSelection, OUString() ); } } break; case SID_PASTE: { - ::rtl::OUString sClipboardContent; + OUString sClipboardContent; OSL_VERIFY( ::svt::OStringTransfer::PasteString( sClipboardContent, lcl_getWindow( m_xActiveControl ) ) ); awt::Selection aSelection( m_xActiveTextComponent->getSelection() ); m_xActiveTextComponent->insertText( aSelection, sClipboardContent ); @@ -1065,8 +1065,8 @@ namespace svx void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::formActivated: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); + OString sTrace( "FmTextControlShell::formActivated: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1093,8 +1093,8 @@ namespace svx void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); + OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif (void)_rxController; @@ -1324,7 +1324,7 @@ namespace svx URL aFeatureURL; aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot ); impl_parseURL_nothrow( aFeatureURL ); - Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, ::rtl::OUString(), 0xFF ); + Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, OUString(), 0xFF ); if ( xDispatcher.is() ) return new FmTextControlFeature( xDispatcher, aFeatureURL, _nSlot, this ); return NULL; @@ -1345,8 +1345,8 @@ namespace svx Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::focusGained: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); + OString sTrace( "FmTextControlShell::focusGained: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1361,8 +1361,8 @@ namespace svx Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::focusLost: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); + OString sTrace( "FmTextControlShell::focusLost: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 1a5df90fc9dc..ddeb875695ac 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -204,11 +204,11 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } //------------------------------------------------------------------ -::rtl::OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) +OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getLabelName" ); if (!xControlModel.is()) - return ::rtl::OUString(); + return OUString(); if (::comphelper::hasProperty(FM_PROP_CONTROLLABEL, xControlModel)) { @@ -371,7 +371,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi if (!xPersistence.is()) return OBJ_FM_CONTROL; - ::rtl::OUString sPersistentServiceName = xPersistence->getServiceName(); + OUString sPersistentServiceName = xPersistence->getServiceName(); if (sPersistentServiceName.equals(FM_COMPONENT_EDIT)) // 5.0-Name { // may be a simple edit field or a formatted field, dependent of the supported services diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 1177dae34fe3..d176abdf4978 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -121,7 +121,7 @@ private: // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell(); ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" ); - xListenerProps->setPropertyValue( ::rtl::OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); + xListenerProps->setPropertyValue( OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); m_vbaListener = xScriptListener; } @@ -552,11 +552,11 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) return; // if it's a "default value" property of a control model, set the according "value" property - static ::rtl::OUString pDefaultValueProperties[] = { + static OUString pDefaultValueProperties[] = { OUString(FM_PROP_DEFAULT_TEXT), OUString(FM_PROP_DEFAULTCHECKED), OUString(FM_PROP_DEFAULT_DATE), OUString(FM_PROP_DEFAULT_TIME), OUString(FM_PROP_DEFAULT_VALUE), OUString(FM_PROP_DEFAULT_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_DEFAULT) }; - const ::rtl::OUString aValueProperties[] = { + const OUString aValueProperties[] = { OUString(FM_PROP_TEXT), OUString(FM_PROP_STATE), OUString(FM_PROP_DATE), OUString(FM_PROP_TIME), OUString(FM_PROP_VALUE), OUString(FM_PROP_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_VALUE) }; @@ -643,7 +643,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) if (::comphelper::hasProperty(FM_PROP_CONTROLSOURCEPROPERTY, xSet)) { Any aControlSourceProperty = xSet->getPropertyValue(FM_PROP_CONTROLSOURCEPROPERTY); - ::rtl::OUString sControlSourceProperty; + OUString sControlSourceProperty; aControlSourceProperty >>= sControlSourceProperty; aNewEntry.bIsValueProperty = (sControlSourceProperty.equals(evt.PropertyName)); @@ -691,7 +691,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: we should cache all those things, else this might be too expensive. // However, this requires we're notified of changes in the value binding - static const ::rtl::OUString s_sExternalData( "ExternalData" ); + static const OUString s_sExternalData( "ExternalData" ); if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) ) { sal_Bool bExternalData = sal_True; @@ -841,9 +841,9 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & if (xSet.is()) { if (!bReadOnly) - xSet->addPropertyChangeListener( ::rtl::OUString(), this ); + xSet->addPropertyChangeListener( OUString(), this ); else - xSet->removePropertyChangeListener( ::rtl::OUString(), this ); + xSet->removePropertyChangeListener( OUString(), this ); } } @@ -920,9 +920,9 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje if ( xProps.is() ) { if ( _bStartListening ) - xProps->addPropertyChangeListener( ::rtl::OUString(), this ); + xProps->addPropertyChangeListener( OUString(), this ); else - xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + xProps->removePropertyChangeListener( OUString(), this ); } } @@ -1044,12 +1044,12 @@ void FmUndoPropertyAction::Redo() } //------------------------------------------------------------------------------ -rtl::OUString FmUndoPropertyAction::GetComment() const +OUString FmUndoPropertyAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" ); String aStr(static_STR_UNDO_PROPERTY); - aStr.SearchAndReplace( rtl::OUString('#'), aPropertyName ); + aStr.SearchAndReplace( OUString('#'), aPropertyName ); return aStr; } @@ -1287,7 +1287,7 @@ void FmUndoModelReplaceAction::Undo() Reference< XPropertySet > xCurrentAsSet( xCurrentModel, UNO_QUERY ); DBG_ASSERT( ::comphelper::hasProperty(FM_PROP_NAME, xCurrentAsSet ), "FmUndoModelReplaceAction::Undo : one of the models is invalid !"); - ::rtl::OUString sName; + OUString sName; xCurrentAsSet->getPropertyValue( FM_PROP_NAME ) >>= sName; xCurrentsParent->replaceByName( sName, makeAny( xComponent ) ); @@ -1304,7 +1304,7 @@ void FmUndoModelReplaceAction::Undo() } //------------------------------------------------------------------------------ -rtl::OUString FmUndoModelReplaceAction::GetComment() const +OUString FmUndoModelReplaceAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" ); return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 24bb95852a42..b18745e2f634 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -590,7 +590,7 @@ FmFormObj* FmFormView::getMarkedGrid() const // ----------------------------------------------------------------------------- void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) { FmXFormView::createControlLabelPair( diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index eaaa886bce45..3dc99ea74da4 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -723,7 +723,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) continue; } - const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); + const OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); if ( !aSource.isEmpty() ) { FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); @@ -1078,7 +1078,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) if ( !xWizard.is() ) { - ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True ); + ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), sal_True ); } else { @@ -1102,8 +1102,8 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) namespace { void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj, - const Reference< XDataSource >& _rxDataSource = NULL, const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(), - const ::rtl::OUString& _rCommand = ::rtl::OUString(), const sal_Int32 _nCommandType = -1 ) + const Reference< XDataSource >& _rxDataSource = NULL, const OUString& _rDataSourceName = OUString(), + const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 ) { FmFormPage& rPage = static_cast< FmFormPage& >( *_rView.GetSdrPageView()->GetPage() ); @@ -1126,11 +1126,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ( !m_pView->IsDesignMode() ) return NULL; - ::rtl::OUString sCommand, sFieldName; + OUString sCommand, sFieldName; sal_Int32 nCommandType = CommandType::COMMAND; SharedConnection xConnection; - ::rtl::OUString sDataSource = _rColumnDescriptor.getDataSource(); + OUString sDataSource = _rColumnDescriptor.getDataSource(); _rColumnDescriptor[ daCommand ] >>= sCommand; _rColumnDescriptor[ daColumnName ] >>= sFieldName; _rColumnDescriptor[ daCommandType ] >>= nCommandType; @@ -1169,8 +1169,8 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ( !xConnection.is() ) xConnection.reset( OStaticDataAccessTools().getConnection_withFeedback( sDataSource, - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), m_aContext.getUNOContext() ) ); } @@ -1214,7 +1214,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, sal_False ), UNO_SET_THROW ); Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW ); - ::rtl::OUString sLabelPostfix; + OUString sLabelPostfix; //////////////////////////////////////////////////////////////// // nur fuer Textgroesse @@ -1367,7 +1367,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor { // determine the table/query field which we should create a control for Reference< XNumberFormats > xNumberFormats; - ::rtl::OUString sLabelPostfix = _rDesc.szName; + OUString sLabelPostfix = _rDesc.szName; //////////////////////////////////////////////////////////////// // nur fuer Textgroesse @@ -1401,11 +1401,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor ////////////////////////////////////////////////////////////////////// // The service name decides which control should be created sal_uInt16 nOBJID = OBJ_FM_EDIT; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_NUMERICFIELD)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD)) nOBJID = OBJ_FM_NUMERICFIELD; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_CHECKBOX)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_CHECKBOX)) nOBJID = OBJ_FM_CHECKBOX; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_COMPONENT_COMMANDBUTTON)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_COMPONENT_COMMANDBUTTON)) nOBJID = OBJ_FM_BUTTON; typedef ::com::sun::star::form::submission::XSubmission XSubmission_t; @@ -1462,7 +1462,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor // set the button label Reference< XPropertySet > xControlSet(pControl->GetUnoControlModel(), UNO_QUERY); - xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(::rtl::OUString(_rDesc.szName))); + xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(OUString(_rDesc.szName))); // connect the submission with the submission supplier (aka the button) xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE, @@ -1486,10 +1486,10 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor //------------------------------------------------------------------------ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, + sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, - const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType ) + const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName, + const OUString& _rCommand, const sal_Int32 _nCommandType ) { if ( !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, @@ -1515,11 +1515,11 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext, OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl) { sal_Int32 nDataType = 0; - ::rtl::OUString sFieldName; + OUString sFieldName; Any aFieldName; if ( _rxField.is() ) { @@ -1567,7 +1567,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY ); if ( xLabelModel.is() ) { - ::rtl::OUString sLabel; + OUString sLabel; if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) _rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( sLabel.isEmpty() ) @@ -1576,7 +1576,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) ); String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) ); sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName ); - xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( ::rtl::OUString( sObjectLabel ) ) ); + xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( OUString( sObjectLabel ) ) ); } pLabel->SetLogicRect( ::Rectangle( diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 3992a40aaa78..5197304149c6 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -142,12 +142,12 @@ namespace svxform namespace { //.................................................................... - static ::rtl::OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rBaseLabel ) + static OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBaseLabel ) { - ::rtl::OUString sLabel( _rBaseLabel ); + OUString sLabel( _rBaseLabel ); try { - typedef ::std::set< ::rtl::OUString > StringBag; + typedef ::std::set< OUString > StringBag; StringBag aUsedLabels; Reference< XFormComponent > xFormComponent( _rxControlModel, UNO_QUERY_THROW ); @@ -163,7 +163,7 @@ namespace svxform if ( !xPSI->hasPropertyByName( FM_PROP_LABEL ) ) continue; - ::rtl::OUString sElementLabel; + OUString sElementLabel; OSL_VERIFY( xElement->getPropertyValue( FM_PROP_LABEL ) >>= sElementLabel ); aUsedLabels.insert( sElementLabel ); } @@ -172,7 +172,7 @@ namespace svxform sal_Int32 i=2; while ( aUsedLabels.find( sLabel ) != aUsedLabels.end() ) { - ::rtl::OUStringBuffer aBuffer( _rBaseLabel ); + OUStringBuffer aBuffer( _rBaseLabel ); aBuffer.appendAscii( " " ); aBuffer.append( (sal_Int32)i++ ); sLabel = aBuffer.makeStringAndClear(); @@ -208,14 +208,14 @@ namespace svxform OSL_ENSURE( xForm.is(), "lcl_getDataSourceIndirectProperties: could not determine the form!" ); if ( !xForm.is() ) return aInfo; - ::rtl::OUString sDataSourceName; + OUString sDataSourceName; xForm->getPropertyValue( FM_PROP_DATASOURCE ) >>= sDataSourceName; Reference< XPropertySet > xDsProperties; if ( !sDataSourceName.isEmpty() ) xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getUNOContext() ) ); if ( xDsProperties.is() ) - xDsProperties->getPropertyValue( ::rtl::OUString( "Info" ) ) >>= aInfo; + xDsProperties->getPropertyValue( OUString( "Info" ) ) >>= aInfo; } catch( const Exception& ) { @@ -366,11 +366,11 @@ namespace svxform Reference< XPropertySetInfo > xSourcePropInfo( xStyle->getPropertySetInfo(), UNO_SET_THROW ); Reference< XPropertySetInfo > xDestPropInfo( _rxModel->getPropertySetInfo(), UNO_SET_THROW ); - ::rtl::OUString sPropertyName; + OUString sPropertyName; const sal_Char** pCharacterProperty = aCharacterAndParagraphProperties; while ( *pCharacterProperty ) { - sPropertyName = ::rtl::OUString::createFromAscii( *pCharacterProperty ); + sPropertyName = OUString::createFromAscii( *pCharacterProperty ); if ( xSourcePropInfo->hasPropertyByName( sPropertyName ) && xDestPropInfo->hasPropertyByName( sPropertyName ) ) _rxModel->setPropertyValue( sPropertyName, xStyle->getPropertyValue( sPropertyName ) ); @@ -404,7 +404,7 @@ namespace svxform switch ( nClassId ) { case FormComponentType::SCROLLBAR: - _rxControlModel->setPropertyValue( ::rtl::OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); + _rxControlModel->setPropertyValue( OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); // NO break! case FormComponentType::SPINBUTTON: { @@ -444,7 +444,7 @@ namespace svxform case FormComponentType::CHECKBOX: case FormComponentType::FIXEDTEXT: { - ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" ); + OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) _rxControlModel->setPropertyValue( sVertAlignPropertyName, makeAny( VerticalAlignment_MIDDLE ) ); } @@ -453,7 +453,7 @@ namespace svxform case FormComponentType::IMAGEBUTTON: case FormComponentType::IMAGECONTROL: { - const ::rtl::OUString sScaleModeProperty( "ScaleMode" ); + const OUString sScaleModeProperty( "ScaleMode" ); if ( xPSI->hasPropertyByName( sScaleModeProperty ) ) _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) ); } @@ -463,11 +463,11 @@ namespace svxform // initial default label for the control if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) ) { - ::rtl::OUString sExistingLabel; + OUString sExistingLabel; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_LABEL ) >>= sExistingLabel ); if ( sExistingLabel.isEmpty() ) { - ::rtl::OUString sInitialLabel; + OUString sInitialLabel; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel ); sal_uInt16 nTitleResId = 0; @@ -648,7 +648,7 @@ namespace svxform } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) + OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) { sal_uInt16 nResId(0); @@ -689,24 +689,24 @@ namespace svxform } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer, + OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer, const Reference< XPropertySet >& _rxObject ) { sal_Int16 nClassId = FormComponentType::CONTROL; OSL_VERIFY( _rxObject->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId ); - ::rtl::OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) ); + OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) ); return getUniqueName( _rxContainer, sBaseName ); } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const ::rtl::OUString& _rBaseName ) + OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName ) { sal_Int32 n = 0; - ::rtl::OUString sName; + OUString sName; do { - ::rtl::OUStringBuffer aBuf( _rBaseName ); + OUStringBuffer aBuf( _rBaseName ); aBuf.appendAscii( " " ); aBuf.append( ++n ); sName = aBuf.makeStringAndClear(); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 4a5d8a06b435..c9fab0b9761c 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -217,7 +217,7 @@ struct ColumnInfo sal_Int32 nNullable; sal_Bool bAutoIncrement; sal_Bool bReadOnly; - ::rtl::OUString sName; + OUString sName; // information about the control(s) bound to this column @@ -455,7 +455,7 @@ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyVal //================================================================== struct FmFieldInfo { - rtl::OUString aFieldName; + OUString aFieldName; Reference< XPropertySet > xField; Reference< XTextComponent > xText; @@ -478,11 +478,11 @@ public: { } - virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString("Edit");} + virtual OUString GetComponentServiceName() {return OUString("Edit");} virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException ); protected: - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ); }; //------------------------------------------------------------------------------ @@ -493,13 +493,13 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XTextComponent > xText(getPeer() , UNO_QUERY); if (xText.is()) { - xText->setText(::rtl::OUString(String(SVX_RES(RID_STR_AUTOFIELD)))); + xText->setText(OUString(String(SVX_RES(RID_STR_AUTOFIELD)))); xText->setEditable(sal_False); } } //------------------------------------------------------------------------------ -void FmXAutoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ) +void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) { // these properties are ignored if (rPropName == FM_PROP_TEXT) @@ -563,7 +563,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB ,m_aFilterListeners(m_aMutex) ,m_pControlBorderManager( new ::svxform::ControlBorderManager ) ,m_xFormOperations() - ,m_aMode( ::rtl::OUString( "DataMode" ) ) + ,m_aMode( OUString( "DataMode" ) ) ,m_aLoadEvent( LINK( this, FormController, OnLoad ) ) ,m_aToggleEvent( LINK( this, FormController, OnToggleAutoFields ) ) ,m_aActivationEvent( LINK( this, FormController, OnActivated ) ) @@ -688,10 +688,10 @@ Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException) // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSNL(getSupportedServiceNames()); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString> aSNL(getSupportedServiceNames()); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -699,21 +699,21 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.svx.FormController"); + return OUString("org.openoffice.comp.svx.FormController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException ) { // service names which are supported only, but cannot be used to created an // instance at a service factory - Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 ); - aNonCreatableServiceNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.FormControllerDispatcher" ); + Sequence< OUString > aNonCreatableServiceNames( 1 ); + aNonCreatableServiceNames[ 0 ] = OUString( "com.sun.star.form.FormControllerDispatcher" ); // services which can be used to created an instance at a service factory - Sequence< ::rtl::OUString > aCreatableServiceNames( getSupportedServiceNames_Static() ); + Sequence< OUString > aCreatableServiceNames( getSupportedServiceNames_Static() ); return ::comphelper::concatSequences( aCreatableServiceNames, aNonCreatableServiceNames ); } @@ -732,14 +732,14 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void) +Sequence< OUString> FormController::getSupportedServiceNames_Static(void) { - static Sequence< ::rtl::OUString> aServices; + static Sequence< OUString> aServices; if (!aServices.getLength()) { aServices.realloc(2); aServices.getArray()[0] = OUString( "com.sun.star.form.runtime.FormController" ); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); + aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); } return aServices; } @@ -751,7 +751,7 @@ namespace { void operator()( const Reference< XTextComponent >& _rxText ) { - _rxText->setText( ::rtl::OUString() ); + _rxText->setText( OUString() ); } }; @@ -826,7 +826,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons { case FM_ATTR_FILTER: { - ::rtl::OUStringBuffer aFilter; + OUStringBuffer aFilter; OStaticDataAccessTools aStaticTools; Reference<XConnection> xConnection(aStaticTools.getRowSetConnection(Reference< XRowSet>(m_xModelAsIndex, UNO_QUERY))); if (xConnection.is()) @@ -849,7 +849,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( rRow.empty() ) continue; - ::rtl::OUStringBuffer aRowFilter; + OUStringBuffer aRowFilter; for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition ) { // get the field of the controls map @@ -857,9 +857,9 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW ); Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW ); - ::rtl::OUString sFilterValue( condition->second ); + OUString sFilterValue( condition->second ); - ::rtl::OUString sErrorMsg, sCriteria; + OUString sErrorMsg, sCriteria; const ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" ); @@ -923,7 +923,7 @@ void FormController::fillProperties( _rProps.realloc(2); sal_Int32 nPos = 0; Property* pDesc = _rProps.getArray(); - DECL_PROP1(FILTER, rtl::OUString, READONLY); + DECL_PROP1(FILTER, OUString, READONLY); DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY); } @@ -965,13 +965,13 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } //------------------------------------------------------------------------------ -void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException ) +void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) || ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); Reference< XTextComponent > xText( m_aFilterComponents[ _Component ] ); xText->setText( _PredicateExpression ); @@ -990,18 +990,18 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component impl_checkDisposed_throw(); if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY ); } //------------------------------------------------------------------------------ -Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions() throw( RuntimeException ) +Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - Sequence< Sequence< ::rtl::OUString > > aExpressions( m_aFilterRows.size() ); + Sequence< Sequence< OUString > > aExpressions( m_aFilterRows.size() ); sal_Int32 termIndex = 0; for ( FmFilterRows::const_iterator row = m_aFilterRows.begin(); row != m_aFilterRows.end(); @@ -1010,7 +1010,7 @@ Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions( { const FmFilterRow& rRow( *row ); - Sequence< ::rtl::OUString > aConjunction( m_aFilterComponents.size() ); + Sequence< OUString > aConjunction( m_aFilterComponents.size() ); sal_Int32 componentIndex = 0; for ( FilterComponents::const_iterator comp = m_aFilterComponents.begin(); comp != m_aFilterComponents.end(); @@ -1036,7 +1036,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw ( impl_checkDisposed_throw(); if ( ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); // if the to-be-deleted row is our current row, we need to shift if ( _Term == m_nCurrentFilterPosition ) @@ -1096,7 +1096,7 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In impl_checkDisposed_throw(); if ( ( _ActiveTerm < 0 ) || ( _ActiveTerm >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( _ActiveTerm == getActiveTerm() ) return; @@ -1466,7 +1466,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields) && ::comphelper::getBOOL( xField->getPropertyValue(FM_PROP_AUTOINCREMENT ) ) ) { - ::rtl::OUString sServiceName; + OUString sServiceName; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName ); Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY ); replaceControl( xControl, xNewControl ); @@ -1504,7 +1504,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce return; Reference< XTextComponent > xText(e.Source,UNO_QUERY); - ::rtl::OUString aText = xText->getText(); + OUString aText = xText->getText(); if ( m_aFilterRows.empty() ) appendEmptyDisjunctiveTerm(); @@ -1601,7 +1601,7 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept void FormController::impl_checkDisposed_throw() const { if ( impl_isDisposed_nofail() ) - throw DisposedException( ::rtl::OUString(), *const_cast< FormController* >( this ) ); + throw DisposedException( OUString(), *const_cast< FormController* >( this ) ); } //------------------------------------------------------------------------------ @@ -3030,17 +3030,17 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll impl_checkDisposed_throw(); if ( !_ChildController.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message // the parent of our (to-be-)child must be our own model Reference< XFormComponent > xFormOfChild( _ChildController->getModel(), UNO_QUERY ); if ( !xFormOfChild.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message if ( xFormOfChild->getParent() != m_xModelAsIndex ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message m_aChildren.push_back( _ChildController ); @@ -3106,12 +3106,12 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) { Reference< XMultiServiceFactory > xFactory( xConnection, UNO_QUERY_THROW ); m_xComposer.set( - xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), + xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); Reference< XPropertySet > xSet( xForm, UNO_QUERY ); - ::rtl::OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) ); - ::rtl::OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) ); + OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) ); + OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) ); m_xComposer->setElementaryQuery( sStatement ); m_xComposer->setFilter( sFilter ); } @@ -3178,7 +3178,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) try { Reference< XPropertySet > xSet; - ::rtl::OUString aRealName; + OUString aRealName; // first look with the given name if (xQueryColumns->hasByName(pRefValues[j].Name)) @@ -3186,7 +3186,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) xQueryColumns->getByName(pRefValues[j].Name) >>= xSet; // get the RealName - xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName; + xSet->getPropertyValue(OUString("RealName")) >>= aRealName; // compare the condition field name and the RealName if (aCompare(aRealName, pRefValues[j].Name)) @@ -3199,7 +3199,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++) { xColumnsByIndex->getByIndex(n) >>= xSet; - xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName; + xSet->getPropertyValue(OUString("RealName")) >>= aRealName; if (aCompare(aRealName, pRefValues[j].Name)) { // get the column by its alias @@ -3226,22 +3226,22 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) // do we already have the control ? if (aRow.find((*iter).xText) != aRow.end()) { - ::rtl::OUString aCompText = aRow[(*iter).xText]; - aCompText += ::rtl::OUString(" "); - ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND); - aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); - aCompText += ::rtl::OUString(" "); + OUString aCompText = aRow[(*iter).xText]; + aCompText += OUString(" "); + OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND); + aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); + aCompText += OUString(" "); aCompText += ::comphelper::getString(pRefValues[j].Value); aRow[(*iter).xText] = aCompText; } else { - ::rtl::OUString sPredicate,sErrorMsg; + OUString sPredicate,sErrorMsg; pRefValues[j].Value >>= sPredicate; ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(sErrorMsg, sPredicate, xFormatter, xField); if ( xParseNode.is() ) { - ::rtl::OUString sCriteria; + OUString sCriteria; xParseNode->parseNodeToPredicateStr( sCriteria ,xConnection ,xFormatter @@ -3320,7 +3320,7 @@ void FormController::startFiltering() Reference< XModeSelector > xSelector(xControl, UNO_QUERY); if (xSelector.is()) { - xSelector->setMode( ::rtl::OUString( "FilterMode" ) ); + xSelector->setMode( OUString( "FilterMode" ) ); // listening for new controls of the selector Reference< XContainer > xContainer(xSelector, UNO_QUERY); @@ -3446,7 +3446,7 @@ void FormController::stopFiltering() Reference< XModeSelector > xSelector(xControl, UNO_QUERY); if (xSelector.is()) { - xSelector->setMode( ::rtl::OUString( "DataMode" ) ); + xSelector->setMode( OUString( "DataMode" ) ); // listening for new controls of the selector Reference< XContainer > xContainer(xSelector, UNO_QUERY); @@ -3468,7 +3468,7 @@ void FormController::stopFiltering() && ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_SEARCHABLE ) ) ) { - ::rtl::OUString sServiceName; + OUString sServiceName; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName ); Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY ); replaceControl( xControl, xNewControl ); @@ -3498,7 +3498,7 @@ void FormController::stopFiltering() // XModeSelector //------------------------------------------------------------------------------ -void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3526,7 +3526,7 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) +OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3535,30 +3535,30 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - static Sequence< ::rtl::OUString > aModes; + static Sequence< OUString > aModes; if (!aModes.getLength()) { aModes.realloc(2); - ::rtl::OUString* pModes = aModes.getArray(); - pModes[0] = ::rtl::OUString( "DataMode" ); - pModes[1] = ::rtl::OUString( "FilterMode" ); + OUString* pModes = aModes.getArray(); + pModes[0] = OUString( "DataMode" ); + pModes[1] = OUString( "FilterMode" ); } return aModes; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - Sequence< ::rtl::OUString > aModes(getSupportedModes()); - const ::rtl::OUString* pModes = aModes.getConstArray(); + Sequence< OUString > aModes(getSupportedModes()); + const OUString* pModes = aModes.getConstArray(); for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) @@ -3585,7 +3585,7 @@ Window* FormController::getDialogParentWindow() return pParentWindow; } //------------------------------------------------------------------------------ -bool FormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()) +bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()) { try { @@ -3676,7 +3676,7 @@ namespace { try { - static ::rtl::OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); + static OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); // first, check whether the form has a property telling us the answer // this allows people to use the XPropertyContainer interface of a form to control @@ -3698,7 +3698,7 @@ namespace return sal_True; Reference< XPropertySet > xDataSourceSettings( - xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ), + xDataSource->getPropertyValue( OUString( "Settings" ) ), UNO_QUERY_THROW ); sal_Bool bShouldValidate = true; @@ -3739,7 +3739,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent return bValid; // if some of the control models are bound to validators, check them - ::rtl::OUString sInvalidityExplanation; + OUString sInvalidityExplanation; Reference< XControlModel > xInvalidModel; if ( !checkFormComponentValidity( sInvalidityExplanation, xInvalidModel ) ) { @@ -3783,7 +3783,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent continue; String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) ); - sMessage.SearchAndReplace( rtl::OUString('#'), rColInfo.sName ); + sMessage.SearchAndReplace( OUString('#'), rColInfo.sName ); // the control to focus Reference< XControl > xControl( rColInfo.xFirstControlWithInputRequired ); @@ -3986,7 +3986,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& if (xParam.is()) { #ifdef DBG_UTIL - ::rtl::OUString sName; + OUString sName; xParam->getPropertyValue(FM_PROP_NAME) >>= sName; DBG_ASSERT(sName.equals(pFinalValues->Name), "FormController::approveParameter: suspicious value names!"); #endif @@ -4046,7 +4046,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th if ( nLength > 1 ) { sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); - sTitle.SearchAndReplace( rtl::OUString('#'), rtl::OUString::valueOf(nLength) ); + sTitle.SearchAndReplace( OUString('#'), OUString::valueOf(nLength) ); } else sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); @@ -4123,7 +4123,7 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException) //------------------------------------------------------------------------------ Reference< XDispatch > FormController::interceptedQueryDispatch( const URL& aURL, - const ::rtl::OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) + const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 24aed5fa8f04..b86a38100f5e 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -71,7 +71,7 @@ namespace svx { struct FeatureDescription { - ::rtl::OUString sURL; // the URL + OUString sURL; // the URL sal_Int32 nSlotId; // the SFX-compatible slot ID sal_Int16 nFormFeature; // the css.form.runtime.FormFeature ID }; @@ -122,8 +122,8 @@ namespace svx //................................................................ struct MatchFeatureDescriptionByURL : public ::std::unary_function< FeatureDescription, bool > { - const ::rtl::OUString& m_rURL; - MatchFeatureDescriptionByURL( const ::rtl::OUString& _rURL ) :m_rURL( _rURL ) { } + const OUString& m_rURL; + MatchFeatureDescriptionByURL( const OUString& _rURL ) :m_rURL( _rURL ) { } bool operator()( const FeatureDescription& _compare ) { @@ -166,7 +166,7 @@ namespace svx } //-------------------------------------------------------------------- - sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL ) + sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const OUString& _rMainURL ) { const FeatureDescriptions& rDescriptions( getFeatureDescriptions() ); FeatureDescriptions::const_iterator pos = ::std::find_if( rDescriptions.begin(), rDescriptions.end(), MatchFeatureDescriptionByURL( _rMainURL ) ); @@ -325,7 +325,7 @@ namespace svx } //-------------------------------------------------------------------- - void FormControllerHelper::execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const Any& _rParamValue ) const + void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const { Sequence< NamedValue > aArguments(1); aArguments[0].Name = _rParamName; @@ -507,7 +507,7 @@ namespace svx bool bEscapeProcessing( false ); OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ESCAPE_PROCESSING ) >>= bEscapeProcessing ); - ::rtl::OUString sActiveCommand; + OUString sActiveCommand; OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ACTIVECOMMAND ) >>= sActiveCommand ); bool bInsertOnlyForm( false ); diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index d7ac47dab289..cfde37763c31 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -90,7 +90,7 @@ namespace svxform } //------------------------------------------------------------------------------ - Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException) + Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); Reference< XDispatch> xResult; diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 186f1a6f0be0..e15235269925 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -205,7 +205,7 @@ namespace svx void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException)) { if ( m_bDisposed ) - throw DisposedException( ::rtl::OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) ); + throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) ); } //........................................................................ diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 3c08fa690100..e978c9e59933 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -41,7 +41,7 @@ namespace svxform // the layout manager Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY ); if ( xFrameProps.is() ) - xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ) >>= m_xLayouter; + xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= m_xLayouter; } //-------------------------------------------------------------------- @@ -53,7 +53,7 @@ namespace svxform OSL_ENSURE( xManager. is(), "FormToolboxes::toggleToolbox: couldn't obtain the layout manager!" ); if ( xManager. is() ) { - ::rtl::OUString sToolboxResource( getToolboxResourceName( _nSlotId ) ); + OUString sToolboxResource( getToolboxResourceName( _nSlotId ) ); if ( xManager->isElementVisible( sToolboxResource ) ) { xManager->hideElement( sToolboxResource ); @@ -80,7 +80,7 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const + OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const { OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ), "FormToolboxes::getToolboxResourceName: unsupported slot!" ); @@ -91,8 +91,8 @@ namespace svxform else if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) pToolBarName = "formdesign"; - ::rtl::OUString aToolBarResStr( "private:resource/toolbar/" ); - aToolBarResStr += ::rtl::OUString::createFromAscii( pToolBarName ); + OUString aToolBarResStr( "private:resource/toolbar/" ); + aToolBarResStr += OUString::createFromAscii( pToolBarName ); return aToolBarResStr; } diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 90386864cae7..ac6279ea72b3 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -97,9 +97,9 @@ namespace svxform virtual void SAL_CALL activateLast( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); private: const Reference< form::runtime::XFormController > m_xDelegator; @@ -178,16 +178,16 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.svx.LegacyFormController" ); + return OUString( "org.openoffice.comp.svx.LegacyFormController" ); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL LegacyFormController::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); - const ::rtl::OUString* pServices = aServices.getConstArray(); + Sequence< OUString > aServices( getSupportedServiceNames() ); + const OUString* pServices = aServices.getConstArray(); for ( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices ) if( pServices->equals( _serviceName ) ) return sal_True; @@ -195,11 +195,11 @@ namespace svxform } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString( "com.sun.star.form.FormController" ); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); + Sequence< OUString > aServices(2); + aServices.getArray()[0] = OUString( "com.sun.star.form.FormController" ); + aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); return aServices; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 10a3e0ad793d..248428d5805b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -466,7 +466,7 @@ namespace svxform pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular - rtl::OUString fControlName = FM_COMPONENT_HIDDEN; + OUString fControlName = FM_COMPONENT_HIDDEN; NewControl( fControlName, *m_arrCurrentSelection.begin() ); pFormModel->EndUndo(); @@ -1001,7 +1001,7 @@ namespace svxform for (sal_Int32 i=0; i<nCount; ++i) { // neues Control anlegen - rtl::OUString fControlName = FM_COMPONENT_HIDDEN; + OUString fControlName = FM_COMPONENT_HIDDEN; FmControlData* pNewControlData = NewControl( fControlName, _pTargetEntry, sal_False); Reference< XPropertySet > xNewPropSet( pNewControlData->GetPropertySet() ); @@ -1019,7 +1019,7 @@ namespace svxform Property* pAllCurrentProps = seqAllCurrentProps.getArray(); for (sal_Int32 j=0; j<seqAllCurrentProps.getLength(); ++j) { - ::rtl::OUString sCurrentProp = pAllCurrentProps[j].Name; + OUString sCurrentProp = pAllCurrentProps[j].Name; if (((pAllCurrentProps[j].Attributes & PropertyAttribute::READONLY) == 0) && (sCurrentProp != FM_PROP_NAME)) { // (read-only attribs werden natuerlich nicht gesetzt, dito der Name, den hat das NewControl schon eindeutig // festgelegt) @@ -1372,7 +1372,7 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // Namen setzen - ::rtl::OUString aName = GenerateName(pNewFormData); + OUString aName = GenerateName(pNewFormData); pNewFormData->SetText(aName); Reference< XPropertySet > xPropertySet(xNewForm, UNO_QUERY); @@ -1414,7 +1414,7 @@ namespace svxform } //------------------------------------------------------------------------ - FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) + FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewControl" ); ////////////////////////////////////////////////////////////////////// @@ -1441,7 +1441,7 @@ namespace svxform SdrPageView* pPageView = pFormView->GetSdrPageView(); FmFormPage* pPage = (FmFormPage*)pPageView->GetPage(); - ::rtl::OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); + OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); pNewFormControlData->SetText( sName ); @@ -1463,11 +1463,11 @@ namespace svxform } //------------------------------------------------------------------------ - ::rtl::OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) + OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::GenerateName" ); const sal_uInt16 nMaxCount = 99; - ::rtl::OUString aNewName; + OUString aNewName; ////////////////////////////////////////////////////////////////////// // BasisNamen erzeugen @@ -1486,8 +1486,8 @@ namespace svxform aNewName = aBaseName; if( i>0 ) { - aNewName += ::rtl::OUString(" "); - aNewName += ::rtl::OUString::valueOf(i).getStr(); + aNewName += OUString(" "); + aNewName += OUString::valueOf(i).getStr(); } if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL ) @@ -1498,7 +1498,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) + sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" ); if (EditingCanceled()) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 75ce4f9be5c6..4187473ef9b3 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -92,7 +92,7 @@ namespace svxform if( pEntryData ) { - ::rtl::OUString aNewName = ::comphelper::getString(evt.NewValue); + OUString aNewName = ::comphelper::getString(evt.NewValue); pEntryData->SetText( aNewName ); FmNavNameChangedHint aNameChangedHint( pEntryData, aNewName ); m_pNavModel->Broadcast( aNameChangedHint ); @@ -307,7 +307,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } @@ -406,7 +406,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } } @@ -689,7 +689,7 @@ namespace svxform } //------------------------------------------------------------------------ - FmEntryData* NavigatorTreeModel::FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs ) + FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FindData" ); FmEntryDataList* pDataList; @@ -698,7 +698,7 @@ namespace svxform else pDataList = pParentData->GetChildList(); - ::rtl::OUString aEntryText; + OUString aEntryText; FmEntryData* pEntryData; FmEntryData* pChildData; @@ -948,7 +948,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ) + sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Rename" ); ////////////////////////////////////////////////////////////////////// diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index fe40442292d5..6db70cd93e95 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -55,32 +55,32 @@ namespace svxform return m_xPropertySet->getPropertySetInfo(); } - void DataColumn::setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + void DataColumn::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { m_xPropertySet->setPropertyValue(aPropertyName, aValue); } - Any DataColumn::getPropertyValue(const ::rtl::OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + Any DataColumn::getPropertyValue(const OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { return m_xPropertySet->getPropertyValue(PropertyName); } - void DataColumn::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::addPropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener); } - void DataColumn::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::removePropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener); } - void DataColumn::addVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->addVetoableChangeListener(PropertyName, aListener); } - void DataColumn::removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener); } @@ -91,7 +91,7 @@ namespace svxform return m_xColumn->wasNull(); } - ::rtl::OUString DataColumn::getString() throw( SQLException, RuntimeException ) + OUString DataColumn::getString() throw( SQLException, RuntimeException ) { return m_xColumn->getString(); } @@ -227,7 +227,7 @@ namespace svxform m_xColumnUpdate->updateDouble(x); } - void DataColumn::updateString(const ::rtl::OUString& x) throw( SQLException, RuntimeException ) + void DataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) { m_xColumnUpdate->updateString(x); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index a7d96f60ef0f..a7af1eca6015 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -75,16 +75,16 @@ using namespace ::svx; struct ColumnInfo { - ::rtl::OUString sColumnName; - ::rtl::OUString sLabel; + OUString sColumnName; + OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { @@ -93,13 +93,13 @@ struct ColumnInfo static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) @@ -254,7 +254,7 @@ sal_Bool FmFieldWin::createSelectionControls( ) aDescr[ daCommand ] <<= GetObjectName(); aDescr[ daCommandType ] <<= GetObjectType(); ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData()); - aDescr[ daColumnName ] <<= pInfo->sColumnName;//::rtl::OUString( pListBox->GetEntryText( pSelected) ); + aDescr[ daColumnName ] <<= pInfo->sColumnName;//OUString( pListBox->GetEntryText( pSelected) ); // transfer this to the SFX world SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 7a6dcd4fd59c..8819e8067781 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,10 +85,10 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "Position" ); + aArgs[0].Name = OUString( "Position" ); aPositionParam.QueryValue( a ); aArgs[0].Value = a; - m_pController->Dispatch( rtl::OUString( ".uno:AbsoluteRecord" ), + m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ), aArgs ); m_pController->updateStatus(); @@ -191,8 +191,8 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { // set a new image, matching to this slot - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlot )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; @@ -238,7 +238,7 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) if ( SlotToCommands[n].nSlotId > 0 ) { Sequence< PropertyValue > aArgs; - Dispatch( rtl::OUString::createFromAscii( SlotToCommands[n].pCommand ), + Dispatch( OUString::createFromAscii( SlotToCommands[n].pCommand ), aArgs ); } } diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index ec085745639a..c16e67ed5d14 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -50,17 +50,17 @@ namespace svxform } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() + Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { ::comphelper::StringSequence aSupported( 1 ); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); + aSupported.getArray()[0] = OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); return aSupported; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName() + OUString SAL_CALL OAddConditionDialog_GetImplementationName() { - return ::rtl::OUString("org.openoffice.comp.svx.OAddConditionDialog"); + return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } //==================================================================== @@ -71,7 +71,7 @@ namespace svxform :OAddConditionDialogBase( _rxORB ) { registerProperty( - ::rtl::OUString( "Binding" ), + OUString( "Binding" ), PROPERTY_ID_BINDING, PropertyAttribute::TRANSIENT, &m_xBinding, @@ -79,7 +79,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "FacetName" ), + OUString( "FacetName" ), PROPERTY_ID_FACET_NAME, PropertyAttribute::TRANSIENT, &m_sFacetName, @@ -87,7 +87,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "ConditionValue" ), + OUString( "ConditionValue" ), PROPERTY_ID_CONDITION_VALUE, PropertyAttribute::TRANSIENT, &m_sConditionValue, @@ -95,7 +95,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "FormModel" ), + OUString( "FormModel" ), PROPERTY_ID_FORM_MODEL, PropertyAttribute::TRANSIENT, &m_xWorkModel, @@ -126,13 +126,13 @@ namespace svxform } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException) { return OAddConditionDialog_GetImplementationName(); } //------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException) { return OAddConditionDialog_GetSupportedServiceNames(); } @@ -161,7 +161,7 @@ namespace svxform Dialog* OAddConditionDialog::createDialog(Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding ); } diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 12981a04d891..1c505c797c81 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -144,13 +144,13 @@ sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<St return FillObjList( pGal->GetThemeName( nThemeId ), rObjList ); } -bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::OUString> &rObjList ) +bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ) { std::vector<String> aObjList; if (!FillObjList(nThemeId, aObjList)) return false; - std::vector<rtl::OUString> aList; + std::vector<OUString> aList; aList.reserve(aObjList.size()); std::vector<String>::const_iterator it = aObjList.begin(), itEnd = aObjList.end(); for (; it != itEnd; ++it) @@ -162,7 +162,7 @@ bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::O // ------------------------------------------------------------------------ -sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ) +sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ) { Gallery* pGal = ImplGetGallery(); if( pGal ) @@ -177,7 +177,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect SgaObject* pObj = pTheme->AcquireObject( i ); if ( pObj ) { - rtl::OUString aTitle( pObj->GetTitle() ); + OUString aTitle( pObj->GetTitle() ); rList.push_back( aTitle ); pTheme->ReleaseObject( pObj ); } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4baf9166a6c3..7adec4461277 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -99,7 +99,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) +void GalleryThemeEntry::SetName( const OUString& rNewName ) { if( aName != rNewName ) { @@ -127,9 +127,9 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rtl::OUString(), RTL_TEXTENCODING_UTF8); //aImportName + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, OUString(), RTL_TEXTENCODING_UTF8); //aImportName - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); return rOut; } @@ -170,7 +170,7 @@ public: // - Gallery - // ----------- -Gallery::Gallery( const rtl::OUString& rMultiPath ) +Gallery::Gallery( const OUString& rMultiPath ) : nReadTextEncoding ( osl_getThreadTextEncoding() ) , nLastFileNumber ( 0 ) , bMultiPath ( sal_False ) @@ -213,7 +213,7 @@ Gallery* Gallery::GetGalleryInstance() // ------------------------------------------------------------------------ -void Gallery::ImplLoad( const rtl::OUString& rMultiPath ) +void Gallery::ImplLoad( const OUString& rMultiPath ) { const sal_Int32 nTokenCount = comphelper::string::getTokenCount(rMultiPath, ';'); sal_Bool bIsReadOnlyDir; @@ -301,10 +301,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( xContentAccess.is() ) { - static const ::rtl::OUString s_sTitle("Title"); - static const ::rtl::OUString s_sIsReadOnly("IsReadOnly"); - static const ::rtl::OUString s_sSDG_EXT("sdg"); - static const ::rtl::OUString s_sSDV_EXT("sdv"); + static const OUString s_sTitle("Title"); + static const OUString s_sIsReadOnly("IsReadOnly"); + static const OUString s_sSDG_EXT("sdg"); + static const OUString s_sSDV_EXT("sdv"); while( xResultSet->next() ) { @@ -443,7 +443,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName ) { GalleryThemeEntry* pFound = NULL; @@ -459,7 +459,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) // ------------------------------------------------------------------------ -rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -473,7 +473,7 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const // try fallback, if no entry was found if( !pFound ) { - rtl::OString aFallback; + OString aFallback; switch( nThemeId ) { @@ -502,10 +502,10 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const break; } - pFound = const_cast<Gallery*>(this)->ImplGetThemeEntry(rtl::OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); + pFound = const_cast<Gallery*>(this)->ImplGetThemeEntry(OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); } - return( pFound ? pFound->GetThemeName() : rtl::OUString() ); + return( pFound ? pFound->GetThemeName() : OUString() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index fc6834fa3673..b22091e086db 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -398,7 +398,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( xMgr.is() ) { uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( - ::rtl::OUString("com.sun.star.awt.XProgressMonitor") ), + OUString("com.sun.star.awt.XProgressMonitor") ), uno::UNO_QUERY ); if ( xMonitor.is() ) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 4fdc2bc3aeb4..6ef09c95adbe 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -177,7 +177,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); aURL = INetURLObject(aTmpStr); } @@ -196,7 +196,7 @@ const String SgaObject::GetTitle() const if ( aPrivateInd.EqualsAscii( "private" ) && aResourceName.Len() && ( nResId > 0 ) && ( nResId < 0x10000 ) ) { - rtl::OString aMgrName(rtl::OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); + OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); ResMgr* pResMgr = ResMgr::CreateResMgr( aMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ); if ( pResMgr ) @@ -285,7 +285,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); //dummy write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 952898b9cf22..44188f1f2d18 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -711,8 +711,8 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pIStm); - aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pIStm); + aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren if( nVersion >= 0x0004 ) @@ -1241,7 +1241,7 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aLocalURL; + OUString aLocalURL; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aLocalURL ) ) aURL = INetURLObject( aLocalURL ); @@ -1411,7 +1411,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) rtl_TextEncoding nTextEncoding; rIStm >> nVersion; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1423,7 +1423,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) else nTextEncoding = RTL_TEXTENCODING_UTF8; - aThemeName = rtl::OStringToOUString(aTmpStr, nTextEncoding); + aThemeName = OStringToOUString(aTmpStr, nTextEncoding); if( nCount <= ( 1L << 14 ) ) { @@ -1451,11 +1451,11 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt16 nTemp; rIStm >> bRel; - rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aTempFileName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; - aFileName = rtl::OStringToOUString(aTempFileName, osl_getThreadTextEncoding()); + aFileName = OStringToOUString(aTempFileName, osl_getThreadTextEncoding()); if( bRel ) { @@ -1493,7 +1493,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) } else { - rtl::OUString aLocalURL; + OUString aLocalURL; pObj->aURL = INetURLObject( aFileName ); @@ -1557,7 +1557,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } -const rtl::OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } +const OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } @@ -1567,7 +1567,7 @@ sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFrom sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } -const rtl::OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); } +const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 346ace097ea4..b85380143f66 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; -typedef ::std::list<rtl::OUString> FileNameList; +typedef ::std::list<OUString> FileNameList; class GalApp : public Application { @@ -79,7 +79,7 @@ protected: void Init(); }; -Gallery* createGallery( const rtl::OUString& aGalleryURL ) +Gallery* createGallery( const OUString& aGalleryURL ) { return new Gallery( aGalleryURL ); } @@ -89,9 +89,9 @@ void disposeGallery( Gallery* pGallery ) delete pGallery; } -static void createTheme( rtl::OUString aThemeName, - rtl::OUString aGalleryURL, - rtl::OUString aDestDir, +static void createTheme( OUString aThemeName, + OUString aGalleryURL, + OUString aDestDir, sal_uInt32 nNumFrom, FileNameList &rFiles ) { @@ -99,11 +99,11 @@ static void createTheme( rtl::OUString aThemeName, if (!pGallery ) { fprintf( stderr, "Could't acquire '%s'\n", - rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); exit( 1 ); } fprintf( stderr, "Work on gallery '%s'\n", - rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); fprintf( stderr, "Existing themes: %lu\n", sal::static_int_cast< unsigned long >( @@ -131,7 +131,7 @@ static void createTheme( rtl::OUString aThemeName, } fprintf( stderr, "Using DestDir: %s\n", - rtl::OUStringToOString(aDestDir, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aDestDir, RTL_TEXTENCODING_UTF8).getStr() ); pGalTheme->SetDestDir(String(aDestDir)); FileNameList::const_iterator aIter; @@ -146,10 +146,10 @@ static void createTheme( rtl::OUString aThemeName, if ( ! pGalTheme->InsertURL( *aIter ) ) fprintf( stderr, "Failed to import '%s'\n", - rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); else fprintf( stderr, "Imported file '%s' (%lu)\n", - rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), sal::static_int_cast< unsigned long >( pGalTheme->GetObjectCount() ) ); } @@ -178,7 +178,7 @@ static void PrintHelp() fprintf( stdout, "\t\t\tare required.\n"); } -static rtl::OUString Smartify( const rtl::OUString &rPath ) +static OUString Smartify( const OUString &rPath ) { INetURLObject aURL; aURL.SetSmartURL( rPath ); @@ -188,7 +188,7 @@ static rtl::OUString Smartify( const rtl::OUString &rPath ) void GalApp::Init() { if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { - rtl::OUString fileName = GetAppFileName(); + OUString fileName = GetAppFileName(); int lastSlash = fileName.lastIndexOf( '/' ); #ifdef WNT // Don't know which directory separators GetAppFileName() returns on Windows. @@ -196,10 +196,10 @@ void GalApp::Init() if( fileName.lastIndexOf( '\\' ) > lastSlash ) lastSlash = fileName.lastIndexOf( '\\' ); #endif - rtl::OUString baseBinDir = fileName.copy( 0, lastSlash ); - rtl::OUString installPrefix = baseBinDir + rtl::OUString("/../.."); + OUString baseBinDir = fileName.copy( 0, lastSlash ); + OUString installPrefix = baseBinDir + OUString("/../.."); - rtl::OUString envVar("OOO_INSTALL_PREFIX"); + OUString envVar("OOO_INSTALL_PREFIX"); osl_setEnvironment(envVar.pData, installPrefix.pData); } OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) ); @@ -220,14 +220,14 @@ void GalApp::Init() int GalApp::Main() { bool bHelp = false; - rtl::OUString aPath, aDestDir; - rtl::OUString aName("Default name"); + OUString aPath, aDestDir; + OUString aName("Default name"); sal_uInt32 nNumFrom = 0; FileNameList aFiles; for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index bfe358b18c9b..70d5c3e1296b 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -70,8 +70,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -100,9 +100,9 @@ public: virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); void Invalidate(); void NotifyFocusListeners(sal_Bool bGetFocus); diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index bebe0520e0d3..dd6e40d2675f 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -86,8 +86,8 @@ public: SvxGraphCtrlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ); @@ -127,8 +127,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); @@ -142,9 +142,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== @@ -152,7 +152,7 @@ public: //===== XServiceName ==================================================== - virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleSelection ============================================= @@ -223,11 +223,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// map of accessible shapes struct SdrObjectCompareLess diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index d9abdb9a30cf..b389e5909092 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -64,8 +64,8 @@ namespace svx 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); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -145,8 +145,8 @@ namespace svx 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); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -157,8 +157,8 @@ namespace svx // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ namespace svx 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); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 1d05ad23fb9d..e12630733add 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -375,7 +375,7 @@ namespace svxform HelpButton m_aHelpBtn; Timer m_aResultTimer; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; @@ -387,7 +387,7 @@ namespace svxform public: AddConditionDialog( Window* pParent, - const ::rtl::OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); + const OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); ~AddConditionDialog(); inline XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } @@ -405,7 +405,7 @@ namespace svxform class NamespaceItemDialog : public ModalDialog { private: - typedef std::vector< ::rtl::OUString > PrefixList; + typedef std::vector< OUString > PrefixList; FixedText m_aNamespacesFT; SvxSimpleTableContainer m_aNamespacesListContainer; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 94f12a5820c4..1c0358003830 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -38,35 +38,35 @@ #include <com/sun/star/lang/XComponent.hpp> -#define RECOVERY_CMDPART_PROTOCOL rtl::OUString( "vnd.sun.star.autorecovery:") - -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString( "/doEmergencySave" ) -#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString( "/doAutoRecovery" ) -#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString( "/doCrashReport" ) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") -#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) -#define RECOVERY_CMD_DO_RECOVERY rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) -#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) - -#define PROP_STATUSINDICATOR rtl::OUString( "StatusIndicator" ) -#define PROP_DISPATCHASYNCHRON rtl::OUString( "DispatchAsynchron") -#define PROP_SAVEPATH rtl::OUString( "SavePath" ) -#define PROP_ENTRYID rtl::OUString( "EntryID" ) - -#define STATEPROP_ID rtl::OUString( "ID" ) -#define STATEPROP_STATE rtl::OUString( "DocumentState") -#define STATEPROP_ORGURL rtl::OUString( "OriginalURL" ) -#define STATEPROP_TEMPURL rtl::OUString( "TempURL" ) -#define STATEPROP_FACTORYURL rtl::OUString( "FactoryURL" ) -#define STATEPROP_TEMPLATEURL rtl::OUString( "TemplateURL" ) -#define STATEPROP_TITLE rtl::OUString( "Title" ) -#define STATEPROP_MODULE rtl::OUString( "Module" ) - -#define RECOVERY_OPERATIONSTATE_START rtl::OUString( "start" ) -#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString( "stop" ) -#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString( "update") +#define RECOVERY_CMDPART_PROTOCOL OUString( "vnd.sun.star.autorecovery:") + +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE OUString( "/doEmergencySave" ) +#define RECOVERY_CMDPART_DO_RECOVERY OUString( "/doAutoRecovery" ) +#define RECOVERY_CMDPART_DO_CRASHREPORT OUString( "/doCrashReport" ) + +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") +#define RECOVERY_CMD_DO_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) +#define RECOVERY_CMD_DO_RECOVERY OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) +#define RECOVERY_CMD_DO_ENTRY_BACKUP OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) + +#define PROP_STATUSINDICATOR OUString( "StatusIndicator" ) +#define PROP_DISPATCHASYNCHRON OUString( "DispatchAsynchron") +#define PROP_SAVEPATH OUString( "SavePath" ) +#define PROP_ENTRYID OUString( "EntryID" ) + +#define STATEPROP_ID OUString( "ID" ) +#define STATEPROP_STATE OUString( "DocumentState") +#define STATEPROP_ORGURL OUString( "OriginalURL" ) +#define STATEPROP_TEMPURL OUString( "TempURL" ) +#define STATEPROP_FACTORYURL OUString( "FactoryURL" ) +#define STATEPROP_TEMPLATEURL OUString( "TemplateURL" ) +#define STATEPROP_TITLE OUString( "Title" ) +#define STATEPROP_MODULE OUString( "Module" ) + +#define RECOVERY_OPERATIONSTATE_START OUString( "start" ) +#define RECOVERY_OPERATIONSTATE_STOP OUString( "stop" ) +#define RECOVERY_OPERATIONSTATE_UPDATE OUString( "update") #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 @@ -125,22 +125,22 @@ struct TURLInfo sal_Int32 ID; /// the full qualified document URL - ::rtl::OUString OrgURL; + OUString OrgURL; /// the full qualified URL of the temp. file (if it's exists) - ::rtl::OUString TempURL; + OUString TempURL; /// a may be existing factory URL (e.g. for untitled documents) - ::rtl::OUString FactoryURL; + OUString FactoryURL; /// may be the document base on a template file !? - ::rtl::OUString TemplateURL; + OUString TemplateURL; /// the pure file name, without path, disc etcpp. - ::rtl::OUString DisplayName; + OUString DisplayName; /// the application module, where this document was loaded - ::rtl::OUString Module; + OUString Module; /// state info as e.g. VALID, CORRUPTED, NON EXISTING ... sal_Int32 DocState; @@ -243,8 +243,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ static bool isBrokenTempEntry(const TURLInfo& rInfo); - virtual void saveBrokenTempEntries(const ::rtl::OUString& sSaveDir); - virtual void saveAllTempEntries(const ::rtl::OUString& sSaveDir); + virtual void saveBrokenTempEntries(const OUString& sSaveDir); + virtual void saveAllTempEntries(const OUString& sSaveDir); virtual void forgetBrokenTempEntries(); virtual void forgetAllRecoveryEntries(); void forgetBrokenRecoveryEntries(); @@ -295,7 +295,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ - css::util::URL impl_getParsedURL(const ::rtl::OUString& sURL); + css::util::URL impl_getParsedURL(const OUString& sURL); }; //=============================================== @@ -346,14 +346,14 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat //--------------------------------------- // XStatusIndicator - virtual void SAL_CALL start(const ::rtl::OUString& sText , + virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); virtual void SAL_CALL end() throw(css::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& sText) + virtual void SAL_CALL setText(const OUString& sText) throw(css::uno::RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) @@ -696,7 +696,7 @@ class BrokenRecoveryDialog : public ModalDialog OKButton m_aOkBtn; CancelButton m_aCancelBtn; - ::rtl::OUString m_sSavePath; + OUString m_sSavePath; RecoveryCore* m_pCore; bool m_bBeforeRecovery; sal_Bool m_bExecutionNeeded; @@ -721,7 +721,7 @@ class BrokenRecoveryDialog : public ModalDialog //--------------------------------------- /** @short TODO */ - virtual ::rtl::OUString getSaveDirURL(); + virtual OUString getSaveDirURL(); //------------------------------------------- // helper diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index aeaee7408cc1..79d01cc59ea4 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -60,19 +60,19 @@ class FmFilterData { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; FmParentData* m_pParent; - ::rtl::OUString m_aText; + OUString m_aText; public: TYPEINFO(); - FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const ::rtl::OUString& rText = ::rtl::OUString()) + FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const OUString& rText = OUString()) :m_xORB( _rxFactory ) ,m_pParent( pParent ) ,m_aText( rText ) {} virtual ~FmFilterData(){} - void SetText( const ::rtl::OUString& rText ){ m_aText = rText; } - ::rtl::OUString GetText() const { return m_aText; } + void SetText( const OUString& rText ){ m_aText = rText; } + OUString GetText() const { return m_aText; } FmParentData* GetParent() const {return m_pParent;} virtual Image GetImage() const; @@ -86,7 +86,7 @@ protected: public: TYPEINFO(); - FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const ::rtl::OUString& rText) + FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const OUString& rText) : FmFilterData(_rxFactory,pParent, rText) {} virtual ~FmParentData(); @@ -106,7 +106,7 @@ public: FmFormItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController, - const ::rtl::OUString& _rText) + const OUString& _rText) :FmParentData( _rxFactory, _pParent, _rText ) ,m_xController( _xController ) ,m_xFilterController( _xController, ::com::sun::star::uno::UNO_QUERY_THROW ) @@ -127,8 +127,8 @@ class FmFilterItems : public FmParentData { public: TYPEINFO(); - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){} - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, OUString()){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const OUString& rText ):FmParentData(_rxFactory,pParent, rText){} FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const; virtual Image GetImage() const; @@ -137,7 +137,7 @@ public: //======================================================================== class FmFilterItem : public FmFilterData { - ::rtl::OUString m_aFieldName; + OUString m_aFieldName; const sal_Int32 m_nComponentIndex; public: @@ -145,12 +145,12 @@ public: FmFilterItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, FmFilterItems* pParent, - const ::rtl::OUString& aFieldName, - const ::rtl::OUString& aCondition, + const OUString& aFieldName, + const OUString& aCondition, const sal_Int32 _nComponentIndex ); - const ::rtl::OUString& GetFieldName() const {return m_aFieldName;} + const OUString& GetFieldName() const {return m_aFieldName;} sal_Int32 GetComponentIndex() const { return m_nComponentIndex; } virtual Image GetImage() const; @@ -178,7 +178,7 @@ public: void Clear(); sal_Bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const; void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); - void SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText); + void SetTextForItem(FmFilterItem* pItem, const OUString& rText); FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? (FmFormItem*)m_pCurrentItems->GetParent() : NULL;} FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} @@ -278,7 +278,7 @@ protected: virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 2d8c72393058..50ef095c47aa 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -45,7 +45,7 @@ class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem { sal_Bool m_bInitialStateChange; bool m_bInStateChange; - ::rtl::OUString m_sLastActivePage; + OUString m_sLastActivePage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xInspectorContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > @@ -73,7 +73,7 @@ protected: void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); bool implIsReadOnlyModel() const; - ::rtl::OUString getCurrentPage() const; + OUString getCurrentPage() const; public: FmPropBrw( diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 39251abcd023..a7caef5bbf8c 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -97,7 +97,7 @@ namespace svxform struct ControlData : public BorderDescriptor, UnderlineDescriptor { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; - ::rtl::OUString sOriginalHelpText; + OUString sOriginalHelpText; ControlData() : BorderDescriptor() { } ControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) @@ -109,7 +109,7 @@ namespace svxform BorderDescriptor::clear(); UnderlineDescriptor::clear(); xControl.clear(); - sOriginalHelpText = ::rtl::OUString(); + sOriginalHelpText = OUString(); } }; diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index f28f23926992..9558e2124ee3 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -61,10 +61,10 @@ namespace svxform ) SAL_THROW(()); static DocumentType getDocumentTypeForModuleIdentifier( - const ::rtl::OUString& _rModuleIdentifier + const OUString& _rModuleIdentifier ); - static ::rtl::OUString getModuleIdentifierForDocumentType( + static OUString getModuleIdentifierForDocumentType( DocumentType _eType ); }; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index d3510b5a3939..1b20fe4f666d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -105,15 +105,15 @@ public: class FmNavNameChangedHint : public SfxHint { FmEntryData* pEntryData; - ::rtl::OUString aNewName; + OUString aNewName; public: TYPEINFO(); - FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName ); + FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ); virtual ~FmNavNameChangedHint(); FmEntryData* GetEntryData() const { return pEntryData; } - ::rtl::OUString GetNewName() const { return aNewName; } + OUString GetNewName() const { return aNewName; } }; //======================================================================== @@ -148,7 +148,7 @@ private: protected: Image m_aNormalImage; - ::rtl::OUString aText; + OUString aText; FmEntryDataList* pChildList; FmEntryData* pParent; @@ -164,12 +164,12 @@ public: virtual ~FmEntryData(); void Clear(); - void SetText( const ::rtl::OUString& rText ){ aText = rText; } + void SetText( const OUString& rText ){ aText = rText; } void SetParent( FmEntryData* pParentData ){ pParent = pParentData; } const Image& GetNormalImage() const { return m_aNormalImage; } - ::rtl::OUString GetText() const { return aText; } + OUString GetText() const { return aText; } FmEntryData* GetParent() const { return pParent; } FmEntryDataList* GetChildList() const { return pChildList; } @@ -390,7 +390,7 @@ namespace svxform sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); - sal_Bool Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ); + sal_Bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); void Clear(); void SetModified( sal_Bool bMod=sal_True ); @@ -399,7 +399,7 @@ namespace svxform FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormPage* GetFormPage() const { return m_pFormPage; } FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True ); - FmEntryData* FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); + FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); FmEntryDataList* GetRootList() const { return m_pRootList; } ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); @@ -454,7 +454,7 @@ namespace svxform void UpdateContent(); - FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); + FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvTreeListEntry* pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); @@ -521,12 +521,12 @@ namespace svxform sal_Bool IsFormEntry( SvTreeListEntry* pEntry ); sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry ); - ::rtl::OUString GenerateName( FmEntryData* pEntryData ); + OUString GenerateName( FmEntryData* pEntryData ); NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 608d6d1b8a80..5bbd02aa01ec 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -44,7 +44,7 @@ class FmFormObj: public SdrUnoObj // only to be used for comparison with the current ref device! public: - SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName); + SVX_DLLPUBLIC FmFormObj(const OUString& rModelName); SVX_DLLPUBLIC FmFormObj(); TYPEINFO(); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6fac27514003..db53cc09bf8c 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -81,8 +81,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findPlaceInFormComponentHierarchy( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& rContent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>(), - const ::rtl::OUString& rDBTitle = ::rtl::OUString(), - const ::rtl::OUString& rCursorSource = ::rtl::OUString(), + const OUString& rDBTitle = OUString(), + const OUString& rCursorSource = OUString(), sal_Int32 nCommandType = 0 ); @@ -110,12 +110,12 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findFormForDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& rForm, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase, - const ::rtl::OUString& rCommand, + const OUString& rCommand, sal_Int32 nCommandType ); public: - ::rtl::OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 9c498f250263..4719360bab20 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -21,55 +21,55 @@ #include <svx/svxdllapi.h> -#define FM_COMPONENT_EDIT rtl::OUString( "stardiv.one.form.component.Edit" ) -#define FM_COMPONENT_TEXTFIELD rtl::OUString( "stardiv.one.form.component.TextField" ) -#define FM_COMPONENT_LISTBOX rtl::OUString( "stardiv.one.form.component.ListBox" ) -#define FM_COMPONENT_COMBOBOX rtl::OUString( "stardiv.one.form.component.ComboBox" ) -#define FM_COMPONENT_RADIOBUTTON rtl::OUString( "stardiv.one.form.component.RadioButton" ) -#define FM_COMPONENT_GROUPBOX rtl::OUString( "stardiv.one.form.component.GroupBox" ) -#define FM_COMPONENT_FIXEDTEXT rtl::OUString( "stardiv.one.form.component.FixedText" ) -#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( "stardiv.one.form.component.CommandButton" ) -#define FM_COMPONENT_CHECKBOX rtl::OUString( "stardiv.one.form.component.CheckBox" ) -#define FM_COMPONENT_GRID rtl::OUString( "stardiv.one.form.component.Grid" ) -#define FM_COMPONENT_GRIDCONTROL rtl::OUString( "stardiv.one.form.component.GridControl" ) -#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( "stardiv.one.form.component.ImageButton" ) -#define FM_COMPONENT_FILECONTROL rtl::OUString( "stardiv.one.form.component.FileControl" ) -#define FM_COMPONENT_TIMEFIELD rtl::OUString( "stardiv.one.form.component.TimeField" ) -#define FM_COMPONENT_DATEFIELD rtl::OUString( "stardiv.one.form.component.DateField" ) -#define FM_COMPONENT_NUMERICFIELD rtl::OUString( "stardiv.one.form.component.NumericField" ) -#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( "stardiv.one.form.component.CurrencyField" ) -#define FM_COMPONENT_PATTERNFIELD rtl::OUString( "stardiv.one.form.component.PatternField" ) -#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( "stardiv.one.form.component.FormattedField" ) -#define FM_COMPONENT_HIDDEN rtl::OUString( "stardiv.one.form.component.Hidden" ) -#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( "stardiv.one.form.component.HiddenControl" ) -#define FM_COMPONENT_IMAGECONTROL rtl::OUString( "stardiv.one.form.component.ImageControl" ) -#define FM_CONTROL_GRID rtl::OUString( "stardiv.one.form.control.Grid" ) -#define FM_CONTROL_GRIDCONTROL rtl::OUString( "stardiv.one.form.control.GridControl" ) -#define SRV_SDB_CONNECTION rtl::OUString( "com.sun.star.sdb.Connection" ) -#define FM_SUN_COMPONENT_FORM rtl::OUString( "com.sun.star.form.component.Form" ) -#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( "com.sun.star.form.component.TextField" ) -#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( "com.sun.star.form.component.ListBox" ) -#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( "com.sun.star.form.component.ComboBox" ) -#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( "com.sun.star.form.component.RadioButton" ) -#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( "com.sun.star.form.component.GroupBox" ) -#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( "com.sun.star.form.component.FixedText" ) -#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( "com.sun.star.form.component.CommandButton" ) -#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( "com.sun.star.form.component.CheckBox" ) -#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( "com.sun.star.form.component.GridControl" ) -#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( "com.sun.star.form.component.ImageButton" ) -#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( "com.sun.star.form.component.FileControl" ) -#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( "com.sun.star.form.component.TimeField" ) -#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( "com.sun.star.form.component.DateField" ) -#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( "com.sun.star.form.component.NumericField" ) -#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( "com.sun.star.form.component.CurrencyField" ) -#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( "com.sun.star.form.component.PatternField" ) -#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( "com.sun.star.form.component.HiddenControl" ) -#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" ) -#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" ) -#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( "com.sun.star.form.component.ScrollBar" ) -#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( "com.sun.star.form.component.SpinButton" ) -#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( "com.sun.star.form.component.NavigationToolBar" ) -#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( "com.sun.star.form.control.GridControl" ) +#define FM_COMPONENT_EDIT OUString( "stardiv.one.form.component.Edit" ) +#define FM_COMPONENT_TEXTFIELD OUString( "stardiv.one.form.component.TextField" ) +#define FM_COMPONENT_LISTBOX OUString( "stardiv.one.form.component.ListBox" ) +#define FM_COMPONENT_COMBOBOX OUString( "stardiv.one.form.component.ComboBox" ) +#define FM_COMPONENT_RADIOBUTTON OUString( "stardiv.one.form.component.RadioButton" ) +#define FM_COMPONENT_GROUPBOX OUString( "stardiv.one.form.component.GroupBox" ) +#define FM_COMPONENT_FIXEDTEXT OUString( "stardiv.one.form.component.FixedText" ) +#define FM_COMPONENT_COMMANDBUTTON OUString( "stardiv.one.form.component.CommandButton" ) +#define FM_COMPONENT_CHECKBOX OUString( "stardiv.one.form.component.CheckBox" ) +#define FM_COMPONENT_GRID OUString( "stardiv.one.form.component.Grid" ) +#define FM_COMPONENT_GRIDCONTROL OUString( "stardiv.one.form.component.GridControl" ) +#define FM_COMPONENT_IMAGEBUTTON OUString( "stardiv.one.form.component.ImageButton" ) +#define FM_COMPONENT_FILECONTROL OUString( "stardiv.one.form.component.FileControl" ) +#define FM_COMPONENT_TIMEFIELD OUString( "stardiv.one.form.component.TimeField" ) +#define FM_COMPONENT_DATEFIELD OUString( "stardiv.one.form.component.DateField" ) +#define FM_COMPONENT_NUMERICFIELD OUString( "stardiv.one.form.component.NumericField" ) +#define FM_COMPONENT_CURRENCYFIELD OUString( "stardiv.one.form.component.CurrencyField" ) +#define FM_COMPONENT_PATTERNFIELD OUString( "stardiv.one.form.component.PatternField" ) +#define FM_COMPONENT_FORMATTEDFIELD OUString( "stardiv.one.form.component.FormattedField" ) +#define FM_COMPONENT_HIDDEN OUString( "stardiv.one.form.component.Hidden" ) +#define FM_COMPONENT_HIDDENCONTROL OUString( "stardiv.one.form.component.HiddenControl" ) +#define FM_COMPONENT_IMAGECONTROL OUString( "stardiv.one.form.component.ImageControl" ) +#define FM_CONTROL_GRID OUString( "stardiv.one.form.control.Grid" ) +#define FM_CONTROL_GRIDCONTROL OUString( "stardiv.one.form.control.GridControl" ) +#define SRV_SDB_CONNECTION OUString( "com.sun.star.sdb.Connection" ) +#define FM_SUN_COMPONENT_FORM OUString( "com.sun.star.form.component.Form" ) +#define FM_SUN_COMPONENT_TEXTFIELD OUString( "com.sun.star.form.component.TextField" ) +#define FM_SUN_COMPONENT_LISTBOX OUString( "com.sun.star.form.component.ListBox" ) +#define FM_SUN_COMPONENT_COMBOBOX OUString( "com.sun.star.form.component.ComboBox" ) +#define FM_SUN_COMPONENT_RADIOBUTTON OUString( "com.sun.star.form.component.RadioButton" ) +#define FM_SUN_COMPONENT_GROUPBOX OUString( "com.sun.star.form.component.GroupBox" ) +#define FM_SUN_COMPONENT_FIXEDTEXT OUString( "com.sun.star.form.component.FixedText" ) +#define FM_SUN_COMPONENT_COMMANDBUTTON OUString( "com.sun.star.form.component.CommandButton" ) +#define FM_SUN_COMPONENT_CHECKBOX OUString( "com.sun.star.form.component.CheckBox" ) +#define FM_SUN_COMPONENT_GRIDCONTROL OUString( "com.sun.star.form.component.GridControl" ) +#define FM_SUN_COMPONENT_IMAGEBUTTON OUString( "com.sun.star.form.component.ImageButton" ) +#define FM_SUN_COMPONENT_FILECONTROL OUString( "com.sun.star.form.component.FileControl" ) +#define FM_SUN_COMPONENT_TIMEFIELD OUString( "com.sun.star.form.component.TimeField" ) +#define FM_SUN_COMPONENT_DATEFIELD OUString( "com.sun.star.form.component.DateField" ) +#define FM_SUN_COMPONENT_NUMERICFIELD OUString( "com.sun.star.form.component.NumericField" ) +#define FM_SUN_COMPONENT_CURRENCYFIELD OUString( "com.sun.star.form.component.CurrencyField" ) +#define FM_SUN_COMPONENT_PATTERNFIELD OUString( "com.sun.star.form.component.PatternField" ) +#define FM_SUN_COMPONENT_HIDDENCONTROL OUString( "com.sun.star.form.component.HiddenControl" ) +#define FM_SUN_COMPONENT_IMAGECONTROL OUString( "com.sun.star.form.component.DatabaseImageControl" ) +#define FM_SUN_COMPONENT_FORMATTEDFIELD OUString( "com.sun.star.form.component.FormattedField" ) +#define FM_SUN_COMPONENT_SCROLLBAR OUString( "com.sun.star.form.component.ScrollBar" ) +#define FM_SUN_COMPONENT_SPINBUTTON OUString( "com.sun.star.form.component.SpinButton" ) +#define FM_SUN_COMPONENT_NAVIGATIONBAR OUString( "com.sun.star.form.component.NavigationToolBar" ) +#define FM_SUN_CONTROL_GRIDCONTROL OUString( "com.sun.star.form.control.GridControl" ) namespace svxform { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 142a6d4999ed..16e549e0761f 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -343,7 +343,7 @@ protected: // sammelt in strNames die Namen aller Formulare static void impl_collectFormSearchContexts_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, + const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ); @@ -490,7 +490,7 @@ private: // closes the task-local beamer displaying a grid view for a form // ConfigItem related stuff - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); virtual void Commit(); void implAdjustConfigCache(); @@ -557,18 +557,18 @@ inline sal_Bool FmXFormShell::IsSelectionUpdatePending() class SAL_DLLPRIVATE SearchableControlIterator : public ::comphelper::IndexAccessIterator { - ::rtl::OUString m_sCurrentValue; + OUString m_sCurrentValue; // der aktuelle Wert der ControlSource-::com::sun::star::beans::Property public: - ::rtl::OUString getCurrentValue() const { return m_sCurrentValue; } + OUString getCurrentValue() const { return m_sCurrentValue; } public: SearchableControlIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement); virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const; - virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = ::rtl::OUString(); } + virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); } }; // ======================================================================== diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index d68c0eea8352..dc23e6437456 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -51,7 +51,7 @@ class SdrObject; class FmUndoPropertyAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; - ::rtl::OUString aPropertyName; + OUString aPropertyName; ::com::sun::star::uno::Any aNewValue; ::com::sun::star::uno::Any aOldValue; @@ -61,7 +61,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -123,7 +123,7 @@ public: virtual void Undo(); virtual void Redo() { Undo(); } - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); }; diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 6c0b6a2795d5..c2c829611337 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -20,33 +20,33 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORM_POSITION rtl::OUString( ".uno:FormController/positionForm" ) -#define FMURL_FORM_RECORDCOUNT rtl::OUString( ".uno:FormController/RecordCount" ) -#define FMURL_RECORD_MOVEFIRST rtl::OUString( ".uno:FormController/moveToFirst" ) -#define FMURL_RECORD_MOVEPREV rtl::OUString( ".uno:FormController/moveToPrev" ) -#define FMURL_RECORD_MOVENEXT rtl::OUString( ".uno:FormController/moveToNext" ) -#define FMURL_RECORD_MOVELAST rtl::OUString( ".uno:FormController/moveToLast" ) -#define FMURL_RECORD_MOVETONEW rtl::OUString( ".uno:FormController/moveToNew" ) -#define FMURL_RECORD_UNDO rtl::OUString( ".uno:FormController/undoRecord" ) -#define FMURL_RECORD_SAVE rtl::OUString( ".uno:FormController/saveRecord" ) -#define FMURL_RECORD_DELETE rtl::OUString( ".uno:FormController/deleteRecord" ) -#define FMURL_FORM_REFRESH rtl::OUString( ".uno:FormController/refreshForm" ) -#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" ) -#define FMURL_FORM_SORT_UP rtl::OUString( ".uno:FormController/sortUp" ) -#define FMURL_FORM_SORT_DOWN rtl::OUString( ".uno:FormController/sortDown" ) -#define FMURL_FORM_SORT rtl::OUString( ".uno:FormController/sort" ) -#define FMURL_FORM_AUTO_FILTER rtl::OUString( ".uno:FormController/autoFilter" ) -#define FMURL_FORM_FILTER rtl::OUString( ".uno:FormController/filter" ) -#define FMURL_FORM_APPLY_FILTER rtl::OUString( ".uno:FormController/applyFilter" ) -#define FMURL_FORM_REMOVE_FILTER rtl::OUString( ".uno:FormController/removeFilterOrder" ) -#define FMURL_CONFIRM_DELETION rtl::OUString( ".uno:FormSlots/ConfirmDeletion" ) -#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( ".component:DB/FormGridView" ) -#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( ".uno:FormSlots/ClearView" ) -#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( ".uno:FormSlots/AddGridColumn" ) -#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( ".uno:FormSlots/AttachToForm" ) -#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( "MasterForm" ) -#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( "ColumnType" ) -#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( "ColumnPosition" ) +#define FMURL_FORM_POSITION OUString( ".uno:FormController/positionForm" ) +#define FMURL_FORM_RECORDCOUNT OUString( ".uno:FormController/RecordCount" ) +#define FMURL_RECORD_MOVEFIRST OUString( ".uno:FormController/moveToFirst" ) +#define FMURL_RECORD_MOVEPREV OUString( ".uno:FormController/moveToPrev" ) +#define FMURL_RECORD_MOVENEXT OUString( ".uno:FormController/moveToNext" ) +#define FMURL_RECORD_MOVELAST OUString( ".uno:FormController/moveToLast" ) +#define FMURL_RECORD_MOVETONEW OUString( ".uno:FormController/moveToNew" ) +#define FMURL_RECORD_UNDO OUString( ".uno:FormController/undoRecord" ) +#define FMURL_RECORD_SAVE OUString( ".uno:FormController/saveRecord" ) +#define FMURL_RECORD_DELETE OUString( ".uno:FormController/deleteRecord" ) +#define FMURL_FORM_REFRESH OUString( ".uno:FormController/refreshForm" ) +#define FMURL_FORM_REFRESH_CURRENT_CONTROL OUString( ".uno:FormController/refreshCurrentControl" ) +#define FMURL_FORM_SORT_UP OUString( ".uno:FormController/sortUp" ) +#define FMURL_FORM_SORT_DOWN OUString( ".uno:FormController/sortDown" ) +#define FMURL_FORM_SORT OUString( ".uno:FormController/sort" ) +#define FMURL_FORM_AUTO_FILTER OUString( ".uno:FormController/autoFilter" ) +#define FMURL_FORM_FILTER OUString( ".uno:FormController/filter" ) +#define FMURL_FORM_APPLY_FILTER OUString( ".uno:FormController/applyFilter" ) +#define FMURL_FORM_REMOVE_FILTER OUString( ".uno:FormController/removeFilterOrder" ) +#define FMURL_CONFIRM_DELETION OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS OUString( "ColumnPosition" ) #endif // _SVX_FMURL_HXX diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index e51c9e3667ef..4124f84cfcd0 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -259,7 +259,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, @@ -276,12 +276,12 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL, - const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(), - const ::rtl::OUString& _rCommand= ::rtl::OUString(), + const OUString& _rDataSourceName = OUString(), + const OUString& _rCommand= OUString(), const sal_Int32 _nCommandType = -1 ); diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index bb956e836806..23e0fb08c80d 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -84,19 +84,19 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats ); - static ::rtl::OUString getDefaultName( + static OUString getDefaultName( const sal_Int16 nClassId, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >& _rxObject ); - static ::rtl::OUString getDefaultUniqueName_ByComponentType( + static OUString getDefaultUniqueName_ByComponentType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); - static ::rtl::OUString getUniqueName( + static OUString getUniqueName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - const ::rtl::OUString& _rBaseName + const OUString& _rBaseName ); private: diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 44bdc513d9a8..e12180e301c4 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -89,7 +89,7 @@ struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::u } }; -typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow; +typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, OUString, FmXTextComponentLess> FmFilterRow; typedef ::std::vector< FmFilterRow > FmFilterRows; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; @@ -177,7 +177,7 @@ namespace svxform DispatcherContainer m_aFeatureDispatchers; ::std::set< sal_Int16 > m_aInvalidFeatures; // for asynchronous feature invalidation - ::rtl::OUString m_aMode; + OUString m_aMode; ::svxform::DelayedEvent m_aLoadEvent; ::svxform::DelayedEvent m_aToggleEvent; @@ -258,9 +258,9 @@ namespace svxform virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (::com::sun::star::uno::RuntimeException); @@ -286,10 +286,10 @@ namespace svxform virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -397,9 +397,9 @@ namespace svxform virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -410,7 +410,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException); // method for registration - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( @@ -423,7 +423,7 @@ namespace svxform virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ); @@ -551,7 +551,7 @@ namespace svxform <TRUE/> if and only if all controls belonging to our form are valid */ bool checkFormComponentValidity( - ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, + OUString& /* [out] */ _rFirstInvalidityExplanation, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index be168cdbe3b7..7f08fbea818a 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -44,7 +44,7 @@ namespace svx { public: /// retrieves the feature id for a given feature URL - static sal_Int32 getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL ); + static sal_Int32 getControllerFeatureSlotIdForURL( const OUString& _rMainURL ); /// retrieves the css.form.runtime.FormFeature ID for a given slot ID static sal_Int16 getFormFeatureForSlotId( sal_Int32 _nSlotId ); @@ -192,7 +192,7 @@ namespace svx ) const; sal_Bool isEnabled( sal_Int32 _nSlotId ) const; void execute( sal_Int32 _nSlotId ) const; - void execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; + void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; sal_Bool commitCurrentRecord() const; sal_Bool commitCurrentControl( ) const; sal_Bool isInsertionRow() const; diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 59528cb3ffc0..e13997e3d9c1 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -38,7 +38,7 @@ namespace svxform { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( - const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; + const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual ::osl::Mutex* getInterceptorMutex() = 0; @@ -87,7 +87,7 @@ namespace svxform DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE); // ::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 ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + 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); 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); // ::com::sun::star::frame::XDispatchProviderInterceptor diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 92158f480d87..ce8eb4aca371 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -54,7 +54,7 @@ namespace svxform /** retrieves the URI for the toolbox associated with the given slot, depending on the type of our document */ - SVX_DLLPUBLIC ::rtl::OUString + SVX_DLLPUBLIC OUString getToolboxResourceName( sal_uInt16 _nSlotId ) const; /** toggles the toolbox associated with the given slot diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 90e039a51ef3..555e31ea99c3 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -20,19 +20,18 @@ #define _SVX_GRIDCOLS_HXX #include <sal/types.h> - -namespace rtl { class OUString; } - -#define FM_COL_TEXTFIELD rtl::OUString( "TextField" ) -#define FM_COL_COMBOBOX rtl::OUString( "ComboBox" ) -#define FM_COL_CHECKBOX rtl::OUString( "CheckBox" ) -#define FM_COL_TIMEFIELD rtl::OUString( "TimeField" ) -#define FM_COL_DATEFIELD rtl::OUString( "DateField" ) -#define FM_COL_NUMERICFIELD rtl::OUString( "NumericField" ) -#define FM_COL_CURRENCYFIELD rtl::OUString( "CurrencyField" ) -#define FM_COL_PATTERNFIELD rtl::OUString( "PatternField" ) -#define FM_COL_LISTBOX rtl::OUString( "ListBox" ) -#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" ) +#include <rtl/ustring.hxx> + +#define FM_COL_TEXTFIELD OUString( "TextField" ) +#define FM_COL_COMBOBOX OUString( "ComboBox" ) +#define FM_COL_CHECKBOX OUString( "CheckBox" ) +#define FM_COL_TIMEFIELD OUString( "TimeField" ) +#define FM_COL_DATEFIELD OUString( "DateField" ) +#define FM_COL_NUMERICFIELD OUString( "NumericField" ) +#define FM_COL_CURRENCYFIELD OUString( "CurrencyField" ) +#define FM_COL_PATTERNFIELD OUString( "PatternField" ) +#define FM_COL_LISTBOX OUString( "ListBox" ) +#define FM_COL_FORMATTEDFIELD OUString( "FormattedField" ) // column type ids #define TYPE_CHECKBOX 0 @@ -47,7 +46,7 @@ namespace rtl { class OUString; } #define TYPE_TIMEFIELD 9 //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); +sal_Int32 getColumnTypeByModelName(const OUString& aModelName); #endif // _SVX_GRIDCOLS_HXX diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 33c5e431cc2a..d8454c9e4c35 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -81,13 +81,13 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // css.lang.XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- @@ -112,8 +112,8 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // XServiceInfo helper - static ::rtl::OUString st_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > st_getSupportedServiceNames(); + static OUString st_getImplementationName(); + static css::uno::Sequence< OUString > st_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); //------------------------------------------- diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index d0b3c83dade2..f1ee6eb5c03b 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -76,16 +76,16 @@ namespace svxform // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException ); - inline void setPropertyValue(const ::rtl::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 ); - inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addPropertyChangeListener(const ::rtl::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 ); - inline void removePropertyChangeListener(const ::rtl::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 ); - inline void addVetoableChangeListener(const ::rtl::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 ); - inline void removeVetoableChangeListener(const ::rtl::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 ); + inline void 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 ); + inline ::com::sun::star::uno::Any getPropertyValue(const OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void 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 ); + inline void 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 ); + inline void 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 ); + inline void 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 ); // ::com::sun::star::sdb::XColumn inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -114,7 +114,7 @@ namespace svxform inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateString(const OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index cc28505216cb..a7b85f154d7f 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -49,8 +49,8 @@ namespace svxform protected: inline ::rtl::Reference< ::connectivity::simple::ISQLParseNode > predicateTree( - ::rtl::OUString& _rErrorMessage, - const ::rtl::OUString& _rStatement, + OUString& _rErrorMessage, + const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 7575d7690252..e21942d33c9d 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -73,8 +73,8 @@ public: SvxRectCtlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); protected: virtual ~SvxRectCtlAccessibleContext(); public: @@ -150,10 +150,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -181,13 +181,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); //===== XTypeProvider =================================================== @@ -276,11 +276,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -329,7 +329,7 @@ public: SvxRectCtlChildAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const Window& rParentWindow, - const ::rtl::OUString& rName, const ::rtl::OUString& rDescription, + const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ); protected: @@ -405,10 +405,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -449,13 +449,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); @@ -496,12 +496,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index ba6f87c1be98..08723f91ca05 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -77,7 +77,7 @@ class SAL_DLLPRIVATE FmFieldWin :public SfxFloatingWindow FmFieldWinData* pData; ::svxform::SharedConnection m_aConnection; - ::rtl::OUString m_aDatabaseName, + OUString m_aDatabaseName, m_aObjectName; sal_Int32 m_nObjectType; @@ -101,9 +101,9 @@ public: void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const; - const ::rtl::OUString& GetDatabaseName() const { return m_aDatabaseName; } + const OUString& GetDatabaseName() const { return m_aDatabaseName; } ::svxform::SharedConnection GetConnection() const { return m_aConnection; } - const ::rtl::OUString& GetObjectName() const { return m_aObjectName; } + const OUString& GetObjectName() const { return m_aObjectName; } sal_Int32 GetObjectType() const { return m_nObjectType; } sal_Bool createSelectionControls( ); diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index fa3c4b64cba1..2c8652e0edeb 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -61,14 +61,14 @@ namespace svxform } // -------------------------------------------------------- - inline ::rtl::OUString getFormattedValue( + inline OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); return sReturn; diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index 70877c83054c..23c769b84d7a 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -36,8 +36,8 @@ namespace unogallery { // ------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); // ----------------- // - GalleryThemes - @@ -51,15 +51,15 @@ public: GalleryThemeProvider(); ~GalleryThemeProvider(); - SVX_DLLPUBLIC static ::rtl::OUString getImplementationName_Static() throw(); - SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + SVX_DLLPUBLIC static OUString getImplementationName_Static() throw(); + SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -70,16 +70,16 @@ protected: virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + 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); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // 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 ); // XGalleryThemeProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 02e5adf7ec18..beaaf6b47db9 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -41,8 +41,8 @@ namespace svxform // <properties> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xBinding; - ::rtl::OUString m_sFacetName; - ::rtl::OUString m_sConditionValue; + OUString m_sFacetName; + OUString m_sConditionValue; ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > m_xWorkModel; // </properties> @@ -58,8 +58,8 @@ namespace svxform virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XPropertySet virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 04a17e2ecd90..69cd12ddd86b 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -38,19 +38,19 @@ public: // #110680# SvxXMLXTableExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, - const rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & xTable, com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& xGrfResolver); ~SvxXMLXTableExportComponent(); - static bool save( const rtl::OUString& rURL, + static bool save( const OUString& rURL, const com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, - rtl::OUString *pOptName ) throw(); + OUString *pOptName ) throw(); // methods without content: virtual void _ExportAutoStyles(); diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index ab055910ae2a..0a9ba8701766 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -42,13 +42,13 @@ public: virtual ~SvxXMLXTableImport() throw (); - static bool load( const rtl::OUString &rPath, + static bool load( const OUString &rPath, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw(); protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 742f1cf19292..57c6588e6d70 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -36,8 +36,8 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, 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 rtl::OUString& rApplicationName, - const rtl::OUString& rRangeText ) : + const OUString& rApplicationName, + const OUString& rRangeText ) : SfxPoolItem( nId ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index ca6d4a7e0e75..33fff149cf80 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -244,7 +244,7 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : XubString SvxDoubleItem::GetValueText() const { - rtl::OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); + OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); return String( aOStr.getStr(), (sal_uInt16)aOStr.getLength() ); } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index e2f863d5d472..af6236d72645 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -24,7 +24,7 @@ struct SvxClipboardFmtItem_Impl { - boost::ptr_vector< boost::nullable<rtl::OUString> > aFmtNms; + boost::ptr_vector< boost::nullable<OUString> > aFmtNms; std::vector<sal_uIntPtr> aFmtIds; SvxClipboardFmtItem_Impl() {} @@ -127,13 +127,13 @@ void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } -void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const rtl::OUString& rName, +void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, sal_uInt16 nPos ) { if( nPos > pImpl->aFmtNms.size() ) nPos = pImpl->aFmtNms.size(); - pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new rtl::OUString(rName)); + pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new OUString(rName)); pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } @@ -147,9 +147,9 @@ sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const return pImpl->aFmtIds[ nPos ]; } -const rtl::OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const +const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const { - return pImpl->aFmtNms.is_null(nPos) ? rtl::OUString() : pImpl->aFmtNms[nPos]; + return pImpl->aFmtNms.is_null(nPos) ? OUString() : pImpl->aFmtNms[nPos]; } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 119de61bd20f..5b8ed9f51c50 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -31,7 +31,7 @@ SdrCustomShapeDataItem::SdrCustomShapeDataItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() ) {} -bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const rtl::OUString& r2 ) const +bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const OUString& r1, const OUString& r2 ) const { return r1.equals( r2 ); } @@ -70,7 +70,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea } } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); @@ -79,7 +79,7 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co return pRet; } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rSequenceName, const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); @@ -138,7 +138,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans:: } } -void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) +void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) { com::sun::star::uno::Any* pAny = GetPropertyValueByName( rSequenceName, rPropVal.Name ); if ( pAny ) // just replacing @@ -190,7 +190,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenc } } -void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rPropName ) +void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName ) { if ( aPropSeq.getLength() ) { diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index a2181a2a626f..1de41eb9fa0f 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -295,16 +295,16 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe switch(nMemberId) { case MID_HLINK_NAME : - rVal <<= ::rtl::OUString(sIntName.GetBuffer()); + rVal <<= OUString(sIntName.GetBuffer()); break; case MID_HLINK_TEXT : - rVal <<= ::rtl::OUString(sName.GetBuffer()); + rVal <<= OUString(sName.GetBuffer()); break; case MID_HLINK_URL: - rVal <<= ::rtl::OUString(sURL.GetBuffer()); + rVal <<= OUString(sURL.GetBuffer()); break; case MID_HLINK_TARGET: - rVal <<= ::rtl::OUString(sTarget.GetBuffer()); + rVal <<= OUString(sTarget.GetBuffer()); break; case MID_HLINK_TYPE: rVal <<= (sal_Int32) eType; @@ -320,7 +320,7 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - ::rtl::OUString aStr; + OUString aStr; sal_Int32 nVal = 0; switch(nMemberId) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index d33ca4ca0564..2616f7391ff2 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1502,7 +1502,7 @@ String SvxNumberFormatShell::GetStandardName() const return pFormatter->GetStandardName( eCurLanguage); } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, sal_uInt16* pPos) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, sal_uInt16* pPos) { const NfCurrencyEntry* pTmpCurrencyEntry=SvNumberFormatter::MatchSystemCurrency(); @@ -1541,7 +1541,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, bool bFlag) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool bFlag) { aCurCurrencyList.clear(); @@ -1597,7 +1597,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, for(sal_uInt16 i = 1; i < nCount; ++i) { bool bInsert = true; - rtl::OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); + OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); sal_uInt16 j = nCont; for(; j < rList.size() && bInsert; ++j) @@ -1771,7 +1771,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC } bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, - bool const bTmpBanking, ::rtl::OUString const& rFmtString) + bool const bTmpBanking, OUString const& rFmtString) { bool bFlag=false; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index d84ade527f8c..94d88e8562fd 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -99,9 +99,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); aSeq[1].Value <<= sal_Bool( mbBookMode ); rVal <<= aSeq; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index f6cfcc7d5b43..ef19d6dc52a3 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -96,13 +96,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); aSeq[1].Value <<= maValues; - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); aSeq[2].Value <<= mnMinZoom; - aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); + aSeq[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); aSeq[3].Value <<= mnMaxZoom; rVal <<= aSeq; } diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 36d43cc01581..4f0f3fe523b8 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -68,8 +68,8 @@ void SvxSmartTagsControl::FillMenu() const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence(); const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps = mpSmartTagItem->GetStringKeyMaps(); const lang::Locale& rLocale = mpSmartTagItem->GetLocale(); - const rtl::OUString aApplicationName = mpSmartTagItem->GetApplicationName(); - const rtl::OUString aRangeText = mpSmartTagItem->GetRangeText(); + const OUString aApplicationName = mpSmartTagItem->GetApplicationName(); + const OUString aRangeText = mpSmartTagItem->GetRangeText(); const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange(); const Reference<frame::XController>& xController = mpSmartTagItem->GetController(); @@ -91,8 +91,8 @@ void SvxSmartTagsControl::FillMenu() continue; const sal_Int32 nSmartTagIndex = rActionIndices[0]; - const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); - const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); + const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); + const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); // no sub-menus if there's only one smart tag type listed: PopupMenu* pSbMenu = mpMenu; @@ -105,7 +105,7 @@ void SvxSmartTagsControl::FillMenu() pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) ); // sub-menu starts with smart tag caption and separator - const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; + const OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; nSubMenuPos = 0; pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++); pSbMenu->InsertSeparator(OString(), nSubMenuPos++); @@ -118,12 +118,12 @@ void SvxSmartTagsControl::FillMenu() for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k ) { const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController ); - rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, + OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, aApplicationName, rLocale, xSmartTagProperties, aRangeText, - rtl::OUString(), + OUString(), xController, xTextRange ); @@ -178,7 +178,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) mpSmartTagItem->GetTextRange(), maInvokeActions[ nMyId ].mxSmartTagProperties, mpSmartTagItem->GetRangeText(), - rtl::OUString(), + OUString(), mpSmartTagItem->GetLocale() ); } diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 218bb7e92afb..ea129a988a87 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup (0), bDisabled( sal_False ) { - addStatusListener( rtl::OUString( ".uno:ClipboardFormatItems" )); + addStatusListener( OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, TIB_DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -95,10 +95,10 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "SelectedFormat" ); + aArgs[0].Name = OUString( "SelectedFormat" ); aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( rtl::OUString( ".uno:ClipboardFormatItems" ), + Dispatch( OUString( ".uno:ClipboardFormatItems" ), aArgs ); } diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 4d1dcfdb2fe2..8aa9abe90288 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -142,7 +142,7 @@ namespace sdr // decomposition of MediaPrimitive2D to create needed invisible elements for HitTest // and/or BoundRect const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0); - const rtl::OUString& rURL(GetSdrMediaObj().getURL()); + const OUString& rURL(GetSdrMediaObj().getURL()); const sal_uInt32 nPixelBorder(4L); const drawinglayer::primitive2d::Primitive2DReference xRetval( new drawinglayer::primitive2d::MediaPrimitive2D( diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index ef8a8a2b33ad..6ee13eff2d74 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1203,7 +1203,7 @@ namespace sdr { namespace contact { bool bSuccess = false; try { - const ::rtl::OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() ); + const OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() ); Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_SET_THROW ); _out_rControl = Reference< XControl >( xFactory->createInstance( sControlServiceName ), UNO_QUERY_THROW ); @@ -1382,9 +1382,9 @@ namespace sdr { namespace contact { { Reference< XPropertySet > xModelProperties( m_aControl.getModel(), UNO_QUERY_THROW ); if ( _bStart ) - xModelProperties->addPropertyChangeListener( ::rtl::OUString(), this ); + xModelProperties->addPropertyChangeListener( OUString(), this ); else - xModelProperties->removePropertyChangeListener( ::rtl::OUString(), this ); + xModelProperties->removePropertyChangeListener( OUString(), this ); } catch( const Exception& ) { @@ -1403,7 +1403,7 @@ namespace sdr { namespace contact { try { Reference< XPropertySet > xModelProperties( pUnoObject->GetUnoControlModel(), UNO_QUERY_THROW ); - static const ::rtl::OUString s_sPrintablePropertyName( "Printable" ); + static const OUString s_sPrintablePropertyName( "Printable" ); OSL_VERIFY( xModelProperties->getPropertyValue( s_sPrintablePropertyName ) >>= bIsPrintable ); } catch( const Exception& ) diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 41cbcd0327d2..818bfc6b6b27 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -137,7 +137,7 @@ namespace sdr if(bUseReducedDisplayQualityForDrag) { uno::Sequence< beans::PropertyValue > xProperties(1); - xProperties[0].Name = rtl::OUString("ReducedDisplayQuality"); + xProperties[0].Name = OUString("ReducedDisplayQuality"); xProperties[0].Value <<= true; maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 39bd6cf9b0a9..23c93203b865 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -96,22 +96,22 @@ namespace drawinglayer return aRetval; } - rtl::OUString PrimitiveFactory2D::getImplementationName_Static() + OUString PrimitiveFactory2D::getImplementationName_Static() { - static rtl::OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D"); + static OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D"); return aRetval; } - uno::Sequence< rtl::OUString > PrimitiveFactory2D::getSupportedServiceNames_Static() + uno::Sequence< OUString > PrimitiveFactory2D::getSupportedServiceNames_Static() { - static uno::Sequence< rtl::OUString > aSeq; + static uno::Sequence< OUString > aSeq; osl::Mutex aMutex; osl::MutexGuard aGuard( aMutex ); if(!aSeq.getLength()) { aSeq.realloc(1L); - aSeq.getArray()[0L] = rtl::OUString("com.sun.star.graphic.PrimitiveFactory2D"); + aSeq.getArray()[0L] = OUString("com.sun.star.graphic.PrimitiveFactory2D"); } return aSeq; diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index c46aa095180a..ac3080cf5d44 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -49,7 +49,7 @@ namespace { try { - const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString("Number"))); + const uno::Any aNumber(xSet->getPropertyValue(OUString("Number"))); aNumber >>= nRetval; } catch(const uno::Exception&) diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 5bd9f7ba0cbc..ebd67334e16e 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName ) +SmartTagMgr::SmartTagMgr( const OUString& rApplicationName ) : maApplicationName( rApplicationName ), maRecognizerList(), maActionList(), @@ -64,7 +64,7 @@ SmartTagMgr::~SmartTagMgr() { } -void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName ) +void SmartTagMgr::Init( const OUString& rConfigurationGroupName ) { // get component context to pass to components: if ( mxContext.is() ) @@ -86,7 +86,7 @@ void SmartTagMgr::CreateBreakIterator() const /** Dispatches the recognize call to all installed smart tag recognizers */ -void SmartTagMgr::Recognize( const rtl::OUString& rText, +void SmartTagMgr::Recognize( const OUString& rText, const Reference< text::XTextMarkup > xMarkup, const Reference< frame::XController > xController, const lang::Locale& rLocale, @@ -102,7 +102,7 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText, const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount(); for ( sal_uInt32 j = 0; j < nSmartTagCount && !bCallRecognizer; ++j ) { - const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j); + const OUString aSmartTagName = xRecognizer->getSmartTagName(j); if ( IsSmartTagTypeEnabled( aSmartTagName ) ) bCallRecognizer = true; } @@ -118,9 +118,9 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText, } } -typedef std::multimap < rtl::OUString, ActionReference >::const_iterator SmartTagMapIter; +typedef std::multimap < OUString, ActionReference >::const_iterator SmartTagMapIter; -void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes, +void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes, Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence, Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence ) const { @@ -129,7 +129,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j ) { - const rtl::OUString& rSmartTagType = rSmartTagTypes[j]; + const OUString& rSmartTagType = rSmartTagTypes[j]; const sal_Int32 nNumberOfActionRefs = maSmartTagMap.count( rSmartTagType ); @@ -153,9 +153,9 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes /** Returns the caption for a smart tag type. */ -rtl::OUString SmartTagMgr::GetSmartTagCaption( const rtl::OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const +OUString SmartTagMgr::GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const { - rtl::OUString aRet; + OUString aRet; SmartTagMapIter aLower = maSmartTagMap.lower_bound( rSmartTagType ); @@ -177,7 +177,7 @@ rtl::OUString SmartTagMgr::GetSmartTagCaption( const rtl::OUString& rSmartTagTyp /** Returns true if the given smart tag type is enabled. */ -bool SmartTagMgr::IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) const +bool SmartTagMgr::IsSmartTagTypeEnabled( const OUString& rSmartTagType ) const { return maDisabledSmartTagTypes.end() == maDisabledSmartTagTypes.find( rSmartTagType ); } @@ -185,7 +185,7 @@ bool SmartTagMgr::IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) co /** Writes currently disabled smart tag types to configuration. */ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, - const std::vector< rtl::OUString >* pDisabledTypes ) const + const std::vector< OUString >* pDisabledTypes ) const { if ( mxConfigurationSettings.is() ) { @@ -208,9 +208,9 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, if ( pDisabledTypes ) { const sal_Int32 nNumberOfDisabledSmartTagTypes = pDisabledTypes->size(); - Sequence< rtl::OUString > aTypes( nNumberOfDisabledSmartTagTypes ); + Sequence< OUString > aTypes( nNumberOfDisabledSmartTagTypes ); - std::vector< rtl::OUString >::const_iterator aIter; + std::vector< OUString >::const_iterator aIter; sal_Int32 nCount = 0; for ( aIter = pDisabledTypes->begin(); aIter != pDisabledTypes->end(); ++aIter ) aTypes[ nCount++ ] = *aIter; @@ -291,7 +291,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run for( sal_Int32 i = 0; i < nNumberOfChanges; ++i) { - rtl::OUString sTemp; + OUString sTemp; pElementChanges[i].Accessor >>= sTemp; if ( sTemp == "ExcludedSmartTagTypes" ) @@ -373,7 +373,7 @@ void SmartTagMgr::LoadLibraries() /** */ -void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroupName ) +void SmartTagMgr::PrepareConfiguration( const OUString& rConfigurationGroupName ) { Any aAny = makeAny( "/org.openoffice.Office.Common/SmartTags/" + rConfigurationGroupName ); beans::PropertyValue aPathArgument; @@ -423,7 +423,7 @@ void SmartTagMgr::ReadConfiguration( bool bExcludedTypes, bool bRecognize ) maDisabledSmartTagTypes.clear(); Any aAny = mxConfigurationSettings->getPropertyValue( "ExcludedSmartTagTypes" ); - Sequence< rtl::OUString > aValues; + Sequence< OUString > aValues; aAny >>= aValues; const sal_Int32 nValues = aValues.getLength(); @@ -473,7 +473,7 @@ void SmartTagMgr::RegisterListener() } } -typedef std::pair < const rtl::OUString, ActionReference > SmartTagMapElement; +typedef std::pair < const OUString, ActionReference > SmartTagMapElement; /** Sets up a map that maps smart tag type names to actions references. */ @@ -488,7 +488,7 @@ void SmartTagMgr::AssociateActionsWithRecognizers() const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount(); for ( sal_uInt32 j = 0; j < nSmartTagCount; ++j ) { - const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j); + const OUString aSmartTagName = xRecognizer->getSmartTagName(j); // check if smart tag type has already been processed: if ( maSmartTagMap.find( aSmartTagName ) != maSmartTagMap.end() ) @@ -501,7 +501,7 @@ void SmartTagMgr::AssociateActionsWithRecognizers() const sal_uInt32 nSmartTagCountInActionLib = xActionLib->getSmartTagCount(); for ( sal_uInt32 l = 0; l < nSmartTagCountInActionLib; ++l ) { - const rtl::OUString aSmartTagNameInActionLib = xActionLib->getSmartTagName(l); + const OUString aSmartTagNameInActionLib = xActionLib->getSmartTagName(l); if ( aSmartTagName.equals( aSmartTagNameInActionLib ) ) { // found actions and recognizer for same smarttag diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index e6bd31f70556..1e931a98ae38 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -82,7 +82,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "InsertMode" ); + aArgs[0].Name = OUString( "InsertMode" ); aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index fed79ce0ad54..da2d40f44688 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; -using ::rtl::OUString; SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index b4485c535fc3..cfd39393c855 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -71,7 +71,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) ) sMetric += '-'; - sMetric += rtl::OUString::valueOf(nConvVal / 100); + sMetric += OUString::valueOf(nConvVal / 100); if( FUNIT_NONE != eOutUnit ) { @@ -82,7 +82,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) nFract *= -1; if ( nFract < 10 ) sMetric += '0'; - sMetric += rtl::OUString::valueOf(nFract); + sMetric += OUString::valueOf(nFract); } return sMetric; @@ -178,9 +178,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -324,11 +324,11 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "StatusBarFunc" ); + aArgs[0].Name = OUString( "StatusBarFunc" ); aItem.QueryValue( a ); aArgs[0].Value = a; - execute( rtl::OUString( ".uno:StatusBarFunc" ), aArgs ); + execute( OUString( ".uno:StatusBarFunc" ), aArgs ); // GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L ); } } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 25b0320292d7..18c33eaf92fa 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ZoomSlider" ); + aArgs[0].Name = OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ZoomSlider" ); + aArgs[0].Name = OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index af0a1f293c9b..66ce29e1df43 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -22,8 +22,8 @@ #include "svx/svdglob.hxx" #include "svx/svdstr.hrc" -::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType - , const ::rtl::OUString& rObjectName ) +OUString ActionDescriptionProvider::createDescription( ActionType eActionType + , const OUString& rObjectName ) { sal_uInt16 nResID=0; switch( eActionType ) @@ -63,7 +63,7 @@ break; } if(!nResID) - return rtl::OUString(); + return OUString(); OUString aStr(ImpGetResStr(nResID)); return aStr.replaceAll("%1", rObjectName); diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 383e5d81d817..4026a3291cd8 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -63,7 +63,7 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent try { const uno::Reference< lang::XMultiServiceFactory > xChartFact(rXModel, uno::UNO_QUERY_THROW); - const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW); + const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW); const uno::Reference< util::XUpdatable > xUpdatable(xChartView, uno::UNO_QUERY_THROW); if(xUpdatable.is()) diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 99a8323d6b8a..9b5e9e486480 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -78,8 +78,8 @@ using namespace ::com::sun::star; { // Printer and VirtualDevice, or rather: no OutDev uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); - uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); + const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); + uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY); if (xControl.is()) xControl->setModel(xModel); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d11fea1ed665..d160b73cec22 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -728,7 +728,7 @@ SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrOnOffItem(Which(),rIn); } -rtl::OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const +OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValON); @@ -965,7 +965,7 @@ SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } -rtl::OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } @@ -991,7 +991,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } -rtl::OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } @@ -1022,7 +1022,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/ sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } -rtl::OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } @@ -1079,7 +1079,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } @@ -1128,7 +1128,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } @@ -1177,7 +1177,7 @@ SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } @@ -1225,7 +1225,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } -rtl::OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } @@ -1572,7 +1572,7 @@ SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } -rtl::OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } @@ -1761,7 +1761,7 @@ SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } -rtl::OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } @@ -1809,7 +1809,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } -rtl::OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } @@ -1857,7 +1857,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } -rtl::OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } @@ -1905,7 +1905,7 @@ SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } -rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { OUString aRetval; @@ -1958,7 +1958,7 @@ SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } -rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } @@ -2197,9 +2197,9 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const return 4; } -rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { - rtl::OUString aStr; + OUString aStr; switch(nPos) { diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 2b2e061777a4..35f4b9cb3bd7 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1405,7 +1405,7 @@ SdrDragMove::SdrDragMove(SdrDragView& rNewView) void SdrDragMove::TakeSdrDragComment(XubString& rStr) const { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragMethMove, rStr); rStr.AppendAscii(" (x="); @@ -2017,7 +2017,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const nTmpWink -= 36000; } - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -2154,7 +2154,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const nTmpWink = NormAngle180(nTmpWink); - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -2741,7 +2741,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const nVal *= 2; nVal = Abs(nVal); - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -3392,7 +3392,7 @@ void SdrDragDistort::TakeSdrDragComment(XubString& rStr) const { ImpTakeDescriptionStr(STR_DragMethDistort, rStr); - rtl::OUString aStr; + OUString aStr; rStr.AppendAscii(" (x="); getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); @@ -3547,7 +3547,7 @@ void SdrDragCrop::TakeSdrDragComment(XubString& rStr) const { ImpTakeDescriptionStr(STR_DragMethCrop, rStr); - rtl::OUString aStr; + OUString aStr; rStr.AppendAscii(" (x="); getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index b99d2bb0edc1..0194e057806d 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -931,7 +931,7 @@ void SdrEditView::CopyMarkedObj() if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrEditView::CopyMarkedObj(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 78e6d42a3218..50397b423b2b 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -737,7 +737,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO bool bPrintable = true, bPrintableDC = false; bool bVisible = true, bVisibleDC = false; SdrLayerID nLayerId=0; bool bLayerDC=false; - rtl::OUString aObjName; + OUString aObjName; sal_Bool bObjNameDC=false,bObjNameSet=false; long nSnapPosX=0; bool bSnapPosXDC=false; long nSnapPosY=0; bool bSnapPosYDC=false; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 04ee1d9285bf..ff9ba23870f4 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1157,7 +1157,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) pView->GetAttributes(aSet); SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId); - rtl::OUString aNewText(pBrowse->GetNewEntryValue()); + OUString aNewText(pBrowse->GetNewEntryValue()); sal_Bool bDel( aNewText == "del" || aNewText == "Del" || aNewText == "DEL" @@ -1184,7 +1184,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (nPos!=01) { bPairX=nPos>0; - rtl::OUString s(aNewText.copy(nPos+nSepLen)); + OUString s(aNewText.copy(nPos+nSepLen)); bPairY = !aNewText.isEmpty(); nLongY = s.toInt32(); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 12e77d0dc667..70eeeb395e81 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -299,9 +299,9 @@ SdrModel::~SdrModel() #ifdef DBG_UTIL if(pAktUndoGroup) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "In the Dtor of the SdrModel there is an open Undo left: \"")); - aStr.append(rtl::OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding())) + aStr.append(OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding())) .append('\"'); OSL_FAIL(aStr.getStr()); } @@ -913,7 +913,7 @@ uno::Reference<embed::XStorage> SdrModel::GetDocumentStorage() const } uno::Reference<io::XInputStream> -SdrModel::GetDocumentStream( ::rtl::OUString const& rURL, +SdrModel::GetDocumentStream( OUString const& rURL, ::comphelper::LifecycleProxy & rProxy) const { uno::Reference<embed::XStorage> const xStorage(GetDocumentStorage()); @@ -1239,7 +1239,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } } -void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const +void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const { // #i22167# // change to double precision usage to not lose decimal places @@ -1277,7 +1277,7 @@ void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, nKomma = nNumDigits; } - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(static_cast<sal_Int32>(fLocalValue + 0.5)); if(nKomma < 0) @@ -1355,14 +1355,14 @@ void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar) const +void SdrModel::TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar) const { bool bNeg = nWink < 0; if(bNeg) nWink = -nWink; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(static_cast<sal_Int32>(nWink)); SvtSysLocale aSysLoc; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index fe89daed66dc..03468235ea88 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -170,11 +170,11 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) { MSO_SPT eRetValue = mso_sptNil; - rtl::OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); + OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" ) { - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny && ( *pAny >>= sShapeType ) ) @@ -424,7 +424,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { Sequence< Any > aArgument( 1 ); Sequence< PropertyValue > aPropValues( 1 ); - aPropValues[ 0 ].Name = rtl::OUString("CustomShape"); + aPropValues[ 0 ].Name = OUString("CustomShape"); aPropValues[ 0 ].Value <<= aXShape; aArgument[ 0 ] <<= aPropValues; Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) ); @@ -475,7 +475,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const sal_Bool SdrObjCustomShape::IsTextPath() const { - const rtl::OUString sTextPath( "TextPath" ); + const OUString sTextPath( "TextPath" ); sal_Bool bTextPathOn = sal_False; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath ); @@ -487,8 +487,8 @@ sal_Bool SdrObjCustomShape::IsTextPath() const sal_Bool SdrObjCustomShape::UseNoFillStyle() const { sal_Bool bRet = sal_False; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) @@ -502,7 +502,7 @@ sal_Bool SdrObjCustomShape::IsMirroredX() const { sal_Bool bMirroredX = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) *pAny >>= bMirroredX; @@ -512,7 +512,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const { sal_Bool bMirroredY = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) *pAny >>= bMirroredY; @@ -521,7 +521,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); PropertyValue aPropVal; aPropVal.Name = sMirroredX; aPropVal.Value <<= bMirrorX; @@ -531,7 +531,7 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); PropertyValue aPropVal; aPropVal.Name = sMirroredY; aPropVal.Value <<= bMirrorY; @@ -559,8 +559,8 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { const com::sun::star::uno::Any* pAny; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sTextRotateAngle( "TextRotateAngle" ); - const rtl::OUString sTextPreRotateAngle( "TextPreRotateAngle" ); + const OUString sTextRotateAngle( "TextRotateAngle" ); + const OUString sTextPreRotateAngle( "TextPreRotateAngle" ); pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? sTextPreRotateAngle : sTextRotateAngle ); double fExtraTextRotateAngle = 0.0; if ( pAny ) @@ -742,7 +742,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s // POSITION { - const rtl::OUString sPosition( "Position" ); + const OUString sPosition( "Position" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false ); @@ -751,28 +751,28 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) { - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); sal_Bool bMirroredX = sal_True; rPropValues[ n ].Name = sMirroredX; rPropValues[ n++ ].Value <<= bMirroredX; } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) { - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); sal_Bool bMirroredY = sal_True; rPropValues[ n ].Name = sMirroredY; rPropValues[ n++ ].Value <<= bMirroredY; } if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) { - const rtl::OUString sSwitched( "Switched" ); + const OUString sSwitched( "Switched" ); sal_Bool bSwitched = sal_True; rPropValues[ n ].Name = sSwitched; rPropValues[ n++ ].Value <<= bSwitched; } if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) { - const rtl::OUString sPolar( "Polar" ); + const OUString sPolar( "Polar" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, true ); @@ -784,7 +784,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); + const OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -793,7 +793,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); + const OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -806,7 +806,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMinimum( "RangeXMinimum" ); + const OUString sRangeXMinimum( "RangeXMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -815,7 +815,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMaximum( "RangeXMaximum" ); + const OUString sRangeXMaximum( "RangeXMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -824,7 +824,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMinimum( "RangeYMinimum" ); + const OUString sRangeYMinimum( "RangeYMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, true ); @@ -833,7 +833,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMaximum( "RangeYMaximum" ); + const OUString sRangeYMaximum( "RangeYMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, false ); @@ -864,11 +864,11 @@ SdrObjCustomShape::~SdrObjCustomShape() InvalidateRenderGeometry(); } -void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) +void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) { PropertyValue aPropVal; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); if ( pType && !pType->isEmpty() ) { @@ -900,7 +900,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) ////////////////////// // AdjustmentValues // ////////////////////// - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; @@ -936,7 +936,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) /////////////// // Coordsize // /////////////// - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( !pViewBox || !(*pViewBox >>= aViewBox ) ) @@ -953,12 +953,12 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); ////////////////////// // Path/Coordinates // ////////////////////// - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -977,7 +977,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/GluePoints // - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -995,7 +995,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/Segments // - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) { @@ -1015,7 +1015,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchX // - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) { @@ -1029,7 +1029,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchY // - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) { @@ -1043,7 +1043,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/TextFrames // - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { @@ -1065,11 +1065,11 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Equations // - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< rtl::OUString > seqEquations; + com::sun::star::uno::Sequence< OUString > seqEquations; sal_Int32 i, nCount = pDefCustomShape->nCalculation; seqEquations.realloc( nCount ); @@ -1082,7 +1082,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Handles // - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { @@ -1111,8 +1111,8 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) sal_Bool bIsDefaultGeometry = sal_False; PropertyValue aPropVal; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any *pAny = aGeometryItem.GetPropertyValueByName( sType ); @@ -1122,12 +1122,12 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType ); const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); switch( eDefaultType ) { case DEFAULT_VIEWBOX : { - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && ( *pViewBox >>= aViewBox ) ) @@ -1141,7 +1141,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_PATH : { - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -1166,7 +1166,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_GLUEPOINTS : { - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -1192,7 +1192,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { // Path/Segments // - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) { @@ -1236,7 +1236,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHX : { - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny && pDefCustomShape ) { @@ -1254,7 +1254,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHY : { - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny && pDefCustomShape ) { @@ -1272,11 +1272,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_EQUATIONS : { - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< rtl::OUString > seqEquations1, seqEquations2; + com::sun::star::uno::Sequence< OUString > seqEquations1, seqEquations2; if ( *pAny >>= seqEquations1 ) { sal_Int32 i, nCount = pDefCustomShape->nCalculation; @@ -1297,7 +1297,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_TEXTFRAMES : { - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { @@ -1325,7 +1325,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_HANDLES : { - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { @@ -1661,7 +1661,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredX" // if ( bHorz ) { - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) { @@ -1681,7 +1681,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredY" // if ( bVert ) { - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) { @@ -2942,7 +2942,7 @@ void SdrObjCustomShape::SaveGeoData(SdrObjGeoData& rGeo) const rAGeo.bMirroredX = IsMirroredX(); rAGeo.bMirroredY = IsMirroredY(); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); Any* pAny( ( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ).GetPropertyValueByName( sAdjustmentValues ) ); if ( pAny ) *pAny >>= rAGeo.aAdjustmentSeq; @@ -2957,7 +2957,7 @@ void SdrObjCustomShape::RestGeoData(const SdrObjGeoData& rGeo) SetMirroredY( rAGeo.bMirroredY ); SdrCustomShapeGeometryItem rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); PropertyValue aPropVal; aPropVal.Name = sAdjustmentValues; aPropVal.Value <<= rAGeo.aAdjustmentSeq; @@ -3180,14 +3180,14 @@ sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact() } // #i33136# -bool SdrObjCustomShape::doConstructOrthogonal(const ::rtl::OUString& rName) +bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName) { bool bRetval(false); - static ::rtl::OUString Imps_sNameASOrtho_quadrat( "quadrat" ); - static ::rtl::OUString Imps_sNameASOrtho_round_quadrat( "round-quadrat" ); - static ::rtl::OUString Imps_sNameASOrtho_circle( "circle" ); - static ::rtl::OUString Imps_sNameASOrtho_circle_pie( "circle-pie" ); - static ::rtl::OUString Imps_sNameASOrtho_ring( "ring" ); + static OUString Imps_sNameASOrtho_quadrat( "quadrat" ); + static OUString Imps_sNameASOrtho_round_quadrat( "round-quadrat" ); + static OUString Imps_sNameASOrtho_circle( "circle" ); + static OUString Imps_sNameASOrtho_circle_pie( "circle-pie" ); + static OUString Imps_sNameASOrtho_ring( "ring" ); if(Imps_sNameASOrtho_quadrat.equalsIgnoreAsciiCase(rName)) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 76dcf8d1f07e..c997592f440a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -207,9 +207,9 @@ bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pOb return false; } -rtl::OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const +OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const { - return rtl::OUString(); + return OUString(); } SdrObjUserDataList::SdrObjUserDataList() {} @@ -723,7 +723,7 @@ SdrObject* SdrObject::GetUpGroup() const return pObjList!=NULL ? pObjList->GetOwnerObj() : NULL; } -void SdrObject::SetName(const rtl::OUString& rStr) +void SdrObject::SetName(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -757,17 +757,17 @@ void SdrObject::SetName(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetName() const +OUString SdrObject::GetName() const { if(pPlusData) { return pPlusData->aObjName; } - return rtl::OUString(); + return OUString(); } -void SdrObject::SetTitle(const rtl::OUString& rStr) +void SdrObject::SetTitle(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -801,17 +801,17 @@ void SdrObject::SetTitle(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetTitle() const +OUString SdrObject::GetTitle() const { if(pPlusData) { return pPlusData->aObjTitle; } - return rtl::OUString(); + return OUString(); } -void SdrObject::SetDescription(const rtl::OUString& rStr) +void SdrObject::SetDescription(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -845,14 +845,14 @@ void SdrObject::SetDescription(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetDescription() const +OUString SdrObject::GetDescription() const { if(pPlusData) { return pPlusData->aObjDescription; } - return rtl::OUString(); + return OUString(); } sal_uInt32 SdrObject::GetOrdNum() const @@ -1078,7 +1078,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(STR_ObjNamePluralNONE); } -void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal) const +void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const { rStr = ImpGetResStr(nStrCacheID); sal_Int32 nPos = rStr.indexOf("%1"); @@ -1103,18 +1103,18 @@ void SdrObject::ImpForcePlusData() pPlusData = NewPlusData(); } -rtl::OUString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const +OUString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const { - rtl::OUString aStr; + OUString aStr; if (pModel!=NULL) { pModel->TakeWinkStr(nWink,aStr,bNoDegChar); } return aStr; } -rtl::OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const +OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const { - rtl::OUString aStr; + OUString aStr; if (pModel!=NULL) { pModel->TakeMetricStr(nVal,aStr,bNoUnitChars); } @@ -1874,13 +1874,13 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) return false; } -rtl::OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { SdrObjUserData* pData=ImpGetMacroUserData(); if (pData!=NULL) { return pData->GetMacroPopupComment(rRec,this); } - return rtl::OUString(); + return OUString(); } bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 20e1675e4280..de6779e1c78c 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -391,7 +391,7 @@ String SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } else { - rtl::OUString aStr; + OUString aStr; if(!pHdl) { diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index a5a24da972ba..7cfbae08468e 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -560,9 +560,9 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const if(bCreateComment) { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_ViewCreateObj, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); const sal_uInt32 nPntAnz(rDrag.GetPointAnz()); if(OBJ_CIRC != meCircleKind && nPntAnz > 2) @@ -595,9 +595,9 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const { const sal_Int32 nWink(1 == rDrag.GetHdl()->GetPointNum() ? nStartWink : nEndWink); - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragCircAngle, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); aBuf.appendAscii(" ("); aBuf.append(GetWinkStr(nWink,false)); aBuf.append(sal_Unicode(')')); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index a62ec29fd651..6c1c8643f084 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1930,7 +1930,7 @@ String SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } else { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragEdgeTail, aStr); return aStr; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index bd9be1b732a3..3f7a14e7b8be 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = rtl::OUString( "CreateNativeLink" ); + aFilterData[ 0 ].Name = OUString( "CreateNativeLink" ); aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } @@ -620,7 +620,7 @@ void SdrGrafObj::ImpLinkAbmeldung() } } -void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName) +void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const String& rFilterName) { ImpLinkAbmeldung(); aFileName = rFileName; @@ -635,8 +635,8 @@ void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rF void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); - aFileName = rtl::OUString(); - aFilterName = rtl::OUString(); + aFileName = OUString(); + aFilterName = OUString(); } bool SdrGrafObj::IsLinkedGraphic() const @@ -644,12 +644,12 @@ bool SdrGrafObj::IsLinkedGraphic() const return !aFileName.isEmpty(); } -const rtl::OUString& SdrGrafObj::GetFileName() const +const OUString& SdrGrafObj::GetFileName() const { return aFileName; } -const rtl::OUString& SdrGrafObj::GetFilterName() const +const OUString& SdrGrafObj::GetFilterName() const { return aFilterName; } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index a2ad1574dca5..ccd69b8b0ebd 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -112,7 +112,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator()); } - rtl::OUString aTmp; + OUString aTmp; pModel->TakeMetricStr(nLen, aTmp, true, nNumDigits); rStr = aTmp; diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 6d4fee8e95e2..085e805ec2ab 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -51,8 +51,8 @@ using namespace ::com::sun::star; // hence the shared_ptr. struct MediaTempFile { - ::rtl::OUString const m_TempFileURL; - MediaTempFile(::rtl::OUString const& rURL) : m_TempFileURL(rURL) {} + OUString const m_TempFileURL; + MediaTempFile(OUString const& rURL) : m_TempFileURL(rURL) {} ~MediaTempFile() { ::osl::File::remove(m_TempFileURL); @@ -184,7 +184,7 @@ uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() { if( !m_pImpl->m_xCachedSnapshot.is() ) { - rtl::OUString aRealURL = m_pImpl->m_MediaProperties.getTempURL(); + OUString aRealURL = m_pImpl->m_MediaProperties.getTempURL(); if( aRealURL.isEmpty() ) aRealURL = m_pImpl->m_MediaProperties.getURL(); m_pImpl->m_xCachedSnapshot = avmedia::MediaWindow::grabFrame( aRealURL, true ); @@ -240,7 +240,7 @@ void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly / // ------------------------------------------------------------------------------ -void SdrMediaObj::setURL( const ::rtl::OUString& rURL) +void SdrMediaObj::setURL( const OUString& rURL) { ::avmedia::MediaItem aURLItem; @@ -250,7 +250,7 @@ void SdrMediaObj::setURL( const ::rtl::OUString& rURL) // ------------------------------------------------------------------------------ -const ::rtl::OUString& SdrMediaObj::getURL() const +const OUString& SdrMediaObj::getURL() const { return m_pImpl->m_MediaProperties.getURL(); } @@ -294,9 +294,9 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() /// copy a stream from XStorage to temp file static bool lcl_HandlePackageURL( - ::rtl::OUString const & rURL, + OUString const & rURL, SdrModel *const pModel, - ::rtl::OUString & o_rTempFileURL) + OUString & o_rTempFileURL) { if (!pModel) { @@ -310,7 +310,7 @@ static bool lcl_HandlePackageURL( } catch (container::NoSuchElementException const&) { - SAL_INFO("svx", "not found: '" << ::rtl::OUString(rURL) << "'"); + SAL_INFO("svx", "not found: '" << OUString(rURL) << "'"); return false; } catch (uno::Exception const& e) @@ -324,7 +324,7 @@ static bool lcl_HandlePackageURL( return false; } - ::rtl::OUString tempFileURL; + OUString tempFileURL; ::osl::FileBase::RC const err = ::osl::FileBase::createTempFile(0, 0, & tempFileURL); if (::osl::FileBase::E_None != err) @@ -361,7 +361,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper ( rNewProperties.getURL() != getURL() )) { m_pImpl->m_xCachedSnapshot.clear(); - ::rtl::OUString const url(rNewProperties.getURL()); + OUString const url(rNewProperties.getURL()); if ((0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( url.getStr(), url.getLength(), s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1))) @@ -370,7 +370,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper || (m_pImpl->m_pTempFile->m_TempFileURL != rNewProperties.getTempURL())) { - ::rtl::OUString tempFileURL; + OUString tempFileURL; bool const bSuccess = lcl_HandlePackageURL( url, GetModel(), tempFileURL); if (bSuccess) @@ -381,7 +381,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper else // this case is for Clone via operator= { m_pImpl->m_pTempFile.reset(); - m_pImpl->m_MediaProperties.setURL(::rtl::OUString(), 0); + m_pImpl->m_MediaProperties.setURL(OUString(), 0); } } else diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index d3b409025d61..c1ee6cf38574 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -434,7 +434,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager()); if ( xLayoutManager.is() ) { - const static rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + const static OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( !xLayoutManager->isElementVisible( aMenuBarURL ) ) xLayoutManager->createElement( aMenuBarURL ); } @@ -450,7 +450,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj)); try { - xMan.set(xFrame->getPropertyValue( ::rtl::OUString("LayoutManager") ),uno::UNO_QUERY); + xMan.set(xFrame->getPropertyValue( OUString("LayoutManager") ),uno::UNO_QUERY); } catch ( uno::Exception& ) { @@ -918,8 +918,8 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() // TODO/LATER: there should be possible to get current mediadescriptor settings from the object uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); - aArgs[0].Value <<= ::rtl::OUString( aNewLinkURL ); + aArgs[0].Name = OUString( "URL" ); + aArgs[0].Value <<= OUString( aNewLinkURL ); xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); mpImpl->maLinkURL = aNewLinkURL; @@ -933,7 +933,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::UpdateLinkURL_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -975,7 +975,7 @@ void SdrOle2Obj::BreakFileLink_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::BreakFileLink_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1026,7 +1026,7 @@ void SdrOle2Obj::CheckFileLink_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::CheckFileLink_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1060,7 +1060,7 @@ void SdrOle2Obj::Connect_Impl() if ( xObjRef.is() ) { // object came from the outside, now add it to the container - ::rtl::OUString aTmp; + OUString aTmp; rContainer.InsertEmbeddedObject( xObjRef.GetObject(), aTmp ); mpImpl->aPersistName = aTmp; } @@ -1110,7 +1110,7 @@ void SdrOle2Obj::Connect_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::Connect_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1197,7 +1197,7 @@ void SdrOle2Obj::RemoveListeners_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::RemoveListeners_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1279,7 +1279,7 @@ void SdrOle2Obj::Disconnect_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::Disconnect_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1397,7 +1397,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) try { // move the object's storage; ObjectRef remains the same, but PersistName may change - ::rtl::OUString aTmp; + OUString aTmp; comphelper::EmbeddedObjectContainer& rContainer = pSrcPers->getEmbeddedObjectContainer(); uno::Reference < embed::XEmbeddedObject > xObj = rContainer.GetEmbeddedObject( mpImpl->aPersistName ); DBG_ASSERT( !xObjRef.is() || xObjRef.GetObject() == xObj, "Wrong object identity!" ); @@ -1414,7 +1414,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) OSL_FAIL( OString(OString("SdrOle2Obj::SetModel(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1647,7 +1647,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj) uno::Reference < embed::XEmbeddedObject > xObj = rContainer.GetEmbeddedObject( mpImpl->aPersistName ); if ( xObj.is() ) { - ::rtl::OUString aTmp; + OUString aTmp; xObjRef.Assign( pDestPers->getEmbeddedObjectContainer().CopyAndGetEmbeddedObject( rContainer, xObj, aTmp ), rOle2Obj.GetAspect() ); m_bTypeAsked = false; mpImpl->aPersistName = aTmp; @@ -1937,7 +1937,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb OSL_FAIL( OString(OString("SdrOle2Obj::Unload=(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2091,13 +2091,13 @@ sal_Bool SdrOle2Obj::IsChart() const } // ----------------------------------------------------------------------------- -void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const ::rtl::OUString& aMediaType ) +void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ) { xObjRef.SetGraphic( aGraphic, aMediaType ); } // ----------------------------------------------------------------------------- -void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const ::rtl::OUString& aMediaType ) +void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const OUString& aMediaType ) { xObjRef.SetGraphicStream( xGrStream, aMediaType ); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 03b003343552..2114653c37bb 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -920,7 +920,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser(); const SdrObjKind eKindMerk(meObjectKind); mrSdrPathObject.meKind = pU->eAktKind; - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aTmp); aStr = aTmp; mrSdrPathObject.meKind = eKindMerk; @@ -934,7 +934,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) aNow -= aPrev; aStr.AppendAscii(" ("); - rtl::OUString aMetr; + OUString aMetr; if(pU->bCircle) { @@ -972,7 +972,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) { // #i103058# fallback when no model and/or Handle, both needed // for else-path - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_DragPathObj, aTmp); aStr = aTmp; } @@ -997,7 +997,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(!pDragData->IsMultiPointDrag() && pDragData->bEliminate) { // point of ... - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aTmp); aStr = aTmp; @@ -1013,7 +1013,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) // dx=0.00 dy=0.00 -- both sides bezier // dx=0.00 dy=0.00 l=0.00 0.00° -- one bezier/lever on one side, a start, or an ending // dx=0.00 dy=0.00 l=0.00 0.00° / l=0.00 0.00° -- in between - rtl::OUString aMetr; + OUString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index a60894e46147..3e2e1d094ecf 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -439,9 +439,9 @@ String SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const if(nRad < 0) nRad = 0; - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragRectEckRad, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); aBuf.appendAscii(" ("); aBuf.append(GetMetrStr(nRad)); aBuf.append(sal_Unicode(')')); @@ -509,7 +509,7 @@ bool SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec) return SdrTextObj::DoMacro(rRec); } -rtl::OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { return SdrTextObj::GetMacroPopupComment(rRec); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 763465aae58f..8aa6fd274d0d 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -857,7 +857,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS { // check whether CharStretching is possible at all GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); - rtl::OUString aTestString(static_cast<sal_Unicode>('J')); + OUString aTestString(static_cast<sal_Unicode>('J')); if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf = NULL; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 99ef8f541acd..1402a426879b 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -173,7 +173,7 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag) String SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragRectResize,aStr); return aStr; } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 05699f1e3cb8..a01ab9dc6a52 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -176,7 +176,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( "DateModified" ) ) ); + ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( OUString( "DateModified" ) ) ); ::com::sun::star::util::DateTime aDateTime; aAny >>= aDateTime; @@ -213,7 +213,7 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aFileURLStr; + OUString aFileURLStr; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aFileURLStr ) ) aFileURL = INetURLObject( aFileURLStr ); diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index f9f2ca7b689b..533668bbb309 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -245,7 +245,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode ) { uno::Reference< beans::XPropertySet > xModelProperties( GetUnoControlModel(), uno::UNO_QUERY_THROW ); xModelProperties->setPropertyValue( - ::rtl::OUString( "ContextWritingMode" ), + OUString( "ContextWritingMode" ), uno::makeAny( _nContextWritingMode ) ); } @@ -334,8 +334,8 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj) uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aValue( xSet->getPropertyValue( rtl::OUString("DefaultControl")) ); - ::rtl::OUString aStr; + uno::Any aValue( xSet->getPropertyValue( OUString("DefaultControl")) ); + OUString aStr; if( aValue >>= aStr ) aUnoControlTypeName = String(aStr); @@ -536,7 +536,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >& if (xSet.is()) { uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", osl_getThreadTextEncoding())) ); - ::rtl::OUString aStr; + OUString aStr; if( aValue >>= aStr ) aUnoControlTypeName = String(aStr); } diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 962d671f68fe..2e80aa526488 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -624,7 +624,7 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) return rRefObj.DoMacro(rRec); // TODO: positioning offset } -rtl::OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { return rRefObj.GetMacroPopupComment(rRec); // TODO: positioning offset } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 3d181c25d581..ad737bf7cce6 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -195,7 +195,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) } } else { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrObjList::operator=(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index a85b378cfa52..e8f3a9f0d0f8 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -363,7 +363,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrExchangeView::Paste(): Error when cloning ")); if(nCloneErrCnt == 1) @@ -754,7 +754,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrExchangeView::GetMarkedObjModel(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index a18f3a9ced5f..61e7dfceb589 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -33,7 +33,6 @@ #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> -using ::rtl::OUString; using namespace ::sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -296,7 +295,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this)); + throw uno::RuntimeException (OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() )); @@ -425,14 +424,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) // -------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getTitledBorderText(); } // -------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getToolTipText(); } @@ -548,7 +547,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt return mnIndexInParent; } -::rtl::OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 0750e61e112d..6938dc2acaab 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -70,7 +70,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); @@ -87,16 +87,16 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException); // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 66ff42170751..0bd4d8b27ab7 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -34,7 +34,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace ::accessibility; using namespace ::sdr::table; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3a33a282b9ec..fff251a6857e 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -54,7 +54,6 @@ // ----------------------------------------------------------------------------- using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; @@ -1753,7 +1752,7 @@ void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) throw (RuntimeExc static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if (nCol < 26*26) { diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 48f9f19dcb7b..34ce0c15d3e0 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -112,9 +112,9 @@ public: SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XLayoutConstrains SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw (::com::sun::star::uno::RuntimeException); @@ -127,8 +127,8 @@ public: SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL isMerged() throw (::com::sun::star::uno::RuntimeException); // XCell - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); @@ -136,30 +136,30 @@ public: // ::com::sun::star::beans::XPropertySet SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const ::rtl::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); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); // XMultiPropertySet - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE 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); SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE 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); // ::com::sun::star::beans::XPropertyState - SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE 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); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE 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); // XMultiPropertyStates SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFastPropertySet SVX_DLLPRIVATE virtual 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); @@ -172,15 +172,15 @@ public: // XSimpleText SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XTextRange SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getString( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException); // XEventListener SVX_DLLPRIVATE virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); @@ -198,7 +198,7 @@ public: SVX_DLLPRIVATE void notifyModified(); - ::rtl::OUString getName(); + OUString getName(); protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet(); @@ -216,7 +216,7 @@ private: ::com::sun::star::table::CellContentType mnCellContentType; - ::rtl::OUString msFormula; + OUString msFormula; double mfValue; ::sal_Int32 mnError; ::sal_Bool mbMerged; diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 42cd6764e59d..bd3ad5818f0f 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -28,7 +28,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index a25ca2b183c5..b5535537a48a 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -46,7 +46,7 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XCellCursor virtual void SAL_CALL gotoStart( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 23d521713b8f..2d04fd389d95 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -22,7 +22,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 1c588e204c01..72ba4e89dbfc 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -49,7 +49,7 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); protected: TableModelRef mxTable; diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 03ea0ae910f5..a5bba34dec28 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -20,7 +20,6 @@ #include "propertyset.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index e8b64966d87f..ed8540bac57c 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -36,7 +36,7 @@ namespace sdr { namespace table { // ----------------------------------------------------------------------------- typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; +typedef boost::unordered_map< OUString, ::sal_uInt32, OUStringHash, ::std::equal_to< OUString > > PropertyMap; // ----------------------------------------------------------------------------- @@ -48,13 +48,13 @@ public: void addProperties( const PropertyVector& rProps ); - const ::com::sun::star::beans::Property& getProperty( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); - const ::com::sun::star::beans::Property* hasProperty( const ::rtl::OUString& aName ); + const ::com::sun::star::beans::Property& getProperty( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); + const ::com::sun::star::beans::Property* hasProperty( const OUString& aName ); // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); private: PropertyVector maProperties; @@ -71,20 +71,20 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + 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 ::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 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); + 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); + 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); + 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); // XMultiPropertySet // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + 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); + 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); + 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); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + 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); // XFastPropertySet virtual 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) = 0; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 7c368f557cb8..85551b5ca459 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -59,7 +59,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -326,7 +325,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) Reference< XStyleFamiliesSupplier > xSFS( pNewModel->getUnoModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW ); - const rtl::OUString sFamilyName( "table" ); + const OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW ); if( xTableFamilyAccess->hasByName( sStyleName ) ) diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 6a68466f2dbc..cd781ec9b1fb 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -27,7 +27,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index a77a0aa5b125..de135c68ca8f 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -53,11 +53,11 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual 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); @@ -72,7 +72,7 @@ private: sal_Bool mbOptimalWidth; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; } } diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 349684886226..77428a8373b6 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -25,7 +25,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 0330cf7f13f5..7400cf770134 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -64,7 +64,6 @@ #include <vcl/msgbox.hxx> using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index a84dc2e5b68b..ac36a3414e77 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; -using ::rtl::OUString; using ::osl::MutexGuard; using ::osl::ClearableMutexGuard; using ::cppu::OInterfaceContainerHelper; diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index c00329c0d1d1..a4dfefb60bf8 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -39,7 +39,6 @@ #include "svx/svdglob.hxx" using ::editeng::SvxBorderLine; -using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 6d2fd9e19af2..f927f6431258 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -145,7 +145,7 @@ private: com::sun::star::text::WritingMode meWritingMode; - const rtl::OUString msSize; + const OUString msSize; }; } } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 2ed05f88dc58..62d20c204302 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -38,7 +38,6 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; @@ -474,7 +473,7 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw // ----------------------------------------------------------------------------- -void SAL_CALL TableModel::setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { } diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 44577f8dc92a..77768a635aa3 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -124,16 +124,16 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + 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 ::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 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); + 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); + 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); + 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); // XFastPropertySet virtual 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); diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index ab164ddc48f4..a994ce01bed6 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -28,7 +28,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 212dd0aa1850..d1fd8e1ca723 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -56,11 +56,11 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual 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); @@ -76,7 +76,7 @@ private: sal_Bool mbOptimalHeight; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; } } diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index c9821c859b8c..6bba9e6d8ddc 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -26,7 +26,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index f96cb5c8f509..c3f0afcedcf5 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -41,7 +41,6 @@ #include "editeng/outlobj.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; @@ -136,7 +135,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa xRowSet->getPropertyValue( msSize ) >>= nRowHeight; mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(nRowHeight).getStr(); + mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(nRowHeight).getStr(); const sal_Int32 nColCount = mxTable->getColumnCount(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -146,7 +145,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa if( !xCell.is() ) continue; - mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(aColumnStart[nCol]).getStr(); + mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(aColumnStart[nCol]).getStr(); if ( (nCol & 0x0F) == 0x0F ) mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index ad82f00837cd..ec6e78ac66cb 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -40,7 +40,6 @@ #include "svx/svdmodel.hxx" #include "editeng/svxrtf.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 725b60eea163..e889427ef354 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -30,7 +30,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 79e876231df4..4f816a477650 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -60,7 +60,7 @@ private: ::com::sun::star::table::CellContentType mnCellContentType; - ::rtl::OUString msFormula; + OUString msFormula; double mfValue; ::sal_Int32 mnError; ::sal_Bool mbMerged; @@ -174,7 +174,7 @@ private: sal_Bool mbOptimalWidth; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; void setData( const Data& rData ); @@ -207,7 +207,7 @@ private: sal_Bool mbOptimalHeight; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; void setData( const Data& rData ); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index a08ba91a05a0..42516081e956 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -40,7 +40,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow private: const sal_uInt16 theSlotId; ValueSet aColorSet; - rtl::OUString maCommand; + OUString maCommand; const Color mLastColor; DECL_LINK( SelectHdl, void * ); @@ -50,7 +50,7 @@ protected: virtual sal_Bool Close(); public: - SvxColorWindow_Impl( const rtl::OUString& rCommand, + SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle, diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 04b636094c54..20c18fae4886 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -51,7 +51,6 @@ //////////// -using ::rtl::OUString; //using ::svtools::ToolbarMenu; using namespace ::com::sun::star; @@ -465,13 +464,13 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) if ( IsInPopupMode() ) EndPopupMode(); - const rtl::OUString aCommand( ".uno:ExtrusionDepthDialog" ); + const OUString aCommand( ".uno:ExtrusionDepthDialog" ); Any a; Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = rtl::OUString( "Depth" ); + aArgs[0].Name = OUString( "Depth" ); aArgs[0].Value <<= mfDepth; - aArgs[1].Name = rtl::OUString( "Metric" ); + aArgs[1].Name = OUString( "Metric" ); aArgs[1].Value <<= static_cast<sal_Int32>( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -1004,7 +1003,7 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( - rtl::OUString( ".uno:Extrusion3DColor" ), + OUString( ".uno:Extrusion3DColor" ), SID_EXTRUSION_3D_COLOR, m_xFrame, SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ), diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index a09d111e434f..37d58e120dbc 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -53,8 +53,8 @@ private: Image maImgPerspective; Image maImgParallel; - const rtl::OUString msExtrusionDirection; - const rtl::OUString msExtrusionProjection; + const OUString msExtrusionDirection; + const OUString msExtrusionProjection; DECL_LINK( SelectHdl, void * ); void FillValueSet(); @@ -74,8 +74,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -97,8 +97,8 @@ private: FieldUnit meUnit; double mfDepth; - const rtl::OUString msExtrusionDepth; - const rtl::OUString msMetricUnit; + const OUString msExtrusionDepth; + const OUString msMetricUnit; DECL_LINK( SelectHdl, void * ); @@ -122,8 +122,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -149,8 +149,8 @@ private: int mnDirection; bool mbDirectionEnabled; - const rtl::OUString msExtrusionLightingDirection; - const rtl::OUString msExtrusionLightingIntensity; + const OUString msExtrusionLightingDirection; + const OUString msExtrusionLightingIntensity; void implSetIntensity( int nLevel, bool bEnabled ); void implSetDirection( int nDirection, bool bEnabled ); @@ -173,8 +173,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -191,7 +191,7 @@ private: Image maImgSurface3; Image maImgSurface4; - const rtl::OUString msExtrusionSurface; + const OUString msExtrusionSurface; DECL_LINK( SelectHdl, void * ); @@ -213,8 +213,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index cfd9f5b3010e..91a012c7bfc9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -68,14 +68,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { - addStatusListener( rtl::OUString( ".uno:FillColor" )); - addStatusListener( rtl::OUString( ".uno:FillGradient" )); - addStatusListener( rtl::OUString( ".uno:FillHatch" )); - addStatusListener( rtl::OUString( ".uno:FillBitmap" )); - addStatusListener( rtl::OUString( ".uno:ColorTableState" )); - addStatusListener( rtl::OUString( ".uno:GradientListState" )); - addStatusListener( rtl::OUString( ".uno:HatchListState" )); - addStatusListener( rtl::OUString( ".uno:BitmapListState" )); + addStatusListener( OUString( ".uno:FillColor" )); + addStatusListener( OUString( ".uno:FillGradient" )); + addStatusListener( OUString( ".uno:FillHatch" )); + addStatusListener( OUString( ".uno:FillBitmap" )); + addStatusListener( OUString( ".uno:ColorTableState" )); + addStatusListener( OUString( ".uno:GradientListState" )); + addStatusListener( OUString( ".uno:HatchListState" )); + addStatusListener( OUString( ".uno:BitmapListState" )); } //======================================================================== @@ -416,7 +416,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr); XBitmapListRef xBitmapList = XPropertyList::CreatePropertyList(XBITMAP_LIST, - rtl::OUString("TmpList"))->AsBitmapList(); + OUString("TmpList"))->AsBitmapList(); xBitmapList->Insert( pEntry ); xBitmapList->SetDirty( sal_False ); pFillAttrLB->Fill( xBitmapList ); @@ -545,7 +545,7 @@ FillControl::~FillControl() IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); - ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( ".uno:FillStyle" )); + ( (SvxFillToolBoxControl*)GetData() )->updateStatus( OUString( ".uno:FillStyle" )); // ( (SvxFillToolBoxControl*)GetData() )->GetBindings().Invalidate( SID_ATTR_FILL_STYLE ); return 0; } @@ -673,12 +673,12 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = ::rtl::OUString( "FillStyle" ); + aArgs[0].Name = OUString( "FillStyle" ); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( - ::rtl::OUString( ".uno:FillStyle" ), aArgs ); + OUString( ".uno:FillStyle" ), aArgs ); ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) @@ -701,10 +701,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() ); - aArgs[0].Name = ::rtl::OUString( "FillColor" ); + aArgs[0].Name = OUString( "FillColor" ); aXFillColorItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillColor" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillColor" ), aArgs ); } break; @@ -722,10 +722,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = ::rtl::OUString( "FillGradient" ); + aArgs[0].Name = OUString( "FillGradient" ); aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillGradient" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillGradient" ), aArgs ); } } @@ -745,10 +745,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = ::rtl::OUString( "FillHatch" ); + aArgs[0].Name = OUString( "FillHatch" ); aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillHatch" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillHatch" ), aArgs ); } } @@ -769,10 +769,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = ::rtl::OUString( "FillBitmap" ); + aArgs[0].Name = OUString( "FillBitmap" ); aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(".uno:FillBitmap"), aArgs); + ((SvxFillToolBoxControl*)GetData())->Dispatch(OUString(".uno:FillBitmap"), aArgs); } } } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bd57fbfafafb..588483df8695 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -53,7 +53,6 @@ #include "helpid.hrc" -using ::rtl::OUString; using ::svtools::ToolbarMenu; using namespace ::com::sun::star; @@ -263,7 +262,7 @@ SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" ); + OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; } @@ -296,7 +295,7 @@ private: Image maImgAlgin4; Image maImgAlgin5; - const rtl::OUString msFontworkAlignment; + const OUString msFontworkAlignment; DECL_LINK( SelectHdl, void * ); @@ -410,8 +409,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -482,8 +481,8 @@ public: private: svt::ToolboxController& mrController; - const rtl::OUString msFontworkCharacterSpacing; - const rtl::OUString msFontworkKernCharacterPairs; + const OUString msFontworkCharacterSpacing; + const OUString msFontworkKernCharacterPairs; DECL_LINK( SelectHdl, void * ); @@ -648,8 +647,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 6aeb599adab1..63eb13c4de40 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,9 +61,9 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "PersistentCopy" ); + aArgs[0].Name = OUString( "PersistentCopy" ); aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) ); - Dispatch( rtl::OUString( ".uno:FormatPaintbrush" ) + Dispatch( OUString( ".uno:FormatPaintbrush" ) , aArgs ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 44890942f5d6..bd21a7a656bd 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -52,7 +52,6 @@ #include "svx/grafctrl.hxx" #include "svx/tbxcolor.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; @@ -63,7 +62,7 @@ using namespace ::com::sun::star::lang; #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() -#define TOOLBOX_NAME ::rtl::OUString( "colorbar" ) +#define TOOLBOX_NAME OUString( "colorbar" ) TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); @@ -100,19 +99,19 @@ protected: public: - ImplGrafMetricField( Window* pParent, const rtl::OUString& aCmd, const Reference< XFrame >& rFrame ); + ImplGrafMetricField( Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); ~ImplGrafMetricField(); void Update( const SfxPoolItem* pItem ); const OUString& GetCommand() const { return maCommand; } }; -ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), mxFrame( rFrame ) { - Size aSize( GetTextWidth( rtl::OUString("-100 %") ), GetTextHeight() ); + Size aSize( GetTextWidth( OUString("-100 %") ), GetTextHeight() ); aSize.Width() += 20, aSize.Height() += 6; SetSizePixel( aSize ); @@ -132,7 +131,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& const long nMinVal = ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) ? 0 : -100; SetUnit( FUNIT_CUSTOM ); - SetCustomUnitText( rtl::OUString(" %") ); + SetCustomUnitText( OUString(" %") ); SetDecimalDigits( 0 ); SetMin( nMinVal ); @@ -255,7 +254,7 @@ protected: public: - ImplGrafControl( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -264,7 +263,7 @@ public: ImplGrafControl::ImplGrafControl( Window* pParent, - const rtl::OUString& rCmd, + const OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) , maImage( this ) @@ -298,7 +297,7 @@ ImplGrafControl::ImplGrafControl( maImage.Show(); - maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); + maField.SetHelpId( OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } @@ -355,7 +354,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "GrafMode" ); + aArgs[0].Name = OUString( "GrafMode" ); aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -454,7 +453,7 @@ SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); + OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 76f170f0d21f..8043a54024df 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -130,11 +130,11 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "LineDash" ); + aArgs[0].Name = OUString( "LineDash" ); aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineDash" ), + OUString( ".uno:LineDash" ), aArgs ); } } @@ -144,11 +144,11 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "XLineStyle" ); + aArgs[0].Name = OUString( "XLineStyle" ); aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:XLineStyle" ), + OUString( ".uno:XLineStyle" ), aArgs ); nCurPos = GetSelectEntryPos(); @@ -264,7 +264,7 @@ void SvxLineBox::FillControl() SvxColorBox::SvxColorBox( Window* pParent, - const ::rtl::OUString& rCommand, + const OUString& rCommand, const Reference< XFrame >& rFrame, WinBits nBits ) : ColorLB( pParent, nBits ), @@ -428,7 +428,7 @@ SvxMetricField::SvxMetricField( aCurTxt( String() ), mxFrame( rFrame ) { - Size aSize = Size(GetTextWidth( rtl::OUString("99,99mm") ),GetTextHeight()); + Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); aSize.Width() += 20; aSize.Height() += 6; SetSizePixel( aSize ); @@ -474,11 +474,11 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "LineWidth" ); + aArgs[0].Name = OUString( "LineWidth" ); aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineWidth" ), + OUString( ".uno:LineWidth" ), aArgs ); } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index ff5bbc7b8e29..b458aa62d084 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -69,13 +69,13 @@ private: sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; - rtl::OUString maCommand; + OUString maCommand; DECL_LINK( SelectHdl, void * ); public: TableWindow( sal_uInt16 nSlotId, - const rtl::OUString& rCmd, + const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); @@ -104,7 +104,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl) // ----------------------------------------------------------------------- -TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), aTableButton( this ), nCol( 0 ), @@ -325,9 +325,9 @@ void TableWindow::PopupModeEnd() if ( !IsPopupModeCanceled() && nCol && nLine ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString( "Columns" ); + aArgs[0].Name = OUString( "Columns" ); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = ::rtl::OUString( "Rows" ); + aArgs[1].Name = OUString( "Rows" ); aArgs[1].Value = makeAny( sal_Int16( nLine )); TableDialog( aArgs ); @@ -370,7 +370,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) aTargetURL.Complete = maCommand; xTrans->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, rArgs ); } @@ -405,11 +405,11 @@ private: sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; - ::rtl::OUString maCommand; + OUString maCommand; void UpdateSize_Impl( long nNewCol ); public: - ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); + ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -424,7 +424,7 @@ public: // ----------------------------------------------------------------------- -ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), bInitialKeyInput(sal_True), m_bMod1(sal_False), @@ -685,9 +685,9 @@ void ColumnsWindow::PopupModeEnd() pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString( "Columns" ); + aArgs[0].Name = OUString( "Columns" ); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = ::rtl::OUString( "Modifier" ); + aArgs[1].Name = OUString( "Modifier" ); aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 )); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index e0adc57f125e..d5666600592e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -62,7 +62,7 @@ class SvxPopupWindowListBox : public SfxPopupWindow ToolBox & rToolBox; sal_Bool bUserSel; sal_uInt16 nTbxId; - rtl::OUString maCommandURL; + OUString maCommandURL; // disallow copy-constructor and assignment-operator SvxPopupWindowListBox(const int& ); @@ -71,7 +71,7 @@ class SvxPopupWindowListBox : public SfxPopupWindow // SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId ); public: - SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx ); + SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx ); virtual ~SvxPopupWindowListBox(); // SfxPopupWindow @@ -89,7 +89,7 @@ public: ///////////////////////////////////////////////////////////////// -SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : +SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), rToolBox ( rTbx ), bUserSel ( sal_False ), @@ -284,7 +284,7 @@ void SvxUndoRedoControl::StateChanged( const std::vector<String> &aLst = rItem.GetList(); for( long nI = 0, nEnd = aLst.size(); nI < nEnd; ++nI ) - aUndoRedoList.push_back( rtl::OUString( aLst[nI] )); + aUndoRedoList.push_back( OUString( aLst[nI] )); } } } @@ -294,9 +294,9 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); if ( m_aCommandURL == ".uno:Undo" ) - updateStatus( rtl::OUString( ".uno:GetUndoStrings" )); + updateStatus( OUString( ".uno:GetUndoStrings" )); else - updateStatus( rtl::OUString( ".uno:GetRedoStrings" )); + updateStatus( OUString( ".uno:GetRedoStrings" )); ToolBox& rBox = GetToolBox(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 2f26f7b52cb2..9ec8f635d928 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -65,8 +65,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, pDashItem ( NULL ), bUpdate ( sal_False ) { - addStatusListener( ::rtl::OUString( ".uno:LineDash" )); - addStatusListener( ::rtl::OUString( ".uno:DashListState" )); + addStatusListener( OUString( ".uno:LineDash" )); + addStatusListener( OUString( ".uno:DashListState" )); } //======================================================================== @@ -205,7 +205,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( ".uno:MetricUnit" )); + addStatusListener( OUString( ".uno:MetricUnit" )); } //======================================================================== @@ -272,7 +272,7 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( ".uno:ColorTableState" )); + addStatusListener( OUString( ".uno:ColorTableState" )); } //======================================================================== @@ -412,7 +412,7 @@ void SvxLineEndWindow::implInit() // ValueSet mit Eintraegen der LineEndList fuellen FillValueSet(); - AddStatusListener( rtl::OUString( ".uno:LineEndListState" )); + AddStatusListener( OUString( ".uno:LineEndListState" )); //ChangeHelpId( HID_POPUP_LINEENDSTYLE ); aLineEndSet.Show(); @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = ::rtl::OUString( "LineStart" ); + aArgs[0].Name = OUString( "LineStart" ); pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = ::rtl::OUString( "LineEnd" ); + aArgs[0].Name = OUString( "LineEnd" ); pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) aLineEndSet.SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineEndStyle" ), + OUString( ".uno:LineEndStyle" ), aArgs ); delete pLineEndItem; diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 040dbf0d7fbc..e70ef72988c4 100644 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -48,7 +48,7 @@ SfxPopupWindow* SvxSubToolBoxControl::CreatePopupWindow() } if( pResource ) - createAndPositionSubToolBar( rtl::OUString::createFromAscii( pResource ) ); + createAndPositionSubToolBar( OUString::createFromAscii( pResource ) ); return NULL; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index aac889d35cc9..55be77165dfb 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -102,7 +102,6 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ); static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); // namespaces -using ::rtl::OUString; using namespace ::editeng; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -145,7 +144,7 @@ public: inline void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } inline void RemoveVisibilityListener() { aVisibilityListener = Link(); } - void SetDefaultStyle( const ::rtl::OUString& rDefault ) { sDefaultStyle = rDefault; } + void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } DECL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control* ); protected: @@ -304,7 +303,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener public: SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, - const rtl::OUString& rCommand, + const OUString& rCommand, SvxStyleToolBoxControl& rTbxCtl ); protected: @@ -320,7 +319,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleBox_Impl::SvxStyleBox_Impl( Window* pParent, - const rtl::OUString& rCommand, + const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame, @@ -1048,7 +1047,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, Reference< XDispatchProvider > aDisp( GetFrame()->getController(), UNO_QUERY ); SfxQueryStatus aQueryStatus( aDisp, SID_ATTR_AUTO_COLOR_INVALID, - rtl::OUString( ".uno:AutoColorInvalid" )); + OUString( ".uno:AutoColorInvalid" )); SfxItemState eState = aQueryStatus.QueryState( pDummy ); if( (SFX_ITEM_DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) ) { @@ -1102,7 +1101,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SetText( rWndTitle ); aColorSet.Show(); - AddStatusListener( rtl::OUString( ".uno:ColorTableState" )); + AddStatusListener( OUString( ".uno:ColorTableState" )); } SvxColorWindow_Impl::~SvxColorWindow_Impl() @@ -1248,7 +1247,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram { BindListener(); - AddStatusListener(rtl::OUString(".uno:BorderReducedMode")); + AddStatusListener(OUString(".uno:BorderReducedMode")); aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); /* @@ -1522,7 +1521,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame try { Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW ); - m_bIsWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")); + m_bIsWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument")); } catch(const uno::Exception& ) { @@ -1659,7 +1658,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, // Family-ID - const rtl::OUString& rCommand, // .uno: command bound to this item + const OUString& rCommand, // .uno: command bound to this item SvxStyleToolBoxControl& rTbxCtl ) // Controller-Instanz, dem dieses Item zugeordnet ist. : SfxStatusListener( rDispatchProvider, nSlotId, rCommand ), rControl( rTbxCtl ) @@ -1705,7 +1704,7 @@ struct SvxStyleToolBoxControl::Impl { String aClearForm; String aMore; - ::std::vector< ::rtl::OUString > aDefaultStyles; + ::std::vector< OUString > aDefaultStyles; sal_Bool bListening; sal_Bool bSpecModeWriter; sal_Bool bSpecModeCalc; @@ -1727,11 +1726,11 @@ struct SvxStyleToolBoxControl::Impl { Reference< style::XStyleFamiliesSupplier > xStylesSupplier( xModel, UNO_QUERY_THROW ); Reference< lang::XServiceInfo > xServices( xModel, UNO_QUERY_THROW ); - bSpecModeWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")); + bSpecModeWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument")); if(bSpecModeWriter) { Reference<container::XNameAccess> xParaStyles; - xStylesSupplier->getStyleFamilies()->getByName(::rtl::OUString("ParagraphStyles")) >>= + xStylesSupplier->getStyleFamilies()->getByName(OUString("ParagraphStyles")) >>= xParaStyles; static const sal_Char* aWriterStyles[] = { @@ -1748,9 +1747,9 @@ struct SvxStyleToolBoxControl::Impl try { Reference< beans::XPropertySet > xStyle; - xParaStyles->getByName( rtl::OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle; - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName; + xParaStyles->getByName( OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle; + OUString sName; + xStyle->getPropertyValue(OUString("DisplayName")) >>= sName; if( !sName.isEmpty() ) aDefaultStyles.push_back(sName); } @@ -1760,7 +1759,7 @@ struct SvxStyleToolBoxControl::Impl } else if( 0 != ( - bSpecModeCalc = xServices->supportsService(::rtl::OUString( + bSpecModeCalc = xServices->supportsService(OUString( "com.sun.star.sheet.SpreadsheetDocument")))) { static const sal_Char* aCalcStyles[] = @@ -1772,18 +1771,18 @@ struct SvxStyleToolBoxControl::Impl }; Reference<container::XNameAccess> xCellStyles; xStylesSupplier->getStyleFamilies()->getByName( - ::rtl::OUString("CellStyles")) >>= + OUString("CellStyles")) >>= xCellStyles; for( sal_uInt32 nStyle = 0; nStyle < sizeof( aCalcStyles ) / sizeof( sal_Char*); ++nStyle ) { try { - const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) ); + const OUString sStyleName( OUString::createFromAscii( aCalcStyles[nStyle] ) ); if( xCellStyles->hasByName( sStyleName ) ) { Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW ); - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName; + OUString sName; + xStyle->getPropertyValue(OUString("DisplayName")) >>= sName; if( !sName.isEmpty() ) aDefaultStyles.push_back(sName); } @@ -1973,7 +1972,7 @@ void SvxStyleToolBoxControl::FillStyleBox() { // sort out default styles bInsert = true; - ::rtl::OUString aName( pStyle->GetName() ); + OUString aName( pStyle->GetName() ); for( _i = 0 ; _i < nCnt ; ++_i ) { if( pImpl->aDefaultStyles[_i] == aName ) @@ -2818,7 +2817,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, ToolBox& rBox = GetToolBox(); if ( pItem && eState != SFX_ITEM_DISABLED ) { - ::rtl::OUString aNewText( MnemonicGenerator::EraseAllMnemonicChars( pItem->GetValue() ) ); + OUString aNewText( MnemonicGenerator::EraseAllMnemonicChars( pItem->GetValue() ) ); rBox.SetQuickHelpText( GetId(), aNewText ); } if ( eState == SFX_ITEM_DISABLED ) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0968974377fe..9f5145818d0f 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -119,7 +119,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "FontHeight.Height" ); + aArgs[0].Name = OUString( "FontHeight.Height" ); aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -242,10 +242,10 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::ToolboxController( rServiceManager, uno::Reference< frame::XFrame >(), - ::rtl::OUString( ".uno:FontHeight" ) ), + OUString( ".uno:FontHeight" ) ), m_pBox( NULL ) { - addStatusListener( ::rtl::OUString( ".uno:CharFontName" )); + addStatusListener( OUString( ".uno:CharFontName" )); } FontHeightToolBoxControl::~FontHeightToolBoxControl() @@ -274,11 +274,11 @@ void SAL_CALL FontHeightToolBoxControl::release() throw () } // XServiceInfo -sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - const uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -287,23 +287,23 @@ throw(uno::RuntimeException) return false; } -::rtl::OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() +OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -uno::Sequence< ::rtl::OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< ::rtl::OUString > FontHeightToolBoxControl::getSupportedServiceNames_Static() +uno::Sequence< OUString > FontHeightToolBoxControl::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -402,9 +402,9 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = ::rtl::OUString( ".uno:FontHeight" ); + aURL.Complete = OUString( ".uno:FontHeight" ); xURLTransformer->parseStrict( aURL ); - xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aURL, rArgs ); } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index d3baa05ad0d1..8bfd0c02054d 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -56,13 +56,13 @@ void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFact { css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create(::comphelper::getComponentContext(rSMgr)) ); css::util::URL aURL; - aURL.Complete = rtl::OUString(COMMAND_EXECUTESEARCH); + aURL.Complete = OUString(COMMAND_EXECUTESEARCH); xURLTransformer->parseStrict(aURL); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY); if ( xDispatchProvider.is() ) { - css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); + css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() && !aURL.Complete.isEmpty() ) xDispatch->dispatch( aURL, lArgs ); } @@ -148,11 +148,11 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -163,19 +163,19 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { Remember_Impl(GetText()); - ::rtl::OUString sFindText = GetText(); + OUString sFindText = GetText(); css::uno::Sequence< css::beans::PropertyValue > lArgs(3); - lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING); + lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING); lArgs[0].Value <<= sFindText; - lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD); + lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD); if (bShift) lArgs[1].Value <<= sal_True; else lArgs[1].Value <<= sal_False; - lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS); + lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value <<= (sal_Int32)0; impl_executeSearch(m_xServiceManager, m_xFrame, lArgs); @@ -236,7 +236,7 @@ void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* pF } } -void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ) +void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ) { SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt == aSearchToolbarControllersMap.end()) @@ -261,7 +261,7 @@ void SearchToolbarControllersManager::registryController( const css::uno::Refere } } -void SearchToolbarControllersManager::freeController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& /*xStatusListener*/, const ::rtl::OUString& sCommandURL ) +void SearchToolbarControllersManager::freeController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& /*xStatusListener*/, const OUString& sCommandURL ) { SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt != aSearchToolbarControllersMap.end()) @@ -280,7 +280,7 @@ void SearchToolbarControllersManager::freeController( const css::uno::Reference< } } -css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManager::findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL ) +css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManager::findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL ) { css::uno::Reference< css::frame::XStatusListener > xStatusListener; @@ -306,7 +306,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager ) :svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - rtl::OUString(COMMAND_FINDTEXT) ) + OUString(COMMAND_FINDTEXT) ) { } @@ -335,15 +335,15 @@ void SAL_CALL FindTextToolbarController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL FindTextToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -352,15 +352,15 @@ sal_Bool SAL_CALL FindTextToolbarController::supportsService( const ::rtl::OUStr return false; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -389,7 +389,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; i<nItemCount; ++i ) { - ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_DOWNSEARCH ) { pToolBox->EnableItem(i, sal_False); @@ -439,7 +439,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur if ( m_bDisposed ) return; - ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete; + OUString aFeatureURL = rEvent.FeatureURL.Complete; if ( aFeatureURL == "AppendSearchHistory" ) { m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText()); @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, Type eType ) : svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - (eType == UP) ? rtl::OUString( COMMAND_UPSEARCH ): rtl::OUString( COMMAND_DOWNSEARCH ) ), + (eType == UP) ? OUString( COMMAND_UPSEARCH ): OUString( COMMAND_DOWNSEARCH ) ), meType( eType ) { } @@ -508,15 +508,15 @@ void SAL_CALL UpDownSearchToolboxController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static( meType ); } -sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -525,15 +525,15 @@ sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const ::rtl::O return false; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController"); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); return aSNS; } @@ -560,7 +560,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ if ( m_bDisposed ) throw css::lang::DisposedException(); - ::rtl::OUString sFindText; + OUString sFindText; Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) @@ -568,7 +568,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; i<nItemCount; ++i ) { - ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { Window* pItemWin = pToolBox->GetItemWindow(i); @@ -580,17 +580,17 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ } css::uno::Sequence< css::beans::PropertyValue > lArgs(3); - lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING); + lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING); lArgs[0].Value <<= sFindText; - lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD); + lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD); lArgs[1].Value <<= sal_Bool( meType == UP ); - lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS); + lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value <<= (sal_Int32)0; impl_executeSearch(m_xServiceManager, m_xFrame, lArgs); css::frame::FeatureStateEvent aEvent; - aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY); + aEvent.FeatureURL.Complete = OUString(COMMAND_APPENDSEARCHHISTORY); css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT); if (xStatusListener.is()) xStatusListener->statusChanged( aEvent ); @@ -609,7 +609,7 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager ) : svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - rtl::OUString( COMMAND_EXITSEARCH ) ) + OUString( COMMAND_EXITSEARCH ) ) { } @@ -638,16 +638,16 @@ void SAL_CALL ExitSearchToolboxController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static( ); } -sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -657,15 +657,15 @@ sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const ::rtl::OUS } -css::uno::Sequence< ::rtl::OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController"); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); return aSNS; } @@ -698,11 +698,11 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -757,12 +757,12 @@ void SAL_CALL FindbarDispatcher::release() throw() } // XServiceInfo -::rtl::OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { return ( ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.svx.FindbarDispatcher")) || @@ -770,16 +770,16 @@ sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& Ser ); } -css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); - aSNS.getArray()[1] = ::rtl::OUString( "com.sun.star.frame.ProtocolHandler" ); + css::uno::Sequence< OUString > aSNS( 2 ); + aSNS.getArray()[0] = OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); + aSNS.getArray()[1] = OUString( "com.sun.star.frame.ProtocolHandler" ); return aSNS; } @@ -791,7 +791,7 @@ void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno: } // XDispatchProvider -css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -823,12 +823,12 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (!xLayoutManager.is()) return; - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { @@ -848,7 +848,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; i<nItemCount; ++i ) { - ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { Window* pItemWin = pToolBox->GetItemWindow( i ); diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 30b95fee1c6c..7e06ceeec637 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -88,7 +88,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() return sal_True; } -::rtl::OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { // Provide the controlled sub-toolbar name, so we are notified whenever // this toolbar executes a function. @@ -96,7 +96,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() return m_aSubTbName; } -void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxTbxCtlAlign::functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) { // Our sub-toolbar wants to executes a function. We have to change // the image of our toolbar button to reflect the new function. diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 0d353b196d9f..645537739b63 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,14 +34,14 @@ SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_False); - addStatusListener( rtl::OUString( ".uno:CTLFontState" )); + addStatusListener( OUString( ".uno:CTLFontState" )); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_True); - addStatusListener( rtl::OUString( ".uno:VerticalTextState" )); + addStatusListener( OUString( ".uno:VerticalTextState" )); } /* ---------------------------------------------------------------------------*/ diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 4fed654bd1b2..582d462f1618 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -133,13 +133,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); - static const rtl::OUString sRotateAngle( "RotateAngle" ); - static const rtl::OUString sViewPoint( "ViewPoint" ); - static const rtl::OUString sOrigin( "Origin" ); - static const rtl::OUString sSkew( "Skew" ); - static const rtl::OUString sDepth( "Depth" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sProjectionMode( "ProjectionMode" ); + static const OUString sRotateAngle( "RotateAngle" ); + static const OUString sViewPoint( "ViewPoint" ); + static const OUString sOrigin( "Origin" ); + static const OUString sSkew( "Skew" ); + static const OUString sDepth( "Depth" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -316,7 +316,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const rtl::OUString sExtrusionColor( "Color" ); + static const OUString sExtrusionColor( "Color" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) { @@ -343,10 +343,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_SURFACE: { - static const rtl::OUString sShadeMode( "ShadeMode" ); - static const rtl::OUString sSpecularity( "Specularity" ); - static const rtl::OUString sDiffusion( "Diffusion" ); - static const rtl::OUString sMetal( "Metal" ); + static const OUString sShadeMode( "ShadeMode" ); + static const OUString sSpecularity( "Specularity" ); + static const OUString sDiffusion( "Diffusion" ); + static const OUString sMetal( "Metal" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET) { @@ -395,12 +395,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_LIGHTING_INTENSITY: { - static const rtl::OUString sBrightness( "Brightness" ); - static const rtl::OUString sLightFace( "LightFace" ); - static const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" ); - static const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" ); - static const rtl::OUString sFirstLightLevel( "FirstLightLevel" ); - static const rtl::OUString sSecondLightLevel( "SecondLightLevel" ); + static const OUString sBrightness( "Brightness" ); + static const OUString sLightFace( "LightFace" ); + static const OUString sFirstLightHarsh( "FirstLightHarsh" ); + static const OUString sSecondLightHarsh( "SecondLightHarsh" ); + static const OUString sFirstLightLevel( "FirstLightLevel" ); + static const OUString sSecondLightLevel( "SecondLightLevel" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) { @@ -468,8 +468,8 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem if((nDirection >= 0) && (nDirection < 9)) { - const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); - const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + const OUString sFirstLightDirection( "FirstLightDirection" ); + const OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -642,11 +642,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sViewPoint( "ViewPoint" ); - static const rtl::OUString sOrigin( "Origin" ); - static const rtl::OUString sSkew( "Skew" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sViewPoint( "ViewPoint" ); + static const OUString sOrigin( "Origin" ); + static const OUString sSkew( "Skew" ); + static const OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -793,8 +793,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -849,10 +849,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sShadeMode( "ShadeMode" ); - static const rtl::OUString sSpecularity( "Specularity" ); - static const rtl::OUString sMetal( "Metal" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sShadeMode( "ShadeMode" ); + static const OUString sSpecularity( "Specularity" ); + static const OUString sMetal( "Metal" ); com::sun::star::uno::Any* pAny; @@ -937,8 +937,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sDepth( "Depth" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sDepth( "Depth" ); com::sun::star::uno::Any* pAny; @@ -1017,9 +1017,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); - static const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sFirstLightDirection( "FirstLightDirection" ); + static const OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -1098,8 +1098,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sBrightness( "Brightness" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sBrightness( "Brightness" ); com::sun::star::uno::Any* pAny; @@ -1166,8 +1166,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sExtrusionColor( "Color" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sExtrusionColor( "Color" ); com::sun::star::uno::Any* pAny; @@ -1236,7 +1236,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) namespace svx { bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) { - static const rtl::OUString sExtrusion( "Extrusion" ); + static const OUString sExtrusion( "Extrusion" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index a324bb9ef184..d77bb338d169 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -41,7 +41,6 @@ #include <svx/fontworkbar.hxx> #include "svx/fontworkgallery.hxx" -using ::rtl::OUString; using namespace ::svx; using namespace ::cppu; @@ -135,26 +134,26 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - rtl::OUString aFontWorkShapeType; + OUString aFontWorkShapeType; for( i = 0; i < nCount; i++ ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA( SdrObjCustomShape ) ) { - const rtl::OUString sType( "Type" ); + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = aGeometryItem.GetPropertyValueByName( sType ); if( pAny ) { - rtl::OUString aType; + OUString aType; if ( *pAny >>= aType ) { if ( !aFontWorkShapeType.isEmpty() ) { if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ? { - aFontWorkShapeType = rtl::OUString(); + aFontWorkShapeType = OUString(); break; } } @@ -240,7 +239,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; - static const rtl::OUString sTextPath( "TextPath" ); + static const OUString sTextPath( "TextPath" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; @@ -265,8 +264,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sTextPath( "TextPath" ); - static const rtl::OUString sSameLetterHeights( "SameLetterHeights" ); + static const OUString sTextPath( "TextPath" ); + static const OUString sSameLetterHeights( "SameLetterHeights" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -339,21 +338,21 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem #include <svx/fmpage.hxx> #include <svl/itempool.hxx> -void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape ) +void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString rCustomShape ) { - const rtl::OUString sType( "Type" ); + const OUString sType( "Type" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sType; aPropVal.Value <<= rCustomShape; rGeometryItem.SetPropertyValue( aPropVal ); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); - const rtl::OUString sCoordinateOrigin( "CoordinateOrigin" ); - const rtl::OUString sCoordinateSize( "CoordinateSize" ); - const rtl::OUString sEquations( "Equations" ); - const rtl::OUString sHandles( "Handles" ); - const rtl::OUString sPath( "Path" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sCoordinateOrigin( "CoordinateOrigin" ); + const OUString sCoordinateSize( "CoordinateSize" ); + const OUString sEquations( "Equations" ); + const OUString sHandles( "Handles" ); + const OUString sPath( "Path" ); rGeometryItem.ClearPropertyValue( sAdjustmentValues ); rGeometryItem.ClearPropertyValue( sCoordinateOrigin ); rGeometryItem.ClearPropertyValue( sCoordinateSize ); @@ -366,7 +365,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; @@ -458,7 +457,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi case SID_FONTWORK_SHAPE_TYPE: { - rtl::OUString aCustomShape; + OUString aCustomShape; const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ac2ca4325f34..3d08218baabd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -172,18 +172,18 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) if(!m_xDictionary.is()) return; - Sequence< rtl::OUString > aLeftList( m_xDictionary->getConversionEntries( linguistic2::ConversionDirection_FROM_LEFT ) ); + Sequence< OUString > aLeftList( m_xDictionary->getConversionEntries( linguistic2::ConversionDirection_FROM_LEFT ) ); sal_Int32 nCount = aLeftList.getLength(); Reference< linguistic2::XConversionPropertyType > xPropertyType( m_xDictionary, uno::UNO_QUERY ); - rtl::OUString aLeft, aRight; + OUString aLeft, aRight; sal_Int16 nConversionPropertyType; for(sal_Int32 nN=0; nN<nCount; nN++) { aLeft = aLeftList[nN]; - Sequence< rtl::OUString > aRightList( m_xDictionary->getConversions( + Sequence< OUString > aRightList( m_xDictionary->getConversions( aLeft, 0, aLeft.getLength() , linguistic2::ConversionDirection_FROM_LEFT, nTextConversionOptions ) ); @@ -230,7 +230,7 @@ DictionaryEntry* DictionaryList::getEntryOnPos( sal_Int32 nPos ) const return pEntry; } -DictionaryEntry* DictionaryList::getTermEntry( const rtl::OUString& rTerm ) const +DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const { DictionaryEntry* pE = 0; for( sal_Int32 nN=GetRowCount(); nN--; ) @@ -242,12 +242,12 @@ DictionaryEntry* DictionaryList::getTermEntry( const rtl::OUString& rTerm ) cons return 0; } -bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const +bool DictionaryList::hasTerm( const OUString& rTerm ) const { return getTermEntry(rTerm) !=0 ; } -void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping +void DictionaryList::addEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos ) { if( hasTerm( rTerm ) ) @@ -274,7 +274,7 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) } } -sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm ) +sal_uIntPtr DictionaryList::deleteEntries( const OUString& rTerm ) { sal_uIntPtr nPos = LIST_APPEND; for( sal_Int32 nN=GetRowCount(); nN--; ) @@ -419,7 +419,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -DictionaryEntry::DictionaryEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping +DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType , sal_Bool bNewEntry ) : m_aTerm( rTerm ) @@ -482,7 +482,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); + Any aAny( aLngCfg.GetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); if( aAny >>= bValue ) m_aCB_Reverse.Check( bValue ); @@ -503,17 +503,17 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { try { - rtl::OUString aNameTo_Simplified("ChineseT2S"); - rtl::OUString aNameTo_Traditional("ChineseS2T"); + OUString aNameTo_Simplified("ChineseT2S"); + OUString aNameTo_Traditional("ChineseS2T"); lang::Locale aLocale; - aLocale.Language = rtl::OUString("zh"); + aLocale.Language = OUString("zh"); if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString("TW"); + aLocale.Country = OUString("TW"); xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -528,7 +528,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString("CN"); + aLocale.Country = OUString("CN"); xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -673,9 +673,9 @@ bool ChineseDictionaryDialog::isEditFieldsContentEqualsSelectedListContent() con DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if( pE ) { - if( pE->m_aTerm != rtl::OUString( m_aED_Term.GetText() ) ) + if( pE->m_aTerm != OUString( m_aED_Term.GetText() ) ) return false; - if( pE->m_aMapping != rtl::OUString( m_aED_Mapping.GetText() ) ) + if( pE->m_aMapping != OUString( m_aED_Mapping.GetText() ) ) return false; if( pE->m_nConversionPropertyType != m_aLB_Property.GetSelectEntryPos()+1 ) return false; @@ -752,8 +752,8 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl) } IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) { - rtl::OUString aTerm( m_aED_Term.GetText() ); - rtl::OUString aMapping( m_aED_Mapping.GetText() ); + OUString aTerm( m_aED_Term.GetText() ); + OUString aMapping( m_aED_Mapping.GetText() ); sal_Int16 nConversionPropertyType = m_aLB_Property.GetSelectEntryPos()+1; DictionaryList& rActive = getActiveDictionary(); @@ -792,7 +792,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl) { DictionaryEntry* pEntry; - rtl::OUString aMapping; + OUString aMapping; for( sal_Int32 nN=rActive.GetRowCount(); nN--; ) { if( rActive.IsRowSelected( nN ) ) @@ -831,7 +831,7 @@ short ChineseDictionaryDialog::Execute() SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); + aLngCfg.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); m_aCT_DictionaryToSimplified.save(); m_aCT_DictionaryToTraditional.save(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 98de4dba436b..2728ac93c0a5 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -47,7 +47,7 @@ namespace textconversiondlgs struct DictionaryEntry { - DictionaryEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping + DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType , sal_Bool bNewEntry = sal_False ); @@ -55,8 +55,8 @@ struct DictionaryEntry bool operator==( const DictionaryEntry& rE ) const; - rtl::OUString m_aTerm; - rtl::OUString m_aMapping; + OUString m_aTerm; + OUString m_aMapping; sal_Int16 m_nConversionPropertyType; //linguistic2::ConversionPropertyType sal_Bool m_bNewEntry; @@ -79,12 +79,12 @@ public: void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ); void save(); - DictionaryEntry* getTermEntry( const rtl::OUString& rTerm ) const; - bool hasTerm( const rtl::OUString& rTerm ) const; + DictionaryEntry* getTermEntry( const OUString& rTerm ) const; + bool hasTerm( const OUString& rTerm ) const; - void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping + void addEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND ); - sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted + sal_uIntPtr deleteEntries( const OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted void deleteEntryOnPos( sal_Int32 nPos ); DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const; DictionaryEntry* getFirstSelectedEntry() const; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index fa27c4cf40ee..4082018dee7f 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -40,8 +40,8 @@ namespace textconversiondlgs //............................................................................. using namespace ::com::sun::star; -#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog") -#define SERVICE_NAME ::rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") +#define SERVICE_IMPLEMENTATION_NAME OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog") +#define SERVICE_NAME OUString("com.sun.star.linguistic2.ChineseTranslationDialog") ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) : m_xCC( xContext ) @@ -73,20 +73,20 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog() //------------------------------------------------------------------------- // lang::XServiceInfo -::rtl::OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -::rtl::OUString ChineseTranslation_UnoDialog::getImplementationName_Static() +OUString ChineseTranslation_UnoDialog::getImplementationName_Static() { return SERVICE_IMPLEMENTATION_NAME; } -sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString* pArray = aSNL.getArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if( pArray[ i ] == ServiceName ) @@ -95,14 +95,14 @@ sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const ::rtl::OU return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< rtl::OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = SERVICE_NAME; return aSNS; } @@ -110,7 +110,7 @@ uno::Sequence< rtl::OUString > ChineseTranslation_UnoDialog::getSupportedService //------------------------------------------------------------------------- // ui::dialogs::XExecutableDialog -void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const ::rtl::OUString& ) throw(uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(uno::RuntimeException) { //not implemented - fell free to do so, if you do need this } @@ -211,12 +211,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog: { return 0; } -void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { //only read only properties throw beans::PropertyVetoException(); } -uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -250,19 +250,19 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O return aRet; } -void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 2d268def8e58..0e8b89cf10ac 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -75,12 +75,12 @@ public: virtual ~ChineseTranslation_UnoDialog(); // lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) @@ -92,17 +92,17 @@ public: 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); // ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::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); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::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); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::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); + 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 ::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 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); + 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); + 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); + 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); // lang::XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index d38eab3b389b..bf6ecc8dc9cb 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -57,14 +57,14 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) ); + Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) ); aAny >>= bValue; if( bValue ) m_pRB_To_Simplified->Check(); else m_pRB_To_Traditional->Check(); - aAny = aLngCfg.GetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ) ); + aAny = aLngCfg.GetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ) ); if( aAny >>= bValue ) m_pCB_Translate_Commonterms->Check( bValue ); @@ -95,9 +95,9 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl) SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_pRB_To_Simplified->IsChecked() ); - aLngCfg.SetProperty( rtl::OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny ); aAny <<= sal_Bool( !!m_pCB_Translate_Commonterms->IsChecked() ); - aLngCfg.SetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); EndDialog( RET_OK ); return 0; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 6062a357db5e..59062efa88d6 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -72,7 +72,6 @@ using namespace ::comphelper; using namespace ::osl; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -158,7 +157,7 @@ namespace svx virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); // XMimeTypeInfo - virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException); + virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException); VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; @@ -585,7 +584,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto // putting the StatusIndicator that we got from the MediaDescriptor into our local FilterData copy if ( rSettings.mxStatusIndicator.is() ) { - rtl::OUString sStatusIndicator( "StatusIndicator" ); + OUString sStatusIndicator( "StatusIndicator" ); int i = rSettings.maFilterData.getLength(); rSettings.maFilterData.realloc( i + 1 ); rSettings.maFilterData[ i ].Name = sStatusIndicator; diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index 4a213368d8ba..db9e8f719624 100644 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -25,8 +25,8 @@ namespace svx { SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GraphicExporter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); - SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw(); - SVX_DLLPUBLIC ::rtl::OUString SAL_CALL GraphicExporter_getImplementationName() throw(); + SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw(); + SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName() throw(); } #endif diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 939c80103128..3aa0b21afbbe 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -47,7 +47,7 @@ private: ItemPoolVector maItemSetVector; - void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ); + void SAL_CALL ImplInsertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ); public: SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); @@ -62,19 +62,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const rtl::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); - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + 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); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::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); + 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); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException); + 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); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 3be929155bd7..af77a5269b1f 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -59,18 +59,18 @@ namespace svx virtual ~NamespaceMap(); // XNameAccess - virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException); + virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException); // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); }; Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) @@ -78,18 +78,18 @@ namespace svx return (XWeak*)new NamespaceMap( pWhichIds, pPool ); } - Sequence< ::rtl::OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() + Sequence< OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() throw() { - Sequence< ::rtl::OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.xml.NamespaceMap" ); + Sequence< OUString > aSupportedServiceNames( 1 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.xml.NamespaceMap" ); return aSupportedServiceNames; } - ::rtl::OUString SAL_CALL NamespaceMap_getImplementationName() + OUString SAL_CALL NamespaceMap_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.NamespaceMap" ); + return OUString( "com.sun.star.comp.Svx.NamespaceMap" ); } @@ -111,7 +111,7 @@ namespace svx NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ); - sal_Bool next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ); + sal_Bool next( OUString& rPrefix, OUString& rURL ); }; } @@ -131,7 +131,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; } -sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ) +sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) { // we still need to process the current attribute if( mpCurrentAttr && (mnCurrentAttr != USHRT_MAX) ) @@ -196,12 +196,12 @@ NamespaceMap::~NamespaceMap() } // XNameAccess -Any SAL_CALL NamespaceMap::getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; sal_Bool bFound; @@ -217,23 +217,23 @@ Any SAL_CALL NamespaceMap::getByName( const ::rtl::OUString& aName ) throw (NoSu return makeAny( aURL ); } -Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; - std::set< ::rtl::OUString, comphelper::UStringLess > aPrefixSet; + std::set< OUString, comphelper::UStringLess > aPrefixSet; while( aIter.next( aPrefix, aURL ) ) aPrefixSet.insert( aPrefix ); - Sequence< ::rtl::OUString > aSeq( aPrefixSet.size() ); - ::rtl::OUString* pPrefixes = aSeq.getArray(); + Sequence< OUString > aSeq( aPrefixSet.size() ); + OUString* pPrefixes = aSeq.getArray(); - std::set< ::rtl::OUString, comphelper::UStringLess >::iterator aPrefixIter( aPrefixSet.begin() ); - const std::set< ::rtl::OUString, comphelper::UStringLess >::iterator aEnd( aPrefixSet.end() ); + std::set< OUString, comphelper::UStringLess >::iterator aPrefixIter( aPrefixSet.begin() ); + const std::set< OUString, comphelper::UStringLess >::iterator aEnd( aPrefixSet.end() ); while( aPrefixIter != aEnd ) { @@ -243,12 +243,12 @@ Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getElementNames() throw (Runt return aSeq; } -sal_Bool SAL_CALL NamespaceMap::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; sal_Bool bFound; @@ -264,33 +264,33 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const ::rtl::OUString& aName ) throw // XElementAccess Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException) { - return ::getCppuType( (const ::rtl::OUString*) 0 ); + return ::getCppuType( (const OUString*) 0 ); } sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; return aIter.next( aPrefix, aURL ); } // XServiceInfo -::rtl::OUString SAL_CALL NamespaceMap::getImplementationName( ) +OUString SAL_CALL NamespaceMap::getImplementationName( ) throw(RuntimeException) { return NamespaceMap_getImplementationName(); } -sal_Bool SAL_CALL NamespaceMap::supportsService( const ::rtl::OUString& ) +sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& ) throw(RuntimeException) { return sal_True; } -Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) throw(RuntimeException) { return NamespaceMap_getSupportedServiceNames(); diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 324b4a45800b..ad217dc1eac3 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -33,8 +33,8 @@ #include <boost/scoped_ptr.hpp> -#define IMPLEMENTATIONNAME_RECOVERYUI ::rtl::OUString("com.sun.star.comp.svx.RecoveryUI") -#define SERVICENAME_RECOVERYUI ::rtl::OUString("com.sun.star.dialog.RecoveryUI") +#define IMPLEMENTATIONNAME_RECOVERYUI OUString("com.sun.star.comp.svx.RecoveryUI") +#define SERVICENAME_RECOVERYUI OUString("com.sun.star.dialog.RecoveryUI") namespace svx @@ -59,22 +59,22 @@ RecoveryUI::~RecoveryUI() } //=============================================== -::rtl::OUString SAL_CALL RecoveryUI::getImplementationName() +OUString SAL_CALL RecoveryUI::getImplementationName() throw(css::uno::RuntimeException) { return RecoveryUI::st_getImplementationName(); } //=============================================== -sal_Bool SAL_CALL RecoveryUI::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName) throw(css::uno::RuntimeException) { - const css::uno::Sequence< ::rtl::OUString > lServices = RecoveryUI::st_getSupportedServiceNames(); + const css::uno::Sequence< OUString > lServices = RecoveryUI::st_getSupportedServiceNames(); sal_Int32 c = lServices.getLength(); sal_Int32 i = 0; for (i=0; i<c; ++i) { - const ::rtl::OUString& sSupportedService = lServices[i]; + const OUString& sSupportedService = lServices[i]; if (sSupportedService.equals(sServiceName)) return sal_True; } @@ -82,7 +82,7 @@ sal_Bool SAL_CALL RecoveryUI::supportsService(const ::rtl::OUString& sServiceNam } //=============================================== -css::uno::Sequence< ::rtl::OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() throw(css::uno::RuntimeException) { return RecoveryUI::st_getSupportedServiceNames(); @@ -150,15 +150,15 @@ void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::f } //=============================================== -::rtl::OUString RecoveryUI::st_getImplementationName() +OUString RecoveryUI::st_getImplementationName() { - return ::rtl::OUString(IMPLEMENTATIONNAME_RECOVERYUI); + return OUString(IMPLEMENTATIONNAME_RECOVERYUI); } //=============================================== -css::uno::Sequence< ::rtl::OUString > RecoveryUI::st_getSupportedServiceNames() +css::uno::Sequence< OUString > RecoveryUI::st_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); lServiceNames.getArray() [0] = SERVICENAME_RECOVERYUI; + css::uno::Sequence< OUString > lServiceNames(1); lServiceNames.getArray() [0] = SERVICENAME_RECOVERYUI; return lServiceNames; } @@ -276,9 +276,9 @@ void RecoveryUI::impl_doRecovery() { sal_Bool bRecoveryOnly( sal_False ); - ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/"); - ::rtl::OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); - ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled" ); + OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/"); + OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); + OUString CFG_ENTRY_ENABLED( "Enabled" ); sal_Bool bCrashRepEnabled(sal_False); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 9f8320014f72..750c622f2800 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -40,17 +40,17 @@ class SvxPluginShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: SvxPluginShape( SdrObject* pObj ) throw(); virtual ~SvxPluginShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 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); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); + 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); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); }; @@ -63,17 +63,17 @@ class SvxAppletShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: SvxAppletShape( SdrObject* pObj ) throw(); virtual ~SvxAppletShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 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); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); + 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); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); }; @@ -86,17 +86,17 @@ class SvxFrameShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); public: SvxFrameShape( SdrObject* pObj ) throw(); virtual ~SvxFrameShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::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 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); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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); + 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); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (); }; @@ -108,8 +108,8 @@ class SvxTableShape : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::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); - virtual bool getPropertyValueImpl( const ::rtl::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); + 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); + 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); virtual void lock(); virtual void unlock(); diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index c8f8b4440c87..ed2d7ede90e6 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -64,8 +64,8 @@ namespace svx typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString - , ::rtl::OUStringHash + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < OUString + , OUStringHash , ::comphelper::UStringEqual > PropertyChangeListenerContainer; @@ -95,7 +95,7 @@ namespace svx //= PropertyValueProvider //==================================================================== //-------------------------------------------------------------------- - ::rtl::OUString PropertyValueProvider::getPropertyName() const + OUString PropertyValueProvider::getPropertyName() const { return m_sPropertyName; } @@ -143,10 +143,10 @@ namespace svx if ( provPos == m_pData->m_aProviders.end() ) return; - ::rtl::OUString sPropertyName( provPos->second->getPropertyName() ); + OUString sPropertyName( provPos->second->getPropertyName() ); ::cppu::OInterfaceContainerHelper* pPropListeners = m_pData->m_aPropertyChangeListeners.getContainer( sPropertyName ); - ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( ::rtl::OUString() ); + ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( OUString() ); if ( !pPropListeners && !pAllListeners ) return; @@ -170,13 +170,13 @@ namespace svx } //-------------------------------------------------------------------- - void PropertyChangeNotifier::addPropertyChangeListener( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) + void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); } //-------------------------------------------------------------------- - void PropertyChangeNotifier::removePropertyChangeListener( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) + void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); } diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 62af47f7d31a..90fc9905847a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -25,7 +25,6 @@ /////////////////////////////////////////////////////////////////////// -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; @@ -39,7 +38,7 @@ using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.TableShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.TableShape" ) ); } //---------------------------------------------------------------------- @@ -50,7 +49,7 @@ SvxTableShape::~SvxTableShape() throw() //---------------------------------------------------------------------- bool SvxTableShape::setPropertyValueImpl( - const ::rtl::OUString& rName, + 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) @@ -105,7 +104,7 @@ bool SvxTableShape::setPropertyValueImpl( extern Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ); bool SvxTableShape::getPropertyValueImpl( - const ::rtl::OUString& rName, + 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) diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 0697b7023959..398ebc9cc621 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -100,7 +100,7 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw() uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) throw( uno::RuntimeException ) { - return ::getCppuType( (const ::rtl::OUString*)0 ); + return ::getCppuType( (const OUString*)0 ); } /** diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 88ec2e8ab8ba..f8af587091aa 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -91,9 +91,9 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; //-//////////////////////////////////////////////////////////////////// @@ -191,7 +191,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( return xRet; } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return SvxUnoTextCreateTextField( ServiceSpecifier ); } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index cb13fb859e77..fcef224793c2 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -45,7 +45,6 @@ #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 4e06a8057bb5..3b77721e3f9a 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -471,17 +471,17 @@ SfxItemPropertyMapEntry* ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("OriginalSize"), OWN_ATTR_OLESIZE , &::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("IsInternal"), OWN_ATTR_INTERNAL_OLE , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, { MAP_CHAR_LEN("Aspect"), OWN_ATTR_OLE_ASPECT , &::getCppuType((const sal_Int64*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0), 0, 0}, {0,0,0,0,0,0} @@ -494,26 +494,26 @@ SfxItemPropertyMapEntry* ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { - { MAP_CHAR_LEN("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("PluginURL"), OWN_ATTR_PLUGIN_URL , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("PluginURL"), OWN_ATTR_PLUGIN_URL , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -526,8 +526,8 @@ SfxItemPropertyMapEntry* ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry aFramePropertyMap_Impl[] = { - { MAP_CHAR_LEN("FrameURL"), OWN_ATTR_FRAME_URL , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("FrameName"), OWN_ATTR_FRAME_NAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("FrameURL"), OWN_ATTR_FRAME_URL , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("FrameName"), OWN_ATTR_FRAME_NAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_CHAR_LEN("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , &::getBooleanCppuType() , 0, 0}, { MAP_CHAR_LEN("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , &::getCppuType((const sal_Int32*)0), 0, 0}, @@ -535,20 +535,20 @@ SfxItemPropertyMapEntry* ImplGetSvxFramePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -560,29 +560,29 @@ SfxItemPropertyMapEntry* ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] = { - { MAP_CHAR_LEN("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("AppletName"), OWN_ATTR_APPLET_NAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("AppletCode"), OWN_ATTR_APPLET_CODE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , &::getCppuType(( const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletName"), OWN_ATTR_APPLET_NAME , &::getCppuType(( const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletCode"), OWN_ATTR_APPLET_CODE , &::getCppuType(( const OUString*)0), 0, 0}, { MAP_CHAR_LEN("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, - { MAP_CHAR_LEN("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , &::getCppuType(( const OUString*)0), 0, 0}, { MAP_CHAR_LEN("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , &::getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -595,8 +595,8 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() static SfxItemPropertyMapEntry aControlPropertyMap_Impl[] = { // the following properties are mapped to the XControl Model of this shape - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), 0, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), 0, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, &::getCppuType((const sal_Int16*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, &::getCppuType((const sal_Int16*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), 0, &::getCppuType((const float*)0), 0, 0 }, @@ -625,15 +625,15 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, // #i112587# { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ @@ -651,15 +651,15 @@ SfxItemPropertyMapEntry* ImplGetSvxPageShapePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -706,10 +706,10 @@ SfxItemPropertyMapEntry* ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry aCustomShapePropertyMap_Impl[] = { - { MAP_CHAR_LEN("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0 }, - { MAP_CHAR_LEN("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, &::getCppuType((const OUString*)0), 0, 0}, CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -733,11 +733,11 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap() { { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { MAP_CHAR_LEN("MediaURL"), OWN_ATTR_MEDIA_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("MediaURL"), OWN_ATTR_MEDIA_URL, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, &::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Loop"), OWN_ATTR_MEDIA_LOOP, &::getCppuType((const sal_Bool*)0), 0, 0}, { MAP_CHAR_LEN("Mute"), OWN_ATTR_MEDIA_MUTE, &::getCppuType((const sal_Bool*)0), 0, 0}, @@ -747,10 +747,10 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap() { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {MAP_CHAR_LEN("PrivateStream"), OWN_ATTR_MEDIA_STREAM, &::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, {0,0,0,0,0,0} }; @@ -764,15 +764,15 @@ SfxItemPropertyMapEntry* ImplGetSvxTableShapePropertyMap() { { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, &::com::sun::star::awt::XBitmap::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("TableTemplate"), OWN_ATTR_TABLETEMPLATE , &::com::sun::star::container::XIndexAccess::static_type(), 0, 0}, { MAP_CHAR_LEN("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, &::getBooleanCppuType(),0, 0}, @@ -826,7 +826,7 @@ comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap( * class UHashMap * ***********************************************************************/ -typedef ::boost::unordered_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl; +typedef ::boost::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl; namespace { static const UHashMapImpl &GetUHashImpl() @@ -869,7 +869,7 @@ namespace { { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DPolygonObject"), E3D_POLYGONOBJ_ID | E3D_INVENTOR_FLAG }, }; for (sal_uInt32 i = 0; i < sizeof(aInit)/sizeof(aInit[0]); i++) - aImpl[rtl::OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id; + aImpl[OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id; bInited = true; } return aImpl; @@ -877,7 +877,7 @@ namespace { } //---------------------------------------------------------------------- -rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) +OUString UHashMap::getNameFromId(sal_uInt32 nId) { const UHashMapImpl &rMap = GetUHashImpl(); @@ -887,7 +887,7 @@ rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) return it->first; } OSL_FAIL("[CL] unknown SdrObjekt identifier"); - return rtl::OUString(); + return OUString(); } uno::Sequence< OUString > UHashMap::getServiceNames() @@ -1298,7 +1298,7 @@ bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestRe { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) - rtl::OUString sStr(rString); + OUString sStr(rString); const sal_Unicode *pStr = sStr.getStr(); sal_Int32 nLength = sStr.getLength(); while( nLength > 0 ) @@ -1308,7 +1308,7 @@ bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestRe break; nLength--; } - sStr = rtl::OUString(pStr, nLength).trim(); + sStr = OUString(pStr, nLength).trim(); for(int i = 0; i < nCount; ++i ) { @@ -1360,7 +1360,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern /** if the given name is a predefined api name it is replaced by the predefined name for the current language. */ -OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const rtl::OUString& rApiName) throw() +OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw() { String aNew = rApiName; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index f974e51247a7..ebf92291f2b8 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -60,7 +60,6 @@ #include <comphelper/servicehelper.hxx> #include <vcl/wmf.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -895,7 +894,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa } // XPropertyState -beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const ::rtl::OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) +beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -920,7 +919,7 @@ beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const ::rtl::OU } } -void SAL_CALL SvxShapeControl::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) +void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -943,7 +942,7 @@ void SAL_CALL SvxShapeControl::setPropertyToDefault( const ::rtl::OUString& Prop } } -uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aPropertyName ) +uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { OUString aFormsName; @@ -1076,7 +1075,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c //---------------------------------------------------------------------- -bool SvxShapePolyPolygon::setPropertyValueImpl( const ::rtl::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) +bool SvxShapePolyPolygon::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) { switch( pProperty->nWID ) { @@ -1186,7 +1185,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo //---------------------------------------------------------------------- -bool SvxShapePolyPolygon::getPropertyValueImpl( const ::rtl::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) +bool SvxShapePolyPolygon::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) { switch( pProperty->nWID ) { @@ -1311,7 +1310,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() //---------------------------------------------------------------------- -bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::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) +bool SvxShapePolyPolygonBezier::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) { switch( pProperty->nWID ) { @@ -1354,7 +1353,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rNa //---------------------------------------------------------------------- -bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::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) +bool SvxShapePolyPolygonBezier::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) { switch( pProperty->nWID ) { @@ -1453,7 +1452,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() //---------------------------------------------------------------------- -bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::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) +bool SvxGraphicObject::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) { bool bOk = false; switch( pProperty->nWID ) @@ -1510,7 +1509,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const // graphic manager url aURL = aURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); String aTmpStr(aURL); - rtl::OString aUniqueID(rtl::OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); + OString aUniqueID(OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); GraphicObject aGrafObj(aUniqueID); // #101808# since loading a graphic can cause a reschedule of the office @@ -1537,7 +1536,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aValidURL; + OUString aValidURL; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aURL, aValidURL ) ) aURLObj = INetURLObject( aValidURL ); @@ -1608,7 +1607,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::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) +bool SvxGraphicObject::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) { switch( pProperty->nWID ) { @@ -1957,7 +1956,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const ::rtl::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) +bool SvxCustomShape::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) { switch( pProperty->nWID ) { @@ -1974,7 +1973,7 @@ bool SvxCustomShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S } //---------------------------------------------------------------------- -void SvxCustomShape::createCustomShapeDefaults( const rtl::OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) +void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) { ((SdrObjCustomShape*)mpObj.get())->MergeDefaultAttributes( &rValueType ); } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index e433f399ec6c..6e15dc0c1f17 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -46,7 +46,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include "shapeimpl.hxx" -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -315,7 +314,7 @@ struct ImpRememberTransAndRect Rectangle maRect; }; -bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DSceneObject::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) { switch( pProperty->nWID ) { @@ -427,7 +426,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool Svx3DSceneObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DSceneObject::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) { switch( pProperty->nWID ) { @@ -495,7 +494,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() } //---------------------------------------------------------------------- -bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DCubeObject::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) { SolarMutexGuard aGuard; @@ -552,7 +551,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool Svx3DCubeObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DCubeObject::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) { switch( pProperty->nWID ) { @@ -627,7 +626,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() //---------------------------------------------------------------------- -bool Svx3DSphereObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DSphereObject::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) { switch( pProperty->nWID ) { @@ -673,7 +672,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const ::rtl::OUString& rName, cons //---------------------------------------------------------------------- -bool Svx3DSphereObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DSphereObject::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) { switch( pProperty->nWID ) { @@ -831,7 +830,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& //---------------------------------------------------------------------- -bool Svx3DLatheObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DLatheObject::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) { switch( pProperty->nWID ) { @@ -878,7 +877,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const ::rtl::OUString& rName, const } //---------------------------------------------------------------------- -bool Svx3DLatheObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DLatheObject::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) { switch( pProperty->nWID ) { @@ -950,7 +949,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() //---------------------------------------------------------------------- -bool Svx3DExtrudeObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DExtrudeObject::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) { switch( pProperty->nWID ) { @@ -987,7 +986,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const ::rtl::OUString& rName, con //---------------------------------------------------------------------- -bool Svx3DExtrudeObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DExtrudeObject::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) { switch( pProperty->nWID ) { @@ -1061,7 +1060,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() } //---------------------------------------------------------------------- -bool Svx3DPolygonObject::setPropertyValueImpl( const ::rtl::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) +bool Svx3DPolygonObject::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) { switch( pProperty->nWID ) { @@ -1135,7 +1134,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const ::rtl::OUString& rName, con } //---------------------------------------------------------------------- -bool Svx3DPolygonObject::getPropertyValueImpl( const ::rtl::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) +bool Svx3DPolygonObject::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) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 3baea7086c44..bacf34b392a0 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -85,7 +85,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::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) +bool SvxOle2Shape::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) { switch( pProperty->nWID ) { @@ -163,7 +163,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx { GraphicObject aGrafObj( xGraphic ); const Graphic aGraphic( aGrafObj.GetGraphic() ); - pOle->SetGraphicToObj( aGraphic, rtl::OUString() ); + pOle->SetGraphicToObj( aGraphic, OUString() ); } return true; } @@ -196,7 +196,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::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) +bool SvxOle2Shape::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) { switch( pProperty->nWID ) { @@ -210,7 +210,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx case OWN_ATTR_INTERNAL_OLE: { - rtl::OUString sCLSID; + OUString sCLSID; rValue <<= SotExchange::IsInternal( GetClassName_Impl(sCLSID) ); break; } @@ -350,7 +350,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx { GraphicObject aObj( *pGraphic ); aURL = OUString( UNO_NAME_GRAPHOBJ_URLPREFIX); - aURL += rtl::OStringToOUString(aObj.GetUniqueID(), + aURL += OStringToOUString(aObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } } @@ -408,7 +408,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) // create storage and inplace object ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); - ::rtl::OUString aPersistName; + OUString aPersistName; OUString aTmpStr; if( SvxShape::getPropertyValue( UNO_NAME_OLE2_PERSISTNAME ) >>= aTmpStr ) aPersistName = aTmpStr; @@ -451,7 +451,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) return xObj.is(); } -sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) +sal_Bool SvxOle2Shape::createLink( const OUString& aLinkURL ) { DBG_TESTSOLARMUTEX(); @@ -459,19 +459,19 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) if ( !pOle2Obj || !pOle2Obj->IsEmpty() ) return sal_False; - ::rtl::OUString aPersistName; + OUString aPersistName; ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString("URL"); + aMediaDescr[0].Name = OUString("URL"); aMediaDescr[0].Value <<= aLinkURL; uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler(); if ( xInteraction.is() ) { aMediaDescr.realloc( 2 ); - aMediaDescr[1].Name = ::rtl::OUString( "InteractionHandler" ); + aMediaDescr[1].Name = OUString( "InteractionHandler" ); aMediaDescr[1].Value <<= xInteraction; } @@ -530,7 +530,7 @@ void SvxOle2Shape::resetModifiedState() } } -const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) +const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) { DBG_TESTSOLARMUTEX(); SvGlobalName aClassName; @@ -538,7 +538,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) if( pOle2Obj ) { - rHexCLSID = rtl::OUString(); + rHexCLSID = OUString(); if( pOle2Obj->IsEmpty() ) { @@ -574,7 +574,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); } SvxAppletShape::~SvxAppletShape() throw() @@ -586,22 +586,22 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aAppletClassId( SO3_APPLET_CLASSID ); createObject(aAppletClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); } -void SAL_CALL SvxAppletShape::setPropertyValue( const ::rtl::OUString& aPropertyName, 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) +void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, 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) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxAppletShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxAppletShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const ::rtl::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) +bool SvxAppletShape::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) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -622,7 +622,7 @@ bool SvxAppletShape::setPropertyValueImpl( const ::rtl::OUString& rName, const S } } -bool SvxAppletShape::getPropertyValueImpl( const ::rtl::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) +bool SvxAppletShape::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) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -647,7 +647,7 @@ bool SvxAppletShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); } SvxPluginShape::~SvxPluginShape() throw() @@ -659,22 +659,22 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aPluginClassId( SO3_PLUGIN_CLASSID ); createObject(aPluginClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); } -void SAL_CALL SvxPluginShape::setPropertyValue( const ::rtl::OUString& aPropertyName, 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) +void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, 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) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxPluginShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxPluginShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const ::rtl::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) +bool SvxPluginShape::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) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -695,7 +695,7 @@ bool SvxPluginShape::setPropertyValueImpl( const ::rtl::OUString& rName, const S } } -bool SvxPluginShape::getPropertyValueImpl( const ::rtl::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) +bool SvxPluginShape::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) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -720,7 +720,7 @@ bool SvxPluginShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); } SvxFrameShape::~SvxFrameShape() throw() @@ -732,22 +732,22 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw () SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); createObject(aIFrameClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); } -void SAL_CALL SvxFrameShape::setPropertyValue( const ::rtl::OUString& aPropertyName, 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) +void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, 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) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxFrameShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxFrameShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const ::rtl::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) +bool SvxFrameShape::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) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -768,7 +768,7 @@ bool SvxFrameShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf } } -bool SvxFrameShape::getPropertyValueImpl( const ::rtl::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) +bool SvxFrameShape::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) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -795,7 +795,7 @@ bool SvxFrameShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf SvxMediaShape::SvxMediaShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.MediaShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.MediaShape" ) ); } //---------------------------------------------------------------------- @@ -805,7 +805,7 @@ SvxMediaShape::~SvxMediaShape() throw() //---------------------------------------------------------------------- -bool SvxMediaShape::setPropertyValueImpl( const ::rtl::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) +bool SvxMediaShape::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) { if( (pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM) ) { @@ -894,7 +894,7 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf //---------------------------------------------------------------------- -bool SvxMediaShape::getPropertyValueImpl( const ::rtl::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) +bool SvxMediaShape::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) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 76c46fc1ec80..a60030dd70df 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -94,7 +94,6 @@ #include <boost/bind.hpp> #include <vcl/wmf.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -1305,7 +1304,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce //---------------------------------------------------------------------- -void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1478,7 +1477,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN //---------------------------------------------------------------------- -sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) +sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { // check if an item with the given name and which id is inside the models // pool or the stylesheet pool, if found its puttet in the itemse @@ -1689,7 +1688,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 ) throw beans::PropertyVetoException( - ( rtl::OUString( + ( OUString( "Readonly property can't be set: " ) + rPropertyName ), uno::Reference< drawing::XShape >( this ) ); @@ -1864,7 +1863,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) //---------------------------------------------------------------------- // XMultiPropertySet -void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::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) +void SAL_CALL SvxShape::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) { ::SolarMutexGuard aSolarGuard; @@ -1937,7 +1936,7 @@ void SvxShape::endSetPropertyValues() //---------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -1980,7 +1979,7 @@ void SvxShape::endSetPropertyValues() return aRet; } -void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) { } @@ -1988,7 +1987,7 @@ void SAL_CALL SvxShape::removePropertiesChangeListener( const ::com::sun::star:: { } -void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) { } @@ -2159,7 +2158,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope //---------------------------------------------------------------------- -bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, 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) +bool SvxShape::setPropertyValueImpl( const OUString&, 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) { switch( pProperty->nWID ) { @@ -2585,7 +2584,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper //---------------------------------------------------------------------- -bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, 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) +bool SvxShape::getPropertyValueImpl( const OUString&, 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) { switch( pProperty->nWID ) { @@ -3808,7 +3807,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { Sequence< OUString > SupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = SupportedServices.getConstArray(); + const OUString * pArray = SupportedServices.getConstArray(); const sal_Int32 nCount = SupportedServices.getLength(); sal_Int32 i; for( i = 0; i < nCount; i++ ) @@ -4176,7 +4175,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // overide these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const ::rtl::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) +bool SvxShapeText::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) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -4199,7 +4198,7 @@ bool SvxShapeText::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const ::rtl::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) +bool SvxShapeText::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) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 1c8102129b55..2f5364c5c9aa 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -212,33 +212,33 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException //---------------------------------------------------------------------- // XServiceInfo //---------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShapeCollection::getImplementationName() +OUString SAL_CALL SvxShapeCollection::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -::rtl::OUString SvxShapeCollection::getImplementationName_Static() +OUString SvxShapeCollection::getImplementationName_Static() { - return ::rtl::OUString("com.sun.star.drawing.SvxShapeCollection"); + return OUString("com.sun.star.drawing.SvxShapeCollection"); } -sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } -uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static() +uno::Sequence< OUString > SvxShapeCollection::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aSeq(2); - aSeq.getArray()[0] = ::rtl::OUString("com.sun.star.drawing.Shapes"); - aSeq.getArray()[1] = ::rtl::OUString("com.sun.star.drawing.ShapeCollection"); + uno::Sequence< OUString > aSeq(2); + aSeq.getArray()[0] = OUString("com.sun.star.drawing.Shapes"); + aSeq.getArray()[1] = OUString("com.sun.star.drawing.ShapeCollection"); return aSeq; } diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 49fe00c4011f..86734c61f779 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -641,7 +641,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if (mpOutliner->GetParagraphCount()==1) { // if we only have one paragraph we check if it is empty - rtl::OUString aStr(mpOutliner->GetText(mpOutliner->GetParagraph(0))); + OUString aStr(mpOutliner->GetText(mpOutliner->GetParagraph(0))); if (aStr.isEmpty()) { diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 54d25ae9cb36..3eeba97be520 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -125,27 +125,27 @@ void SAL_CALL GalleryItem::release() // ------------------------------------------------------------------------------ -::rtl::OUString GalleryItem::getImplementationName_Static() +OUString GalleryItem::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryItem" ); + return OUString( "com.sun.star.comp.gallery.GalleryItem" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() +uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryItem" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryItem" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryItem::getImplementationName() +OUString SAL_CALL GalleryItem::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -153,11 +153,11 @@ uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryItem::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -168,7 +168,7 @@ sal_Bool SAL_CALL GalleryItem::supportsService( const ::rtl::OUString& ServiceNa // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryItem::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryItem::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -245,10 +245,10 @@ sal_Int8 SAL_CALL GalleryItem::getType() { MAP_CHAR_LEN( "GalleryItemType" ), UNOGALLERY_GALLERYITEMTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const ::rtl::OUString*)(0)), + { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const ::rtl::OUString*)(0)), + { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const OUString*)(0)), 0, 0 }, { MAP_CHAR_LEN( "Thumbnail" ), UNOGALLERY_THUMBNAIL, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), @@ -283,7 +283,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt { if( UNOGALLERY_TITLE == (*ppEntries)->mnHandle ) { - ::rtl::OUString aNewTitle; + OUString aNewTitle; if( *pValues >>= aNewTitle ) { @@ -295,7 +295,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { - if( ::rtl::OUString( pObj->GetTitle() ) != aNewTitle ) + if( OUString( pObj->GetTitle() ) != aNewTitle ) { pObj->SetTitle( aNewTitle ); pGalTheme->InsertObject( *pObj ); @@ -339,7 +339,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); if( pGalTheme ) - *pValue <<= ::rtl::OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + *pValue <<= OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } break; @@ -353,7 +353,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { - *pValue <<= ::rtl::OUString( pObj->GetTitle() ); + *pValue <<= OUString( pObj->GetTitle() ); pGalTheme->ReleaseObject( pObj ); } } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 715cde0f242b..7977e780298a 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -52,8 +52,8 @@ public: bool isValid() const; - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -64,9 +64,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 8b6284797017..eb03c477f361 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -41,7 +41,7 @@ namespace unogallery { // - GalleryTheme - // ----------------- -GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) +GalleryTheme::GalleryTheme( const OUString& rThemeName ) { mpGallery = ::Gallery::GetGalleryInstance(); mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL ); @@ -71,27 +71,27 @@ GalleryTheme::~GalleryTheme() // ------------------------------------------------------------------------------ -::rtl::OUString GalleryTheme::getImplementationName_Static() +OUString GalleryTheme::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryTheme" ); + return OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() +uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryTheme" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryTheme" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryTheme::getImplementationName() +OUString SAL_CALL GalleryTheme::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -99,11 +99,11 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -114,7 +114,7 @@ sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceN // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -204,11 +204,11 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryTheme::getName( ) +OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException) { const SolarMutexGuard aGuard; - ::rtl::OUString aRet; + OUString aRet; if( mpTheme ) aRet = mpTheme->GetName(); @@ -233,7 +233,7 @@ void SAL_CALL GalleryTheme::update( ) // ------------------------------------------------------------------------------ ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( - const ::rtl::OUString& rURL, ::sal_Int32 nIndex ) + const OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 46659fb6ba45..0dc1a1c964e6 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -45,18 +45,18 @@ class GalleryTheme : public ::cppu::WeakImplHelper1< ::com::sun::star::gallery:: public: - GalleryTheme( const ::rtl::OUString& rThemeName ); + GalleryTheme( const OUString& rThemeName ); ~GalleryTheme(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -71,9 +71,9 @@ protected: 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); // XGalleryThemes - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL insertURLByIndex( const ::rtl::OUString& URL, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 672ef21ba848..af3a15ea8268 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -45,7 +45,7 @@ uno::Reference< uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance( // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw() { return GalleryThemeProvider::getSupportedServiceNames_Static(); @@ -53,7 +53,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServi // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw() { return GalleryThemeProvider::getImplementationName_Static(); @@ -77,27 +77,27 @@ GalleryThemeProvider::~GalleryThemeProvider() // ------------------------------------------------------------------------------ -SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static() +SVX_DLLPUBLIC OUString GalleryThemeProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); + return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); } // ------------------------------------------------------------------------------ -SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupportedServiceNames_Static() +SVX_DLLPUBLIC uno::Sequence< OUString > GalleryThemeProvider::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryThemeProvider" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryThemeProvider" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryThemeProvider::getImplementationName() +OUString SAL_CALL GalleryThemeProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -105,11 +105,11 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -120,7 +120,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -198,7 +198,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName ) +uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -218,12 +218,12 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException) { const SolarMutexGuard aGuard; sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0; - uno::Sequence< ::rtl::OUString > aSeq( nCount ); + uno::Sequence< OUString > aSeq( nCount ); for( ; i < nCount; ++i ) { @@ -240,7 +240,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames( // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) throw (uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -255,7 +255,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName // ------------------------------------------------------------------------------ -uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName ) +uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -278,7 +278,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe // ------------------------------------------------------------------------------ -void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) +void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException) { const SolarMutexGuard aGuard; diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 64482f87a354..d62dead1f5b8 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -126,7 +126,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() struct OUStringLess { - bool operator() ( const ::rtl::OUString& r1, const ::rtl::OUString& r2 ) const + bool operator() ( const OUString& r1, const OUString& r2 ) const { return (r1 < r2) != sal_False; } @@ -181,16 +181,16 @@ void SAL_CALL SvXMLEmbeddedObjectHelper::disposing() } -void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName) +void SvXMLEmbeddedObjectHelper::splitObjectURL(OUString aURLNoPar, + OUString& rContainerStorageName, + OUString& rObjectStorageName) { DBG_ASSERT( '#' != aURLNoPar[0], "invalid object URL" ); sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == _nPos ) { - rContainerStorageName = ::rtl::OUString(); + rContainerStorageName = OUString(); rObjectStorageName = aURLNoPar; } else @@ -223,9 +223,9 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar, } sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( - const ::rtl::OUString& rURLStr, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName, + const OUString& rURLStr, + OUString& rContainerStorageName, + OUString& rObjectStorageName, sal_Bool bInternalToExternal, sal_Bool *pGraphicRepl, sal_Bool *pOasisFormat ) const @@ -252,7 +252,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( // get rid of arguments sal_Int32 nPos = rURLStr.indexOf( '?' ); - ::rtl::OUString aURLNoPar; + OUString aURLNoPar; if ( nPos == -1 ) aURLNoPar = rURLStr; else @@ -263,8 +263,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos++; while( nPos >= 0 && nPos < rURLStr.getLength() ) { - ::rtl::OUString aToken = rURLStr.getToken( 0, ',', nPos ); - if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( "oasis=false" ) ) ) + OUString aToken = rURLStr.getToken( 0, ',', nPos ); + if ( aToken.equalsIgnoreAsciiCase( OUString( "oasis=false" ) ) ) { if ( pOasisFormat ) *pOasisFormat = sal_False; @@ -292,7 +292,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == nPos ) { - rContainerStorageName = ::rtl::OUString(); + rContainerStorageName = OUString(); rObjectStorageName = aURLNoPar.copy( nPathStart ); } else if( nPos > nPathStart ) @@ -332,7 +332,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( } uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( - const ::rtl::OUString& rStorageName ) + const OUString& rStorageName ) { DBG_ASSERT( -1 == rStorageName.indexOf( '/' ) && -1 == rStorageName.indexOf( '\\' ), @@ -368,8 +368,8 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt } sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( - const ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjName, + const OUString& rContainerStorageName, + OUString& rObjName, const SvGlobalName *pClassId, SvStream* pTemp ) { @@ -413,8 +413,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // This is an ole object uno::Reference< beans::XPropertySet > xProps( xStm, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( - ::rtl::OUString( "MediaType" ), - uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); + OUString( "MediaType" ), + uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) ); xStm->getOutputStream()->closeOutput(); } @@ -438,7 +438,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // make object known to the container // TODO/LATER: could be done a little bit more efficient! - ::rtl::OUString aName( rObjName ); + OUString aName( rObjName ); // TODO/LATER: The provided pClassId is ignored for now. // The stream contains OLE storage internally and this storage already has a class id specifying the @@ -450,12 +450,12 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( return sal_True; } -::rtl::OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( - const ::rtl::OUString& rURLStr ) +OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( + const OUString& rURLStr ) { - ::rtl::OUString sRetURL; + OUString sRetURL; - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode ) ) @@ -482,7 +482,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( } ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 ); - sRetURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); + sRetURL = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); sRetURL += aObjectStorageName; if( pOut ) @@ -494,11 +494,11 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( else { // Objects are written using ::comphelper::IEmbeddedHelper::SaveAs - sRetURL = ::rtl::OUString("./"); + sRetURL = OUString("./"); if( !aContainerStorageName.isEmpty() ) { sRetURL += aContainerStorageName; - sRetURL += ::rtl::OUString( '/' ); + sRetURL += OUString( '/' ); } sRetURL += aObjectStorageName; } @@ -521,7 +521,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement { // means that the object is not active // copy replacement image from old to new container - ::rtl::OUString aMediaType; + OUString aMediaType; xStream = mpDocPersist->getEmbeddedObjectContainer().GetGraphicStream( xObj, &aMediaType ); } @@ -532,7 +532,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement if ( nCurState == embed::EmbedStates::LOADED ) bSwitchBackToLoaded = sal_True; - ::rtl::OUString aMediaType; + OUString aMediaType; xStream = svt::EmbeddedObjectRef::GetGraphicReplacementStream( embed::Aspects::MSOLE_CONTENT, xObj, @@ -608,7 +608,7 @@ void SvXMLEmbeddedObjectHelper::Flush() } // XGraphicObjectResolver: alien objects! -::rtl::OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL( const ::rtl::OUString& aURL ) +OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL( const OUString& aURL ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); @@ -618,7 +618,7 @@ void SvXMLEmbeddedObjectHelper::Flush() // XNameAccess: alien objects! Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( - const ::rtl::OUString& rURLStr ) + const OUString& rURLStr ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( maMutex ); @@ -650,7 +650,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( sal_Bool bGraphicRepl = sal_False; sal_Bool bOasisFormat = sal_True; Reference < XInputStream > xStrm; - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, sal_True, @@ -680,7 +680,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( mxTempStorage = comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); - aEmbDescr[0].Name = ::rtl::OUString( "StoreVisualReplacement" ); + aEmbDescr[0].Name = OUString( "StoreVisualReplacement" ); aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); if ( !bOasisFormat ) { @@ -688,7 +688,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( if ( xGrInStream.is() ) { aEmbDescr.realloc( 2 ); - aEmbDescr[1].Name = ::rtl::OUString( "VisualReplacement" ); + aEmbDescr[1].Name = OUString( "VisualReplacement" ); aEmbDescr[1].Value <<= xGrInStream; } } @@ -716,14 +716,14 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( return aRet; } -Sequence< ::rtl::OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() +Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() throw (RuntimeException) { MutexGuard aGuard( maMutex ); - return Sequence< ::rtl::OUString >(0); + return Sequence< OUString >(0); } -sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const ::rtl::OUString& rURLStr ) +sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr ) throw (RuntimeException) { MutexGuard aGuard( maMutex ); @@ -733,7 +733,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const ::rtl::OUString& r } else { - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, sal_True ) ) diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 1da4ad59aa42..f57351088fd1 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -40,7 +40,6 @@ #include <svx/unomodel.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 5a79ec753eab..3f09fe847eb9 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -88,15 +88,15 @@ private: public: - SvXMLGraphicInputStream( const ::rtl::OUString& rGraphicId ); + SvXMLGraphicInputStream( const OUString& rGraphicId ); virtual ~SvXMLGraphicInputStream(); sal_Bool Exists() const { return mxStmWrapper.is(); } }; -SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphicId ) +SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) { - GraphicObject aGrfObject( rtl::OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); + GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); maTmp.EnableKillingFile(); @@ -366,9 +366,9 @@ void SAL_CALL SvXMLGraphicHelper::disposing() { } -sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, - ::rtl::OUString& rPictureStorageName, - ::rtl::OUString& rPictureStreamName ) +sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, + OUString& rPictureStorageName, + OUString& rPictureStreamName ) { String aURLStr( rURLStr ); sal_Bool bRet = sal_False; @@ -394,7 +394,7 @@ sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, return bRet; } -uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( const ::rtl::OUString& rStorageName ) +uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( const OUString& rStorageName ) { uno::Reference < embed::XStorage > xRetStorage; if( mxRootStorage.is() ) @@ -426,8 +426,8 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co return xRetStorage; } -SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, +SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, sal_Bool bTruncate ) { SvxGraphicHelperStream_Impl aRet; @@ -446,7 +446,7 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rt aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode ); if( aRet.xStream.is() && ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) ) { - ::rtl::OUString aPropName( "UseCommonStoragePasswordEncryption" ); + OUString aPropName( "UseCommonStoragePasswordEncryption" ); uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY ); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True) ); } @@ -476,7 +476,7 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con if( ( rFileName.Len() >= 4 ) && ( rFileName.GetChar( rFileName.Len() - 4 ) == '.' ) ) { - const rtl::OString aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3), + const OString aExt(OUStringToOString(rFileName.Copy(rFileName.Len() - 3), RTL_TEXTENCODING_ASCII_US)); for( long i = 0, nCount = sizeof (aMapper) / sizeof (aMapper[0]); ( i < nCount ) && !aMimeType.Len(); i++ ) @@ -487,8 +487,8 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con return aMimeType; } -Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName ) +Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName ) { Graphic aGraphic; SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); @@ -502,12 +502,12 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor return aGraphic; } -sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, - const ::rtl::OUString& rGraphicId, +sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, + const OUString& rGraphicId, bool bUseGfxLink ) { - GraphicObject aGrfObject( rtl::OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); + GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); sal_Bool bRet = sal_False; if( aGrfObject.GetType() != GRAPHIC_NONE ) @@ -517,7 +517,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() ); const GfxLink aGfxLink( aGraphic.GetLink() ); - const ::rtl::OUString aMimeType( ImplGetGraphicMimeType( rPictureStreamName ) ); + const OUString aMimeType( ImplGetGraphicMimeType( rPictureStreamName ) ); uno::Any aAny; uno::Reference < beans::XPropertySet > xProps( aStream.xStream, uno::UNO_QUERY ); @@ -588,10 +588,10 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt return bRet; } -void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName ) +void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ) { - rtl::OUString aURLString( rURLStr ); - ::rtl::OUString aPictureStorageName, aPictureStreamName; + OUString aURLString( rURLStr ); + OUString aPictureStorageName, aPictureStreamName; if( ( maURLSet.find( aURLString ) != maURLSet.end() ) ) { for (URLPairVector::const_iterator aIter( maGrfURLs.begin() ), aEnd( maGrfURLs.end() ); aIter != aEnd ; ++aIter) @@ -614,10 +614,10 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s if( aObj.GetType() != GRAPHIC_NONE ) { maGrfObjs.push_back( aObj ); - ::rtl::OUString aBaseURL( XML_GRAPHICOBJECT_URL_BASE ); + OUString aBaseURL( XML_GRAPHICOBJECT_URL_BASE ); rURLPair.second = aBaseURL; - rURLPair.second += rtl::OStringToOUString(aObj.GetUniqueID(), + rURLPair.second += OStringToOUString(aObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } else @@ -626,7 +626,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s else { const String aGraphicObjectId( aPictureStreamName ); - const rtl::OString aAsciiObjectID(rtl::OUStringToOString(aGraphicObjectId, RTL_TEXTENCODING_ASCII_US)); + const OString aAsciiObjectID(OUStringToOString(aGraphicObjectId, RTL_TEXTENCODING_ASCII_US)); const GraphicObject aGrfObject( aAsciiObjectID ); if( aGrfObject.GetType() != GRAPHIC_NONE ) { @@ -688,7 +688,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s } } - rtl::OUString aURLEntry; + OUString aURLEntry; const String sPictures( "Pictures/" ); if ( !rRequestedFileName.isEmpty() ) @@ -718,7 +718,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s #if OSL_DEBUG_LEVEL > 0 else { - rtl::OStringBuffer sMessage( + OStringBuffer sMessage( RTL_CONSTASCII_STRINGPARAM("graphic object with ID '")); sMessage.append(aAsciiObjectID). append(RTL_CONSTASCII_STRINGPARAM("' has an unknown type")); @@ -772,20 +772,20 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) } // XGraphicObjectResolver -::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const ::rtl::OUString& rURL ) +OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& rURL ) throw(uno::RuntimeException) { ::osl::MutexGuard aGuard( maMutex ); const sal_Int32 nIndex = maGrfURLs.size(); - rtl::OUString aURL( rURL ); - rtl::OUString aUserData; - rtl::OUString aRequestedFileName; + OUString aURL( rURL ); + OUString aUserData; + OUString aRequestedFileName; sal_Int32 nUser = rURL.indexOf( '?', 0 ); if ( nUser >= 0 ) { - aURL = rtl::OUString( rURL.copy( 0, nUser ) ); + aURL = OUString( rURL.copy( 0, nUser ) ); nUser++; aUserData = rURL.copy( nUser, rURL.getLength() - nUser ); } @@ -794,14 +794,14 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) sal_Int32 nIndex2 = 0; do { - rtl::OUString aToken = aUserData.getToken( 0, ';', nIndex2 ); + OUString aToken = aUserData.getToken( 0, ';', nIndex2 ); sal_Int32 n = aToken.indexOf( '=' ); if ( ( n > 0 ) && ( ( n + 1 ) < aToken.getLength() ) ) { - rtl::OUString aParam( aToken.copy( 0, n ) ); - rtl::OUString aValue( aToken.copy( n + 1, aToken.getLength() - ( n + 1 ) ) ); + OUString aParam( aToken.copy( 0, n ) ); + OUString aValue( aToken.copy( n + 1, aToken.getLength() - ( n + 1 ) ) ); - const rtl::OUString sRequestedName( "requestedName" ); + const OUString sRequestedName( "requestedName" ); if ( aParam.match( sRequestedName ) ) aRequestedFileName = aValue; } @@ -809,18 +809,18 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) while ( nIndex2 >= 0 ); } - maGrfURLs.push_back( ::std::make_pair( aURL, ::rtl::OUString() ) ); + maGrfURLs.push_back( ::std::make_pair( aURL, OUString() ) ); ImplInsertGraphicURL( aURL, nIndex, aRequestedFileName ); return maGrfURLs[ nIndex ].second; } // XBinaryStreamResolver -Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const ::rtl::OUString& rURL ) +Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUString& rURL ) throw( RuntimeException ) { Reference< XInputStream > xRet; - ::rtl::OUString aPictureStorageName, aGraphicId; + OUString aPictureStorageName, aGraphicId; if( ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) && @@ -855,10 +855,10 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() return xRet; } -::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) +OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) throw( RuntimeException ) { - ::rtl::OUString aRet; + OUString aRet; if( ( GRAPHICHELPER_MODE_READ == meCreateMode ) && rxBinaryStream.is() ) { @@ -869,12 +869,12 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() if( pOStm ) { const GraphicObject& rGrfObj = pOStm->GetGraphicObject(); - const ::rtl::OUString aId(::rtl::OStringToOUString( + const OUString aId(OStringToOUString( rGrfObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); if( !aId.isEmpty() ) { - aRet = ::rtl::OUString( XML_GRAPHICOBJECT_URL_BASE ); + aRet = OUString( XML_GRAPHICOBJECT_URL_BASE ); aRet += aId; } } @@ -927,23 +927,23 @@ protected: RuntimeException); // ____ XGraphicObjectResolver ____ - virtual ::rtl::OUString SAL_CALL resolveGraphicObjectURL( const ::rtl::OUString& aURL ) + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw (RuntimeException); // ____ XBinaryStreamResolver ____ - virtual Reference< io::XInputStream > SAL_CALL getInputStream( const ::rtl::OUString& aURL ) + virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) throw (RuntimeException); virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) + virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) throw (RuntimeException); // ____ XServiceInfo ____ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); private: @@ -985,7 +985,7 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( } // ____ XGraphicObjectResolver ____ -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const ::rtl::OUString& aURL ) +OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const OUString& aURL ) throw (uno::RuntimeException) { return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL ); @@ -993,7 +993,7 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( // ____ XBinaryStreamResolver ____ -Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const ::rtl::OUString& aURL ) +Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL ) throw (uno::RuntimeException) { return m_xBinaryStreamResolver->getInputStream( aURL ); @@ -1003,29 +1003,29 @@ Reference< io::XOutputStream > SAL_CALL SvXMLGraphicImportExportHelper::createOu { return m_xBinaryStreamResolver->createOutputStream(); } -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) +OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) throw (uno::RuntimeException) { return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream ); } // ____ XServiceInfo ____ -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() +OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() throw (uno::RuntimeException) { if( m_eGraphicHelperMode == GRAPHICHELPER_MODE_READ ) return SvXMLGraphicImportHelper_getImplementationName(); return SvXMLGraphicExportHelper_getImplementationName(); } -::sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames()); - const ::rtl::OUString * pBegin = aServiceNames.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aServiceNames.getLength(); + Sequence< OUString > aServiceNames( getSupportedServiceNames()); + const OUString * pBegin = aServiceNames.getConstArray(); + const OUString * pEnd = pBegin + aServiceNames.getLength(); return (::std::find( pBegin, pEnd, ServiceName ) != pEnd); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() throw (uno::RuntimeException) { if( m_eGraphicHelperMode == GRAPHICHELPER_MODE_READ ) @@ -1039,18 +1039,18 @@ Reference< XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const R { return static_cast< XWeak* >( new SvXMLGraphicImportExportHelper( GRAPHICHELPER_MODE_READ )); } -::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() +OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.GraphicImportHelper" ); + return OUString( "com.sun.star.comp.Svx.GraphicImportHelper" ); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw() { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service - Sequence< ::rtl::OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = ::rtl::OUString( "com.sun.star.document.BinaryStreamResolver" ); + Sequence< OUString > aSupportedServiceNames( 2 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); + aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); return aSupportedServiceNames; } @@ -1060,18 +1060,18 @@ Reference< XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const R { return static_cast< XWeak* >( new SvXMLGraphicImportExportHelper( GRAPHICHELPER_MODE_WRITE )); } -::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() +OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.GraphicExportHelper" ); + return OUString( "com.sun.star.comp.Svx.GraphicExportHelper" ); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw() { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service - Sequence< ::rtl::OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = ::rtl::OUString( "com.sun.star.document.BinaryStreamResolver" ); + Sequence< OUString > aSupportedServiceNames( 2 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); + aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); return aSupportedServiceNames; } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index afac2c05ea1f..9cb97d9fafba 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -180,12 +180,12 @@ static void initializeStreamMetadata( const uno::Reference< uno::XInterface > &x try { xProps->setPropertyValue( - rtl::OUString( "MediaType" ), - uno::makeAny( rtl::OUString( "text/xml" ) ) ); + OUString( "MediaType" ), + uno::makeAny( OUString( "text/xml" ) ) ); // use stock encryption xProps->setPropertyValue( - rtl::OUString( "UseCommonStoragePasswordEncryption" ), + OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( sal_True ) ); } catch ( const uno::Exception & ) { @@ -199,7 +199,7 @@ static void createStorageStream( uno::Reference < io::XOutputStream > *xOut, { uno::Reference < io::XStream > xStream; xStream = xSubStorage->openStreamElement( - rtl::OUString( "Content.xml" ), + OUString( "Content.xml" ), embed::ElementModes::WRITE ); *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, GRAPHICHELPER_MODE_WRITE ); initializeStreamMetadata( xStream ); @@ -210,7 +210,7 @@ bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Reference<container::XNameContainer >& xTable, const uno::Reference<embed::XStorage >& xStorage, - rtl::OUString *pOptName ) throw() + OUString *pOptName ) throw() { bool bRet = false; SfxMedium* pMedium = NULL; @@ -259,7 +259,7 @@ bool SvxXMLXTableExportComponent::save( } else // save into the xSubStorage { - rtl::OUString aPath = rURL; + OUString aPath = rURL; if( bSaveAsStorage ) { @@ -272,7 +272,7 @@ bool SvxXMLXTableExportComponent::save( } else { - aPath += rtl::OUString( ".xml" ); + aPath += OUString( ".xml" ); try { xStream = xStorage->openStreamElement( aPath, eCreate ); if( !xStream.is() ) diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index c7f638352685..99d3e13a3dc1 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -370,7 +370,7 @@ static void openStorageStream( xml::sax::InputSource *pParserInput, *ppGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_READ ); } -bool SvxXMLXTableImport::load( const rtl::OUString &rPath, +bool SvxXMLXTableImport::load( const OUString &rPath, const uno::Reference < embed::XStorage > &xStorage, const uno::Reference< XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw() @@ -455,7 +455,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath, // on the current machine. FIXME: would be better to check a file exists // before importing ... // fprintf (stderr, "parsing etc. exception '%s'\n", -// rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); +// OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); bRet = false; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index fb7cc13b669d..9a516dafc9a0 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -91,7 +91,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv ) *************************************************************************/ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) : - SfxStringItem(_nWhich, rtl::OUString()), + SfxStringItem(_nWhich, OUString()), nPalIndex(nIndex) { } @@ -1000,9 +1000,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "LineDash" ); + aPropSeq[1].Name = OUString( "LineDash" ); aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -1091,7 +1091,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::drawing::LineDash aLineDash; - rtl::OUString aName; + OUString aName; sal_Bool bLineDash( sal_False ); if ( rVal >>= aPropSeq ) @@ -1133,7 +1133,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName)) return false; SetName( aName ); @@ -3397,9 +3397,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "FillGradient" ); + aPropSeq[1].Name = OUString( "FillGradient" ); aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3461,7 +3461,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::awt::Gradient aGradient2; - rtl::OUString aName; + OUString aName; bool bGradient( false ); if ( rVal >>= aPropSeq ) @@ -3504,7 +3504,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName )) return false; SetName( aName ); @@ -3985,9 +3985,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "FillHatch" ); + aPropSeq[1].Name = OUString( "FillHatch" ); aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; @@ -4039,7 +4039,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::drawing::Hatch aUnoHatch; - rtl::OUString aName; + OUString aName; bool bHatch( false ); if ( rVal >>= aPropSeq ) @@ -4085,7 +4085,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName )) return false; SetName( aName ); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 17827a321aea..0b622d4b6d02 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -519,9 +519,9 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + aURL = OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX)); - aURL += ::rtl::OStringToOUString( + aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } @@ -543,11 +543,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = ::rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = ::rtl::OUString( "FillBitmapURL" ); + aPropSeq[1].Name = OUString( "FillBitmapURL" ); aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = ::rtl::OUString( "Bitmap" ); + aPropSeq[2].Name = OUString( "Bitmap" ); aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; @@ -562,8 +562,8 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt { nMemberId &= ~CONVERT_TWIPS; - ::rtl::OUString aName; - ::rtl::OUString aURL; + OUString aName; + OUString aURL; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic; diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index aa3be52d9417..03dfa29447c2 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -231,7 +231,7 @@ bool XPropertyList::Load() } bool XPropertyList::LoadFrom( const uno::Reference < embed::XStorage > &xStorage, - const rtl::OUString &rURL ) + const OUString &rURL ) { if( !bListDirty ) return false; @@ -260,7 +260,7 @@ bool XPropertyList::Save() } bool XPropertyList::SaveTo( const uno::Reference< embed::XStorage > &xStorage, - const rtl::OUString &rURL, rtl::OUString *pOptName ) + const OUString &rURL, OUString *pOptName ) { return SvxXMLXTableExportComponent::save( rURL, createInstance(), xStorage, pOptName ); } @@ -292,7 +292,7 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType t, XPropertyListRef XPropertyList::CreatePropertyListFromURL( XPropertyListType t, - const rtl::OUString & rURLStr, + const OUString & rURLStr, XOutdevItemPool* pXPool ) { INetURLObject aURL( rURLStr ); @@ -332,19 +332,19 @@ static struct { { XBITMAP_LIST, "sob" } }; -rtl::OUString XPropertyList::GetDefaultExt( XPropertyListType t ) +OUString XPropertyList::GetDefaultExt( XPropertyListType t ) { for (size_t i = 0; i < SAL_N_ELEMENTS (pExtnMap); i++) { if( pExtnMap[i].t == t ) - return rtl::OUString::createFromAscii( pExtnMap[ i ].pExt ); + return OUString::createFromAscii( pExtnMap[ i ].pExt ); } - return rtl::OUString(); + return OUString(); } -rtl::OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t ) +OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t ) { - rtl::OUString aFilter( "*." ); + OUString aFilter( "*." ); return aFilter + GetDefaultExt( t ); } diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index bb0ce74668ed..0a5add1befe7 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -63,7 +63,6 @@ #include "xmlconfig.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -649,7 +648,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p char buffer[1024]; - rtl::OUString aText; + OUString aText; AtomConfig* pAtomConfig = dynamic_cast< AtomConfig*>( gAtomConfigMap[rHeader.nRecType].get() ); if( pAtomConfig ) @@ -658,11 +657,11 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p if( !aText.getLength() ) { sprintf( buffer, "unknown_0x%04x", rHeader.nRecType ); - aText += rtl::OUString::createFromAscii( buffer ); + aText += OUString::createFromAscii( buffer ); } sprintf( buffer, " (I: %lu L: %lu)", (UINT32)rHeader.nRecVer, (UINT32)rHeader.nRecLen ); - aText += String( rtl::OUString::createFromAscii( buffer ) ); + aText += String( OUString::createFromAscii( buffer ) ); SvTreeListEntry* pEntry = 0; if( pAtom->isContainer() && pAtom->findFirstChildAtom() ) @@ -713,13 +712,13 @@ extern void load_config( const OUString& rPath ); class PPTDocument { public: - PPTDocument( const rtl::OUString& rFilePath ); + PPTDocument( const OUString& rFilePath ); ~PPTDocument(); Atom* getRootAtom() const; private: - void Load( const rtl::OUString& rFilePath ); + void Load( const OUString& rFilePath ); Atom* mpAtom; SvStream* mpDocStream; @@ -728,7 +727,7 @@ private: typedef boost::shared_ptr< PPTDocument > PPTDocumentPtr; -PPTDocument::PPTDocument(const rtl::OUString& rFilePath) +PPTDocument::PPTDocument(const OUString& rFilePath) : mpAtom(0), mpDocStream(0) { Load( rFilePath ); @@ -740,7 +739,7 @@ PPTDocument::~PPTDocument() delete mpDocStream; } -void PPTDocument::Load( const rtl::OUString& rFilePath ) +void PPTDocument::Load( const OUString& rFilePath ) { maStorage = new SotStorage( rFilePath, STREAM_STD_READ ); if( !maStorage->GetError() ) @@ -924,7 +923,7 @@ static String GetAtomText( const Atom* pAtom ) (UINT32)rHeader.nRecInstance, (UINT32)rHeader.nImpVerInst, (UINT32)rHeader.nRecLen ); - aText = rtl::OUString::createFromAscii( buffer ); + aText = OUString::createFromAscii( buffer ); if( pAtom->isContainer() ) { @@ -1130,12 +1129,12 @@ void MSViewerWorkWindow::Resize() if( argc >= 2 ) { - const rtl::OUString aFile1( rtl::OUString::createFromAscii(argv[1]) ); + const OUString aFile1( OUString::createFromAscii(argv[1]) ); PPTDocumentPtr pDocument1( new PPTDocument( aFile1 ) ); if( argc == 3 ) { - const rtl::OUString aFile2( rtl::OUString::createFromAscii(argv[2]) ); + const OUString aFile2( OUString::createFromAscii(argv[2]) ); PPTDocumentPtr pDocument2; pDocument2.reset( new PPTDocument( aFile2 ) ); diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 1b2cbdf51e8f..e182ed64e5d1 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -39,7 +39,6 @@ #include <ctype.h> #include <stack> -using ::rtl::OUString; using ::com::sun::star::io::XInputStream; using ::com::sun::star::io::IOException; @@ -329,9 +328,9 @@ void load_config( const OUString& rPath ) catch( Exception& ) { OSL_FAIL( - (rtl::OString("load_config(), " + (OString("load_config(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -339,7 +338,7 @@ void load_config( const OUString& rPath ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; if( maName.getLength() ) @@ -360,7 +359,7 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons return aRet; } -rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) { char buffer[128]; OUString aOut, aEmpty; @@ -402,7 +401,7 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) return aOut; } -rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof(sal_Char) ) @@ -419,7 +418,7 @@ rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( sal_uInt32 ) ) @@ -436,14 +435,14 @@ rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) { String aString = SvxMSDffManager::MSDFFReadZString( rStream, nLength, sal_True ); nLength = 0; return aString; } -rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( float ) ) @@ -462,7 +461,7 @@ rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; @@ -528,7 +527,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng /////////////////////////////////////////////////////////////////////// -rtl::OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aValue; diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index d6cd4e04e0f0..8250bf3e3753 100644 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx @@ -32,22 +32,22 @@ class ElementConfig { public: ElementConfig() : mnType( ECT_HEXDUMP ) {} - ElementConfig( const rtl::OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} - ElementConfig( const rtl::OUString& rName ) : maName( rName ) {} + ElementConfig( const OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} + ElementConfig( const OUString& rName ) : maName( rName ) {} ElementConfig( ElementConfigType rType ) : mnType( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; - const rtl::OUString& getName() const { return maName; } + const OUString& getName() const { return maName; } ElementConfigType getType() const { return mnType; } - static rtl::OUString dump_hex( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_byte( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_uint( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_float( SvStream& rStream, sal_Size& nLength ); + static OUString dump_hex( SvStream& rStream, sal_Size& nLength ); + static OUString dump_byte( SvStream& rStream, sal_Size& nLength ); + static OUString dump_uint( SvStream& rStream, sal_Size& nLength ); + static OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); + static OUString dump_float( SvStream& rStream, sal_Size& nLength ); private: - rtl::OUString maName; + OUString maName; ElementConfigType mnType; }; typedef boost::shared_ptr< ElementConfig > ElementConfigPtr; @@ -58,12 +58,12 @@ typedef std::list< ElementConfigPtr > ElementConfigList; class ElementValueConfig : public ElementConfig { public: - ElementValueConfig( const rtl::OUString& rName, const rtl::OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} + ElementValueConfig( const OUString& rName, const OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -72,11 +72,11 @@ class ElementConfigContainer : public ElementConfig { public: ElementConfigContainer() : ElementConfig( ETC_CONTAINER ) {} - ElementConfigContainer( const ::rtl::OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} - ElementConfigContainer( const ::rtl::OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} + ElementConfigContainer( const OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} + ElementConfigContainer( const OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} ElementConfigContainer( ElementConfigType rType ) : ElementConfig( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; void addElementConfig( ElementConfigPtr p ) { maElementConfigList.push_back( p ); } @@ -89,12 +89,12 @@ protected: class CaseElementConfig : public ElementConfigContainer { public: - CaseElementConfig( const rtl::OUString& rValue ) : maValue( rValue ) {} + CaseElementConfig( const OUString& rValue ) : maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ class SwitchElementConfig : public ElementConfigContainer public: SwitchElementConfig( ElementConfigType rType ) : ElementConfigContainer( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; }; /////////////////////////////////////////////////////////////////////// @@ -112,7 +112,7 @@ public: class AtomConfig : public ElementConfigContainer { public: - AtomConfig( const ::rtl::OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} + AtomConfig( const OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} bool isContainer() const { return mbIsContainer; } |