diff options
Diffstat (limited to 'sc/source/ui/inc')
68 files changed, 354 insertions, 354 deletions
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d5d5eb07de09..5fd9025ea321 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -120,13 +120,13 @@ 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); /** Returns a list of all supported services. */ - 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); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index c55a4fa4bc75..a303c9c64cc5 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -76,12 +76,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -108,7 +108,7 @@ 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); diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 824c05700d26..b90d1c47819d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -166,12 +166,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -228,20 +228,20 @@ 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); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& sServiceName) + supportsService(const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - 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); @@ -260,12 +260,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -299,9 +299,9 @@ protected: throw (::com::sun::star::lang::DisposedException); /// Use this method to set initial Name without notification - void SetName(const rtl::OUString& rName) { msName = rName; } + void SetName(const OUString& rName) { msName = rName; } /// Use this method to set initial Description without notification - void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; } + void SetDescription(const OUString& rDesc) { msDescription = rDesc; } /// Reference to the parent object. ::com::sun::star::uno::Reference< @@ -312,12 +312,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 3d603223eabd..bf2926eb4946 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -143,7 +143,7 @@ protected: ::com::sun::star::beans::PropertyValue > PropertyValueSeq; private: - ::rtl::OUStringBuffer maBuffer; /// Contains the text representation of the ruler. + OUStringBuffer maBuffer; /// Contains the text representation of the ruler. public: explicit ScAccessibleCsvRuler( ScCsvRuler& rRuler ); @@ -189,7 +189,7 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the attributes of the specified character. */ - virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) + virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the screen coordinates of the specified character. */ @@ -204,7 +204,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the selected text (ruler returns empty string). */ - virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the start index of the selection (ruler returns -1). */ virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException ); @@ -217,10 +217,10 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the entire text. */ - virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the specified range [Start,End) of the text. */ - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the specified text portion. */ @@ -244,7 +244,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -265,10 +265,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ @@ -361,11 +361,11 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the description of the specified row in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the description text of the specified column in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the number of rows occupied at a specified row and column. @@ -472,7 +472,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -499,10 +499,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if nIndex is not a valid child index. */ @@ -615,7 +615,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // helpers ---------------------------------------------------------------- @@ -627,10 +627,10 @@ protected: private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the VCL grid control. Assumes a living object. */ diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 9302fc4ad41b..9e4db70b2cc1 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx @@ -92,7 +92,7 @@ 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); @@ -106,12 +106,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index da9833e20663..b0fba0aafaf4 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -163,13 +163,13 @@ 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); /** Returns a list of all supported services. */ - 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); @@ -261,12 +261,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -306,8 +306,8 @@ private: void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent); void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent); - rtl::OUString GetCurrentCellName() const; - rtl::OUString GetCurrentCellDescription() const; + OUString GetCurrentCellName() const; + OUString GetCurrentCellDescription() const; Rectangle GetVisibleArea_Impl() const; }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index e68e340d24e1..1de55098655e 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -85,13 +85,13 @@ 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); /** Returns a list of all supported services. */ - 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); @@ -107,12 +107,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4071d09fc5a0..4053bb8a8a66 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -48,8 +48,8 @@ public: ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType); + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType); protected: virtual ~ScAccessibleEditObject(); @@ -105,12 +105,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ 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); diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index b74770e6b0bd..1bf13a547dec 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -69,17 +69,17 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); //===== internal ======================================================== void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index dc8a639784bc..6031c7d973c2 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -87,14 +87,14 @@ 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); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - 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); @@ -107,8 +107,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index cdb7507bab57..b5f0394fa76a 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -73,9 +73,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ///===== XTypeProvider =================================================== diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 098e08c37839..5ba5d7cd6a50 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -99,9 +99,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ///===== XTypeProvider =================================================== @@ -117,8 +117,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 2a0fff825242..795badc2a9bb 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -67,10 +67,10 @@ public: 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 ) + virtual 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 ) + 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 ) @@ -134,9 +134,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== @@ -152,8 +152,8 @@ public: void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 38b0addb1fa3..132f7e0eb090 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -204,13 +204,13 @@ 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); /** Returns a list of all supported services. */ - 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); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 87e88c39a133..cb4fc71860ad 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -78,13 +78,13 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Returns the description of the specified row in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); /// Returns the description text of the specified column in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); @@ -196,12 +196,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -258,7 +258,7 @@ 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); diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index c2242c7f397e..80eb17fe94c0 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -55,12 +55,12 @@ protected: virtual void SAL_CALL disposing(); // ____ XServiceInfo ____ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 03d26b34c3b6..fd84d86969f0 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -109,23 +109,23 @@ private: SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; - rtl::OUString aStrInsertCols; - rtl::OUString aStrInsertRows; - rtl::OUString aStrInsertTabs; - rtl::OUString aStrDeleteCols; - rtl::OUString aStrDeleteRows; - rtl::OUString aStrDeleteTabs; - rtl::OUString aStrMove; - rtl::OUString aStrContent; - rtl::OUString aStrReject; - rtl::OUString aStrAllAccepted; - rtl::OUString aStrAllRejected; - rtl::OUString aStrNoEntry; - rtl::OUString aStrContentWithChild; - rtl::OUString aStrChildContent; - rtl::OUString aStrChildOrgContent; - rtl::OUString aStrEmpty; - rtl::OUString aUnknown; + OUString aStrInsertCols; + OUString aStrInsertRows; + OUString aStrInsertTabs; + OUString aStrDeleteCols; + OUString aStrDeleteRows; + OUString aStrDeleteTabs; + OUString aStrMove; + OUString aStrContent; + OUString aStrReject; + OUString aStrAllAccepted; + OUString aStrAllRejected; + OUString aStrNoEntry; + OUString aStrContentWithChild; + OUString aStrChildContent; + OUString aStrChildOrgContent; + OUString aStrEmpty; + OUString aUnknown; sal_uLong nAcceptCount; sal_uLong nRejectCount; bool bAcceptEnableFlag:1; @@ -165,7 +165,7 @@ protected: bool IsValidAction(const ScChangeAction* pScChangeAction); - rtl::OUString* MakeTypeString(ScChangeActionType eType); + OUString* MakeTypeString(ScChangeActionType eType); SvTreeListEntry* InsertChangeAction( const ScChangeAction* pScChangeAction,ScChangeActionState eState, diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 588093def54f..8d7ff13ca818 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -31,10 +31,10 @@ class ScAreaLink; class ScAreaLinkSaver { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aOptions; - ::rtl::OUString aSourceArea; + OUString aFileName; + OUString aFilterName; + OUString aOptions; + OUString aSourceArea; ScRange aDestArea; sal_uLong nRefresh; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 52066c3c0262..b13ef5ccd5c7 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -75,10 +75,10 @@ public: virtual void Paint(const Rectangle& rRect); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction); + void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); void addSeparator(); - ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled); + ScMenuFloatingWindow* addSubMenuItem(const OUString& rText, bool bEnabled); void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu); void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer); void clearSelectedMenuItem(); @@ -86,8 +86,8 @@ public: bool isMenuItemSelected(size_t nPos) const; size_t getSelectedMenuItem() const; - void setName(const ::rtl::OUString& rName); - const ::rtl::OUString& getName() const; + void setName(const OUString& rName); + const OUString& getName() const; void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -161,7 +161,7 @@ private: struct MenuItemData { - ::rtl::OUString maText; + OUString maText; bool mbEnabled:1; bool mbSeparator:1; @@ -195,7 +195,7 @@ private: // Name of this menu window, taken from the menu item of the parent window // that launches it (if this is a sub menu). If this is a top-level menu // window, then this name can be anything. - ::rtl::OUString maName; + OUString maName; size_t mnSelectedMenu; size_t mnClickedMenu; @@ -212,7 +212,7 @@ private: class ScCheckListMenuWindow : public ScMenuFloatingWindow { public: - typedef boost::unordered_map<rtl::OUString, bool, rtl::OUStringHash> ResultType; + typedef boost::unordered_map<OUString, bool, OUStringHash> ResultType; /** * Extended data that the client code may need to store. Create a @@ -244,7 +244,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void setMemberSize(size_t n); - void addMember(const ::rtl::OUString& rName, bool bVisible); + void addMember(const OUString& rName, bool bVisible); void initMembers(); void setConfig(const Config& rConfig); @@ -274,7 +274,7 @@ protected: private: struct Member { - ::rtl::OUString maName; + OUString maName; bool mbVisible; Member(); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 13bb74bcf978..8b067f5e25bf 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -63,7 +63,7 @@ private: Edit maEdMin; Edit maEdMax; - rtl::OUString maStrWarnSameValue; + OUString maStrWarnSameValue; SvNumberFormatter* mpNumberFormatter; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index bd8b0e6d64db..7727d28be926 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -44,7 +44,7 @@ private: FixedText maFtCondition; sal_Int32 mnIndex; - rtl::OUString maStrCondition; + OUString maStrCondition; protected: ListBox maLbType; @@ -56,7 +56,7 @@ protected: void Select(); void Deselect(); - virtual rtl::OUString GetExpressionString() = 0; + virtual OUString GetExpressionString() = 0; public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); @@ -88,7 +88,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createConditionEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); @@ -111,7 +111,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry formula::RefEdit maEdFormula; ScFormatEntry* createFormulaEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); @@ -143,7 +143,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -176,7 +176,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -205,7 +205,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( OptionBtnHdl, void* ); @@ -229,7 +229,7 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATE; } protected: - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); private: void Init(); @@ -253,7 +253,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDataEntriesType; ScIconSetFrmtDataEntriesType maEntries; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 02d24e653dd8..b64e45825386 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -26,10 +26,10 @@ enum ScCondFormatEntryType class ScCondFormatHelper { public: - static SC_DLLPUBLIC rtl::OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); + static SC_DLLPUBLIC OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); - static SC_DLLPUBLIC rtl::OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - rtl::OUString aStr1 = rtl::OUString(), rtl::OUString aStr2 = rtl::OUString() ); + static SC_DLLPUBLIC OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, + OUString aStr1 = OUString(), OUString aStr2 = OUString() ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 52bad85fb1d9..717fd429bb48 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -268,10 +268,10 @@ private: public: /** Fills all cells of a line with the passed text (separators mode). */ void ImplSetTextLineSep( - sal_Int32 nLine, const rtl::OUString& rTextLine, + sal_Int32 nLine, const OUString& rTextLine, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); /** Fills all cells of a line with the passed text (fixed width mode). */ - void ImplSetTextLineFix( sal_Int32 nLine, const rtl::OUString& rTextLine ); + void ImplSetTextLineFix( sal_Int32 nLine, const OUString& rTextLine ); /** Returns the text of the specified cell. */ const String& GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) const; diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 4faff8809d79..3caa4bf73b94 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -99,7 +99,7 @@ private: public: /** Fills all cells of all lines with the passed texts (Unicode strings). */ void SetUniStrings( - const rtl::OUString* pTextLines, const String& rSepChars, + const OUString* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); // column settings -------------------------------------------------------- diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 835a0cd31077..c74ae8a6ef2d 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -49,8 +49,8 @@ public: bool IsDatabase() const; bool IsExternal() const; bool IsNamedRange() const; - rtl::OUString GetSelectedNamedRange() const; - void AppendNamedRange(const rtl::OUString& rNames); + OUString GetSelectedNamedRange() const; + void AppendNamedRange(const OUString& rNames); private: DECL_LINK( RadioClickHdl, RadioButton * ); @@ -77,7 +77,7 @@ private: public: ScDataPilotServiceDlg( Window* pParent, - const com::sun::star::uno::Sequence<rtl::OUString>& rServices ); + const com::sun::star::uno::Sequence<OUString>& rServices ); ~ScDataPilotServiceDlg(); String GetServiceName() const; diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index ebd97473c75f..10a38dfb0e15 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -82,12 +82,12 @@ public: const ScSortParam* pForceNewSort, sal_Bool bRecord, sal_Bool bApi ); - bool AddDBRange( const ::rtl::OUString& rName, const ScRange& rRange, sal_Bool bApi ); - bool DeleteDBRange( const ::rtl::OUString& rName ); + bool AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool bApi ); + bool DeleteDBRange( const OUString& rName ); bool RenameDBRange( const String& rOld, const String& rNew ); bool ModifyDBData( const ScDBData& rNewData ); // Name unveraendert - bool RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); + bool RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); bool DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bRecord, bool bApi, bool bAllowMove = false ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 2e673e3085f8..0720ce5bd835 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -66,7 +66,7 @@ public: sal_Bool ImportData( const ScImportParam& rParam, sal_Bool bRecord = sal_True ); - void GotoDBArea( const ::rtl::OUString& rDBName ); + void GotoDBArea( const OUString& rDBName ); // DB range from Cursor ScDBData* GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP); @@ -88,13 +88,13 @@ public: void DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nParts ); void NumGroupDataPilot( const ScDPNumGroupInfo& rInfo ); void UngroupDataPilot(); - void DataPilotInput( const ScAddress& rPos, const rtl::OUString& rString ); + void DataPilotInput( const ScAddress& rPos, const OUString& rString ); bool DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL ); sal_Bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest ); bool HasSelectionForDrillDown( sal_uInt16& rOrientation ); - void SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensionName = NULL); + void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL); void ShowDataPilotSourceData( ScDPObject& rDPObj, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index e0dd46f74021..1a03612440c2 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -192,7 +192,7 @@ public: * passed as arguments (it creates copies); the caller is responsible for * destroying them. */ - virtual void ModifyAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap ); + virtual void ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& rRangeMap ); virtual sal_Bool CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names virtual sal_Bool InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index a18f127ef0dd..a26a234f3a83 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -144,7 +144,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE sal_uLong DBaseImport( const String& rFullFileName, CharSet eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); SC_DLLPRIVATE sal_uLong DBaseExport( - const rtl::OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); + const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL ); @@ -201,7 +201,7 @@ public: virtual sal_Bool Load( SfxMedium& rMedium ); virtual sal_Bool LoadFrom( SfxMedium& rMedium ); virtual sal_Bool ConvertFrom( SfxMedium &rMedium ); - virtual bool LoadExternal(SfxMedium& rMedium, const rtl::OUString& rProvider); + virtual bool LoadExternal(SfxMedium& rMedium, const OUString& rProvider); virtual sal_Bool Save(); virtual sal_Bool SaveAs( SfxMedium& rMedium ); virtual sal_Bool ConvertTo( SfxMedium &rMedium ); @@ -278,7 +278,7 @@ public: void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles ); - void PageStyleModified( const rtl::OUString& rStyleName, sal_Bool bApi ); + void PageStyleModified( const OUString& rStyleName, sal_Bool bApi ); void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const String& rStyle ); diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx index e571adb31e06..970626a93fcd 100644 --- a/sc/source/ui/inc/dpcontrol.hxx +++ b/sc/source/ui/inc/dpcontrol.hxx @@ -44,7 +44,7 @@ public: ScDocument* pDoc = NULL); ~ScDPFieldButton(); - void setText(const ::rtl::OUString& rText); + void setText(const OUString& rText); void setBoundingBox(const Point& rPos, const Size& rSize, bool bLayoutRTL); void setDrawBaseButton(bool b); void setDrawPopupButton(bool b); @@ -61,7 +61,7 @@ private: private: Point maPos; Size maSize; - ::rtl::OUString maText; + OUString maText; Fraction maZoomX; Fraction maZoomY; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 5ca2fdeb6912..307bcac4abbb 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -36,7 +36,7 @@ class ScDrawShell : public SfxShell DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); - void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ); + void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: ScViewData* GetViewData() { return pViewData; } diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index d613c849cc36..f52af12dc471 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -55,13 +55,13 @@ class ScDPFieldControlBase : public Control protected: struct FieldName { - rtl::OUString maText; + OUString maText; bool mbFits; sal_uInt8 mnDupCount; - FieldName(const rtl::OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); + FieldName(const OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); FieldName(const FieldName& r); - rtl::OUString getDisplayedText() const; + OUString getDisplayedText() const; }; typedef ::std::vector<FieldName> FieldNames; @@ -113,20 +113,20 @@ public: virtual void HandleWheelScroll(long nNotch) = 0; /** @return The name of the control without shortcut. */ - ::rtl::OUString GetName() const; - void SetName(const ::rtl::OUString& rName); + OUString GetName() const; + void SetName(const OUString& rName); /** @return TRUE, if the field with the given index exists. */ bool IsExistingIndex( size_t nIndex ) const; - void AppendField( const rtl::OUString& rText, const ScPivotFuncData& rFunc ); + void AppendField( const OUString& rText, const ScPivotFuncData& rFunc ); /** * Inserts a field using the specified pixel position. * * @param rPos The coordinates to insert the field. */ - size_t AddField(const rtl::OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); + size_t AddField(const OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); bool MoveField(size_t nCurPos, const Point& rPos, size_t& rnIndex); @@ -141,9 +141,9 @@ public: /** Removes all fields. */ void ClearFields(); /** Changes the text on an existing field. */ - void SetFieldText(const rtl::OUString& rText, size_t nIndex, sal_uInt8 nDupCount); + void SetFieldText(const OUString& rText, size_t nIndex, sal_uInt8 nDupCount); /** Returns the text of an existing field. */ - rtl::OUString GetFieldText( size_t nIndex ) const; + OUString GetFieldText( size_t nIndex ) const; /** Calculates a field index at a specific pixel position. Returns in every case the index of an existing field. @@ -233,7 +233,7 @@ private: /** Selects a field at a new position relative to the current. */ void MoveSelection( SCsCOL nDX, SCsROW nDY ); - sal_uInt8 GetNextDupCount(const rtl::OUString& rFieldText) const; + sal_uInt8 GetNextDupCount(const OUString& rFieldText) const; private: typedef ::std::vector<Window*> Paintables; @@ -243,7 +243,7 @@ private: FieldNames maFieldNames; /// String array of the field names and flags, if text fits into button. ScPivotLayoutDlg* mpDlg; FixedText* mpCaption; /// FixedText containing the name of the control. - ::rtl::OUString maName; + OUString maName; size_t mnFieldSelected; /// Currently selected field. diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 53f1939c1561..9329c7e35780 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -41,7 +41,7 @@ public: FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const rtl::OUString& aStartStr, + const OUString& aStartStr, double fStep, double fMax, sal_uInt16 nPossDir ); @@ -54,14 +54,14 @@ public: double GetStep() const { return fIncrement; } double GetMax() const { return fEndVal; } - rtl::OUString GetStartStr() const { return aEdStartVal.GetText(); } + OUString GetStartStr() const { return aEdStartVal.GetText(); } void SetEdStartValEnabled(bool bFlag = false); private: FixedText aFtStartVal; Edit aEdStartVal; - const rtl::OUString aStartStrVal; + const OUString aStartStrVal; FixedText aFtEndVal; Edit aEdEndVal; @@ -92,7 +92,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - const rtl::OUString aErrMsgInvalidVal; + const OUString aErrMsgInvalidVal; //---------------------------------------------------------- diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index e02db7066da7..698d5176a5ca 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -116,13 +116,13 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; + const OUString aStrUndefined; + const OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; ScFilterOptionsMgr* pOptionsMgr; @@ -204,8 +204,8 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNoName; + const OUString aStrUndefined; + const OUString aStrNoName; OKButton aBtnOk; CancelButton aBtnCancel; diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 57c22a7ba4ef..1a06c4f64801 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -24,7 +24,7 @@ class FuConstCustomShape : public FuConstruct { - rtl::OUString aCustomShape; + OUString aCustomShape; void SetAttributes( SdrObject* pObj ); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 8c7e36b26dbe..2691b118bbf7 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -129,9 +129,9 @@ public: void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } const String& GetStreamPath() const { return aStreamPath; } - bool ImportString( const ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportString( ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportByteString( ::rtl::OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); + bool ImportString( const OUString&, sal_uLong=FORMAT_STRING ); + bool ExportString( OUString&, sal_uLong=FORMAT_STRING ); + bool ExportByteString( OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); bool ImportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); bool ExportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); @@ -179,7 +179,7 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) class ScImportStringStream : public SvMemoryStream { public: - ScImportStringStream( const ::rtl::OUString rStr ) + ScImportStringStream( const OUString rStr ) : SvMemoryStream( (void*)rStr.getStr(), rStr.getLength() * sizeof(sal_Unicode), STREAM_READ) { @@ -233,7 +233,7 @@ public: may start under false preconditions. */ -SC_DLLPUBLIC rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, +SC_DLLPUBLIC OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote ); #endif diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index e0db50c19f57..0f0ac6e101da 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -72,12 +72,12 @@ private: sal_uLong nTipVisible; Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; - rtl::OUString aManualTip; - rtl::OUString aAutoSearch; + OUString aManualTip; + OUString aAutoSearch; - rtl::OUString aCurrentText; + OUString aCurrentText; - rtl::OUString aFormText; // for autopilot function + OUString aFormText; // for autopilot function xub_StrLen nFormSelStart; // Selection for autopilot function xub_StrLen nFormSelEnd; @@ -169,8 +169,8 @@ public: eMode != SC_INPUT_TYPE); } bool IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const rtl::OUString& GetEditString(); - const rtl::OUString& GetFormString() const { return aFormText; } + const OUString& GetEditString(); + const OUString& GetFormString() const { return aFormText; } const ScAddress& GetCursorPos() const { return aCursorPos; } @@ -232,7 +232,7 @@ public: // Communication with the autopilot function void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection ( const rtl::OUString& rStr ); + void InputReplaceSelection ( const OUString& rStr ); bool IsFormulaMode() const { return bFormulaMode; } ScInputWindow* GetInputWindow() { return pInputWin; } diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index e3169ba96764..2f035fbb387b 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -67,7 +67,7 @@ private: void UpdateSourceRanges(); void UpdateEnable(); - void LoadDocument( const rtl::OUString& rFile, const String& rFilter, + void LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ); public: @@ -80,10 +80,10 @@ public: virtual short Execute(); // overwritten to set dialog parent - rtl::OUString GetURL(); - rtl::OUString GetFilter(); // may be empty - rtl::OUString GetOptions(); // filter options - rtl::OUString GetSource(); // separated by ";" + OUString GetURL(); + OUString GetFilter(); // may be empty + OUString GetOptions(); // filter options + OUString GetSource(); // separated by ";" sal_uLong GetRefresh(); // 0 if disabled }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8ca5db418187..42db6273b04d 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -33,14 +33,14 @@ class ScMoveTableDlg : public ModalDialog { public: - ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault); + ScMoveTableDlg(Window* pParent, const OUString& rDefault); ~ScMoveTableDlg(); sal_uInt16 GetSelectedDocument () const; SCTAB GetSelectedTable () const; bool GetCopyTable () const; bool GetRenameTable () const; - void GetTabNameString( rtl::OUString& rString ) const; + void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); void EnableCopyTable (sal_Bool bFlag=true); void EnableRenameTable (sal_Bool bFlag=true); @@ -68,11 +68,11 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - rtl::OUString maStrTabNameUsed; - rtl::OUString maStrTabNameEmpty; - rtl::OUString maStrTabNameInvalid; + OUString maStrTabNameUsed; + OUString maStrTabNameEmpty; + OUString maStrTabNameInvalid; - const rtl::OUString maDefaultName; + const OUString maDefaultName; sal_uInt16 mnCurrentDocPos; sal_uInt16 nDocument; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 52d34945f50a..13c32b75d412 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -72,7 +72,7 @@ private: OUString maName; OUString maScope; - std::map<rtl::OUString, ScRangeName*> maRangeMap; + std::map<OUString, ScRangeName*> maRangeMap; void CancelPushed(); void AddPushed(); @@ -90,7 +90,7 @@ protected: public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* pViewData, std::map<rtl::OUString, ScRangeName*> aRangeMap, + ScViewData* pViewData, std::map<OUString, ScRangeName*> aRangeMap, const ScAddress& aCursorPos, const bool bUndo); virtual ~ScNameDefDlg() {}; @@ -101,7 +101,7 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetNewData( rtl::OUString& rName, rtl::OUString& rScope ); + void GetNewData( OUString& rName, OUString& rScope ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 933af353dacb..79a254a4f914 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -72,11 +72,11 @@ private: SvxSimpleTableContainer maNameMgrCtrl; ScRangeManagerTable* mpRangeManagerTable; - const rtl::OUString maGlobalNameStr; - const rtl::OUString maErrInvalidNameStr; - const rtl::OUString maErrNameInUse; - const rtl::OUString maStrInfoDefault; - const rtl::OUString maStrMultiSelect; + const OUString maGlobalNameStr; + const OUString maErrInvalidNameStr; + const OUString maErrNameInUse; + const OUString maStrInfoDefault; + const OUString maStrMultiSelect; ScViewData* mpViewData; ScDocument* mpDoc; @@ -88,7 +88,7 @@ private: //ugly hack to call DefineNames from ManageNames bool mbCloseWithoutUndo; - typedef boost::ptr_map<rtl::OUString, ScRangeName> RangeNameContainer; + typedef boost::ptr_map<OUString, ScRangeName> RangeNameContainer; RangeNameContainer maRangeMap; @@ -102,7 +102,7 @@ private: bool IsFormulaValid(); void CheckForEmptyTable(); - ScRangeName* GetRangeName(const rtl::OUString& rScope); + ScRangeName* GetRangeName(const OUString& rScope); bool AddPushed(); void RemovePushed(); @@ -133,7 +133,7 @@ protected: public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData, - const ScAddress& aCursorPos, boost::ptr_map<rtl::OUString, ScRangeName>* pRangeMap = NULL ); + const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); @@ -142,8 +142,8 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetRangeNames(boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap); - void SetEntry(const rtl::OUString& rName, const rtl::OUString& rScope); + void GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap); + void SetEntry(const OUString& rName, const OUString& rScope); }; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index d82ce5cd0f1e..687cc0f17a0e 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -40,9 +40,9 @@ class ScRangeData; struct ScRangeNameLine { - rtl::OUString aName; - rtl::OUString aExpression; - rtl::OUString aScope; + OUString aName; + OUString aExpression; + OUString aScope; }; //Implements the table for the manage names dialog @@ -52,10 +52,10 @@ struct ScRangeNameLine class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable { private: - rtl::OUString maGlobalString; + OUString maGlobalString; // should be const because we should not modify it here - const boost::ptr_map<rtl::OUString, ScRangeName>& mrRangeMap; + const boost::ptr_map<OUString, ScRangeName>& mrRangeMap; // for performance, save which entries already have the formula entry // otherwise opening the dialog with a lot of range names is extremelly slow because // we would calculate all formula strings during opening @@ -70,7 +70,7 @@ private: void setColWidths(); public: - ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<rtl::OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); + ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); virtual void Resize(); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index ba4098c05824..da880cb563cd 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -43,14 +43,14 @@ private: ScRangeManagerTable* mpTable; - std::vector<rtl::OUString> maSelectedNames; - boost::ptr_map<rtl::OUString, ScRangeName> maRangeMap; + std::vector<OUString> maSelectedNames; + boost::ptr_map<OUString, ScRangeName> maRangeMap; public: ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); - std::vector<rtl::OUString> GetSelectedNames() const; + std::vector<OUString> GetSelectedNames() const; bool IsAllSelected() const; }; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 41eba6064a0b..9eb57004c38c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -280,7 +280,7 @@ private: void SetCurrentCell( SCCOL nCol, SCROW Row ); void SetCurrentCellStr( const String rName ); void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const rtl::OUString& rName ); + void SetCurrentTableStr( const OUString& rName ); void SetCurrentObject( const String rName ); void SetCurrentDoc( const String& rDocName ); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 16b7d6bc93bf..14d5ed5eda87 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -183,8 +183,8 @@ private: std::vector<ScOptConditionRow> maConditions; long nScrollPos; - com::sun::star::uno::Sequence<rtl::OUString> maImplNames; - com::sun::star::uno::Sequence<rtl::OUString> maDescriptions; + com::sun::star::uno::Sequence<OUString> maImplNames; + com::sun::star::uno::Sequence<OUString> maDescriptions; String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index aec2dcba9d45..ecc406e1438b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -80,12 +80,12 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; MoreButton aBtnMore; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrUndefined; + const OUString aStrNone; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; const sal_uInt16 nWhichQuery; const ScQueryParam theQueryData; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 6aa56a57f54f..c02cb5c6a142 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -60,7 +60,7 @@ private: class ScDPFunctionDlg : public ModalDialog { - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); @@ -71,8 +71,8 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - const ::rtl::OUString& GetBaseFieldName(const ::rtl::OUString& rLayoutName) const; - const ::rtl::OUString& GetBaseItemName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetBaseFieldName(const OUString& rLayoutName) const; + const OUString& GetBaseItemName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; @@ -162,7 +162,7 @@ private: void Init( const ScDPNameVec& rDataFields, bool bEnableLayout ); void InitHideListBox(); - const ::rtl::OUString& GetFieldName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetFieldName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindListBoxEntry( const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos ) const; @@ -203,7 +203,7 @@ private: ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPLabelData maLabelData; /// Cache for members data. - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; @@ -221,7 +221,7 @@ public: * be different from the name displayed in the dialog if the field * has a layout name. */ - ::rtl::OUString GetDimensionName() const; + OUString GetDimensionName() const; private: DECL_LINK( DblClickHdl, ListBox* ); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 31bed6b4bfaf..89c36b0b0231 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -133,7 +133,7 @@ protected: private: /** Returns the localized function name for the specified (1-based) resource index. */ - inline const rtl::OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } + inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } /** Fills the field windows from the current pivot table settings. */ void InitFieldWindows(); @@ -145,9 +145,9 @@ private: void InitFieldWindow ( const ::std::vector<ScPivotField>& rFields, ScPivotFieldType eType ); void AdjustDlgSize(); ScDPLabelData* GetLabelData( SCCOL nCol ); - rtl::OUString GetLabelString(SCsCOL nCol); + OUString GetLabelString(SCsCOL nCol); bool IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType ); - rtl::OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); + OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); void AddField ( size_t nFromIndex, ScPivotFieldType eToType, const Point& rAtPos ); @@ -231,8 +231,8 @@ private: PushButton maBtnRemove; PushButton maBtnOptions; MoreButton maBtnMore; - std::vector<rtl::OUString> maFuncNames; /// Localized function names from resource. - boost::ptr_vector<rtl::OUString> maRefStrs; /// Reference strings stored with the output list box. + std::vector<OUString> maFuncNames; /// Localized function names from resource. + boost::ptr_vector<OUString> maRefStrs; /// Reference strings stored with the output list box. ScDPObjectPtr mxDlgDPObject; /// Clone of the pivot table object this dialog is based on. ScPivotParam maPivotData; /// The pivot table field configuration. ScDPLabelDataVector maLabelData; /// Information about all dimensions. @@ -241,9 +241,9 @@ private: ScDocument* mpDoc; formula::RefEdit* mpRefInputEdit; - const rtl::OUString maStrUndefined; - const rtl::OUString maStrNewTable; - rtl::OUString maOutputRefStr; /// Used only for caching in UI. + const OUString maStrUndefined; + const OUString maStrNewTable; + OUString maOutputRefStr; /// Used only for caching in UI. ScPivotFieldType meDnDFromType; size_t mnDnDFromIndex; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 76f016be60cf..dbf6f9729265 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -110,7 +110,7 @@ private: struct TableItem { - rtl::OUString maName; + OUString maName; TabProtectionPtr mpProtect; }; ::std::vector<TableItem> maTableItems; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 61f07f01e730..c1b1e2573d00 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -36,10 +36,10 @@ public: ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bool bEdit = false, sal_Bool bSheetProtected = false ); ~ScNewScenarioDlg(); - void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); - void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; private: diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index b017a56fb151..57e537a02436 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -35,7 +35,7 @@ class ScImportAsciiDlg : public ModalDialog sal_uLong* mpRowPosArray; sal_uLong mnRowPosCount; - rtl::OUString maPreviewLine[ CSV_PREVIEW_LINES ]; + OUString maPreviewLine[ CSV_PREVIEW_LINES ]; FixedText* pFtCharSet; @@ -101,7 +101,7 @@ private: void SetupSeparatorCtrls(); - bool GetLine( sal_uLong nLine, rtl::OUString &rText ); + bool GetLine( sal_uLong nLine, OUString &rText ); void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 5af3416b04e7..9e9772968474 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -30,7 +30,7 @@ public: ~ScAutoFormatDlg(); sal_uInt16 GetIndex() const { return nIndex; } - rtl::OUString GetCurrFormatName(); + OUString GetCurrFormatName(); private: FixedLine aFlFormat; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6b54c98be0e2..205ed0151a42 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -45,7 +45,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( const String& rTitle, const String& rFixedText, - const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ); + const OString& nDlgHelpId, const OString& nLbHelpId ); /** Inserts a string into the ListBox. */ void Insert( const String& rString, sal_Bool bSelected ); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 9e098fdcd339..d79cb2b21ad0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -48,8 +48,8 @@ class ScSolverOptionsDialog : public ModalDialog CancelButton maBtnCancel; SvLBoxButtonData* mpCheckButtonData; - com::sun::star::uno::Sequence<rtl::OUString> maImplNames; - com::sun::star::uno::Sequence<rtl::OUString> maDescriptions; + com::sun::star::uno::Sequence<OUString> maImplNames; + com::sun::star::uno::Sequence<OUString> maDescriptions; String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; @@ -64,8 +64,8 @@ class ScSolverOptionsDialog : public ModalDialog public: ScSolverOptionsDialog( Window* pParent, - const com::sun::star::uno::Sequence<rtl::OUString>& rImplNames, - const com::sun::star::uno::Sequence<rtl::OUString>& rDescriptions, + const com::sun::star::uno::Sequence<OUString>& rImplNames, + const com::sun::star::uno::Sequence<OUString>& rDescriptions, const String& rEngine, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); ~ScSolverOptionsDialog(); diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index ee1659a15d81..11252978c387 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { class ScSolverUtil { public: - static void GetImplementations( com::sun::star::uno::Sequence<rtl::OUString>& rImplNames, - com::sun::star::uno::Sequence<rtl::OUString>& rDescriptions ); - static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const rtl::OUString& rImplName ); - static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const rtl::OUString& rImplName ); + static void GetImplementations( com::sun::star::uno::Sequence<OUString>& rImplNames, + com::sun::star::uno::Sequence<OUString>& rDescriptions ); + static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const OUString& rImplName ); + static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const OUString& rImplName ); }; #endif diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 05f25d010f53..1c302c95eae0 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -35,10 +35,10 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ); + const OString& sHelpId, const OString& sEditHelpId ); ~ScStringInputDlg(); - void GetInputString( rtl::OUString& rString ) const; + void GetInputString( OUString& rString ) const; private: FixedText aFtEditTitle; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index fdfcac5daf72..73f6127610ac 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -34,7 +34,7 @@ public: const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& nHelpId ); + const OString& nHelpId ); ~ScTabBgColorDlg(); void GetSelectedColor( Color& rColor ) const; @@ -57,7 +57,7 @@ private: HelpButton aBtnHelp; Color aTabBgColor; const String aTabBgColorNoColorText; - rtl::OString msHelpId; + OString msHelpId; void FillColorValueSets_Impl(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index eb3550ad9805..06cd9c8b967c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -176,10 +176,10 @@ private: String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; // ugly hack for Add button in ScNameDlg - boost::ptr_map<rtl::OUString, ScRangeName> maRangeMap; + boost::ptr_map<OUString, ScRangeName> maRangeMap; bool mbInSwitch; - rtl::OUString maName; - rtl::OUString maScope; + OUString maName; + OUString maScope; private: void Construct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE ); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 8249cdf61dd8..962f62b28e34 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -64,7 +64,7 @@ private: Edit aEdSheetPrefix; // Stores old Sheet Prefix - ::rtl::OUString maOldPrefixValue; + OUString maOldPrefixValue; }; #endif diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index b895235c1c7b..0b613169a242 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -48,7 +48,7 @@ private: void UpdateCustomCalcRadioButtons(bool bDefault); void LaunchCustomCalcSettings(); - bool IsValidSeparator(const ::rtl::OUString& rSep) const; + bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; DECL_LINK( ButtonHdl, Button* ); @@ -83,7 +83,7 @@ private: /** Stores old separator value of currently focused separator edit box. This value is used to revert undesired value change. */ - ::rtl::OUString maOldSepValue; + OUString maOldSepValue; ScCalcConfig maSavedConfig; ScCalcConfig maCurrentConfig; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 468f6fd5f7e2..08c5854b476a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -56,8 +56,8 @@ protected: SvxCheckListBox aLbColumns; FixedText aFtFunctions; ListBox aLbFunctions; - const rtl::OUString aStrNone; - const rtl::OUString aStrColumn; + const OUString aStrNone; + const OUString aStrColumn; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index f5c17cdf3044..470e7d3bdf4a 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -56,7 +56,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_Bool Merge( SfxUndoAction *pNextAction ); @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aEffRange; @@ -120,7 +120,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bRows; @@ -152,7 +152,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -201,7 +201,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -235,7 +235,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSrcRange; @@ -268,7 +268,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -302,7 +302,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -341,7 +341,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; ScEditDataArray* GetDataArray(); private: @@ -379,7 +379,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -415,7 +415,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSource; @@ -447,7 +447,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScCellMergeOption maOption; @@ -474,7 +474,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; // deleted data @@ -500,7 +500,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aCursorPos; @@ -535,7 +535,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -565,7 +565,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -595,7 +595,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -625,7 +625,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -650,7 +650,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -676,7 +676,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_uInt16 GetId() const; private: @@ -702,7 +702,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -725,7 +725,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -753,7 +753,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -781,7 +781,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -815,7 +815,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aOldDoc; @@ -851,7 +851,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -873,7 +873,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -895,7 +895,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -917,7 +917,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -939,7 +939,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void SetCurTab(); @@ -965,7 +965,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index c6e0ae0037c5..38651c863f1d 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -51,7 +51,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -101,7 +101,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ValuesType maOldValues; @@ -131,7 +131,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aPos; @@ -182,7 +182,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -207,7 +207,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -234,7 +234,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -282,7 +282,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void DoInsertNote( const ScNoteData& rNoteData ); @@ -310,7 +310,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress maPos; @@ -333,7 +333,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bIsDelete; @@ -358,7 +358,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRangeName* pOldRanges; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 48622e3de325..e4d28396717b 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -57,7 +57,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -87,7 +87,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -113,7 +113,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -142,7 +142,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -168,7 +168,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -193,7 +193,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -219,7 +219,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -248,7 +248,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -275,7 +275,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; @@ -294,7 +294,7 @@ private: class ScUndoAutoFilter: public ScDBFuncUndo { private: - ::rtl::OUString aDBName; + OUString aDBName; bool bFilterSet; void DoChange( bool bUndo ); @@ -302,7 +302,7 @@ private: public: TYPEINFO(); ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const ::rtl::OUString& rName, bool bSet ); + const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); virtual void Undo(); @@ -310,7 +310,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -327,7 +327,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDBCollection* pUndoColl; @@ -351,7 +351,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -384,7 +384,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -416,7 +416,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pOldUndoDoc; @@ -443,7 +443,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScArea aDestArea; @@ -473,7 +473,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aChartName; @@ -509,7 +509,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr<ScMarkData> mpMarkData; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 7ae1c747c6a7..59bc7c8197d7 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -72,7 +72,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 25e688821354..a1fa0f59d263 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -60,7 +60,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String sNewName; @@ -79,7 +79,7 @@ public: ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - std::vector<rtl::OUString>& newNameList); + std::vector<OUString>& newNameList); virtual ~ScUndoInsertTables(); virtual void Undo(); @@ -87,12 +87,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; - std::vector<rtl::OUString> aNameList; + std::vector<OUString> aNameList; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; SCTAB nTab; @@ -117,7 +117,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector<SCTAB> theTabs; @@ -144,7 +144,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -163,8 +163,8 @@ public: ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, ::std::vector<SCTAB>* pNewTabs, - ::std::vector< ::rtl::OUString>* pOldNames = NULL, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pOldNames = NULL, + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoMoveTab(); @@ -173,13 +173,13 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpOldNames; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpOldNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; void DoChange( sal_Bool bUndo ) const; }; @@ -193,7 +193,7 @@ public: ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, ::std::vector<SCTAB>* pNewTabs, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoCopyTab(); @@ -202,12 +202,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; SdrUndoAction* pDrawUndo; void DoChange() const; @@ -232,7 +232,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScUndoTabColorInfo::List aTabColorList; @@ -257,7 +257,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr<ScMarkData> mpMarkData; @@ -285,7 +285,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -311,7 +311,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -342,7 +342,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector<SCTAB> undoTabs; @@ -368,7 +368,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -396,7 +396,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB mnTab; @@ -421,7 +421,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -450,7 +450,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -480,7 +480,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aPersistName; // to find object (works only for OLE objects) @@ -503,7 +503,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 5229b992467c..c0e8f07e623d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -129,7 +129,7 @@ public: sal_Bool bLink = false, sal_Bool bAllowDialogs = false ); sal_Bool PasteFile( const Point&, const String&, sal_Bool bLink=false ); - sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); + sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); sal_Bool PasteBitmap( const Point&, const Bitmap& ); sal_Bool PasteMetaFile( const Point&, const GDIMetaFile& ); sal_Bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, @@ -248,7 +248,7 @@ public: void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True ); sal_Bool InsertTable( const String& rName, SCTAB nTabNr, sal_Bool bRecord = sal_True ); - sal_Bool InsertTables(std::vector<rtl::OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); + sal_Bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); sal_Bool AppendTable( const String& rName, sal_Bool bRecord = sal_True ); @@ -258,7 +258,7 @@ public: bool DeleteTables(SCTAB nTab, SCTAB nSheets); sal_Bool RenameTable( const String& rName, SCTAB nTabNr ); - void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const rtl::OUString* pNewTabName = NULL ); + void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName = NULL ); void ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, sal_Bool bLink,SCTAB nTab); @@ -317,7 +317,7 @@ public: void DetectiveMarkPred(); void DetectiveMarkSucc(); - void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr); + void InsertCurrentTime(short nCellFmt, const OUString& rUndoStr); void ShowNote( bool bShow = true ); inline void HideNote() { ShowNote( false ); } diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 95f379e3c9ba..7c227d67260a 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -51,7 +51,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg Image maImgFileOpen; - rtl::OUString maSrcPath; + OUString maSrcPath; ScOrcusXMLTreeParam maXMLParam; std::set<const SvTreeListEntry*> maCellLinks; |