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/inc | |
| 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/inc')
84 files changed, 501 insertions, 501 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 |