diff options
Diffstat (limited to 'sw/source/core')
188 files changed, 1186 insertions, 1261 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 8ac279b4e555..5cd3ba1c956c 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using namespace sw::access; const sal_Char sServiceName[] = "com.sun.star.table.AccessibleCellView"; diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index d62e21c13727..88e2f4948efc 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -55,25 +55,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo // 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 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); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 80e3c4d570a0..e80e97b91cb0 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -49,7 +49,6 @@ using namespace sw::access; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; void SwAccessibleContext::InitStates() { diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 18476894e3e5..78981f851050 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -43,7 +43,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using lang::IndexOutOfBoundsException; diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 617bebfe43f7..ed2b160aab21 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -72,7 +72,7 @@ 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); // XAccessibleComponent @@ -126,18 +126,18 @@ public: // XServiceInfo // 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 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); diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 3f480b958530..899443878938 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextEmbeddedObject"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"; diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 402b757cdffd..5341a4e4c678 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -35,18 +35,18 @@ public: // XServiceInfo // 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 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); diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index e289450fb6b3..5556dacf1ed8 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceNameFootnote[] = "com.sun.star.text.AccessibleFootnoteView"; const sal_Char sServiceNameEndnote[] = "com.sun.star.text.AccessibleEndnoteView"; diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 123c32ebe455..316ce6d5b59b 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -44,25 +44,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo /** 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 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); diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index c688991413f5..4953bb3acb5f 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; sal_Bool SwAccessibleFrameBase::IsSelected() { diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 58beaff334de..d5abfff1efed 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextGraphicObject"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleGraphic"; diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index a7595313cecb..8e1eff5112bf 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -35,18 +35,18 @@ public: // XServiceInfo /** 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 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); diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 079d7b403616..862a7a86e9e6 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceNameHeader[] = "com.sun.star.text.AccessibleHeaderView"; const sal_Char sServiceNameFooter[] = "com.sun.star.text.AccessibleFooterView"; diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index deb6d148947a..81ec1099c53b 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,25 +41,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo /** 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 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); diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 3d0a05d1b5bf..75e227c49c01 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; SwAccessibleHyperlink::SwAccessibleHyperlink( sal_uInt16 nHPos, SwAccessibleParagraph *p, sal_Int32 nStt, sal_Int32 nEnd ) : diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index e23c5d2bb809..28f11652a77c 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -52,7 +52,7 @@ public: virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 68eba19b837a..54359617c343 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using namespace ::sw::access; struct SwFrmFunc diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 98cb88759698..1cbf2f6b7ec9 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const { diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 19329fc577c1..d41a7d5533ab 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -28,8 +28,8 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, public ::com::sun::star::accessibility::XAccessibleImage { SwDepend aDepend; - ::rtl::OUString msTitle; // #i73249# - ::rtl::OUString msDesc; + OUString msTitle; // #i73249# + OUString msDesc; protected: @@ -48,12 +48,12 @@ public: // XAccessibleContext // #i73249# - Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) 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); @@ -75,7 +75,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XAccessibleImage - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleImageDescription( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 861e557bbb50..287ba7be6423 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::accessibility; using uno::Reference; using uno::RuntimeException; using uno::Sequence; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessiblePageView"; diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 077c567e1ab3..aa0c6b927783 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -59,17 +59,17 @@ public: // XAccessibleContext methods that need to be overridden - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService ( - const ::rtl::OUString& sServiceName) + const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index a1b426e2cc3d..ba8e5e2c72d7 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -44,10 +44,10 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::PropertyValue, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap; + OUStringHash, + ::std::equal_to< OUString > > tAccParaPropValMap; class SwAccessibleParagraph : public SwClient, // #i108125# @@ -61,7 +61,7 @@ class SwAccessibleParagraph : { friend class SwAccessibleHyperlink; - ::rtl::OUString sDesc; // protected by base classes mutex + OUString sDesc; // protected by base classes mutex // data for this paragraph's text portions; this contains the // mapping from the core 'model string' to the accessible text @@ -86,9 +86,9 @@ class SwAccessibleParagraph : const SwTxtNode* GetTxtNode() const; /// get the (accessible) text string (requires frame; check before) - ::rtl::OUString GetString(); + OUString GetString(); - ::rtl::OUString GetDescription(); + OUString GetDescription(); // get the current care position sal_Int32 GetCaretPos(); @@ -133,12 +133,12 @@ class SwAccessibleParagraph : // #i63870# void _getDefaultAttributesImpl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, + const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rDefAttrSeq, const bool bOnlyCharAttrs = false ); void _getRunAttributesImpl( const sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, + const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rRunAttrSeq ); public: @@ -183,31 +183,31 @@ protected: //helpers for word boundaries sal_Bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); // get boundaries of word/sentence/etc. for specified text type // Does all argument checking, and then delegates to helper methods above. sal_Bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos, sal_Int16 aTextType ) throw ( @@ -229,7 +229,7 @@ public: // XAccessibleContext // Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -258,18 +258,18 @@ public: // XServiceInfo // 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 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); @@ -298,16 +298,16 @@ public: virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > 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); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -317,10 +317,10 @@ public: virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( @@ -401,8 +401,8 @@ public: // #i63870# // XAccesibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); }; inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 1720053da77b..ecda713ac17f 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -54,8 +54,6 @@ using namespace ::com::sun::star; -using rtl::OUString; -using rtl::OUStringBuffer; using i18n::Boundary; // 'portion type' for terminating portions diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 021b338813a9..7b4fcd597a50 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -40,13 +40,13 @@ class SwAccessiblePortionData : public SwPortionHandler const SwTxtNode* pTxtNode; // variables used while collecting the data - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sal_Int32 nModelPosition; sal_Bool bFinished; const SwViewOption* pViewOptions; // the accessible string - rtl::OUString sAccessibleString; + OUString sAccessibleString; // positions array // instances of Position_t must always include the minimum and @@ -104,7 +104,7 @@ public: // access to the portion data /// get the text string, as presented by the layout - const rtl::OUString& GetAccessibleString() const; + const OUString& GetAccessibleString() const; /// get the start & end positions of the sentence void GetLineBoundary( com::sun::star::i18n::Boundary& rBound, diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 79a496eefac6..9eeb588d1b9d 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -29,7 +29,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // SwAccessiblePreview diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index c699054ea7a8..f699ce931b98 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -43,20 +43,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 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); diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index d7258858a36c..8992690826ec 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::sw::access; const sal_Char sServiceName[] = "com.sun.star.table.AccessibleTableView"; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 3db34e492382..36a91b0544da 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -39,7 +39,7 @@ class SwAccessibleTable : public SwClient { SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex - ::rtl::OUString sDesc; + OUString sDesc; const SwSelBoxes *GetSelBoxes() const; void FireTableChangeEvent( const SwAccessibleTableData_Impl& rTableData ); @@ -60,7 +60,7 @@ protected: virtual ~SwAccessibleTable(); // #i77106# - inline void SetDesc( ::rtl::OUString sNewDesc ) + inline void SetDesc( OUString sNewDesc ) { sDesc = sNewDesc; } @@ -108,7 +108,7 @@ public: //===== XAccessibleContext ============================================== /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -118,11 +118,11 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( + 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( + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -186,20 +186,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 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); @@ -311,7 +311,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/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 10f9b513bd01..17e1a42cfbbe 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using utl::AccessibleRelationSetHelper; using ::com::sun::star::accessibility::XAccessibleContext; diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index e81a2f0d2661..7d6b13eb3dda 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -30,8 +30,8 @@ class SwAccessibleTextFrame : public SwAccessibleFrameBase { private: // #i73249# - ::rtl::OUString msTitle; - ::rtl::OUString msDesc; + OUString msTitle; + OUString msDesc; protected: @@ -46,11 +46,11 @@ public: //===== XAccessibleContext ============================================== // #i73249# - Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) 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); @@ -58,20 +58,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 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); diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 70d5b97ef3f8..b20e7894416e 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -135,7 +135,7 @@ namespace { ? nTxtFrmTextEndPos : nTxtNodeChangeTrackEnd; - pMarkupList->Insert( rtl::OUString(), 0, + pMarkupList->Insert( OUString(), 0, nTxtFrmChangeTrackStart, nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart, pMarkupList->Count() ); diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index a7118d32108f..c3aa81a79a4b 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -136,7 +136,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp pTextMarkupList->GetElement( static_cast<sal_uInt16>(nTextMarkupIndex) ); if ( pTextMarkup ) { - const ::rtl::OUString rText = mrPortionData.GetAccessibleString(); + const OUString rText = mrPortionData.GetAccessibleString(); const sal_Int32 nStartPos = mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos ); const sal_Int32 nEndPos = @@ -180,7 +180,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { - const ::rtl::OUString rText = mrPortionData.GetAccessibleString(); + const OUString rText = mrPortionData.GetAccessibleString(); const sal_uInt16 nTextMarkupCount = pTextMarkupList->Count(); for ( sal_uInt16 nTextMarkupIdx = 0; nTextMarkupIdx < nTextMarkupCount; ++nTextMarkupIdx ) diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index fe0de02476e2..bdf8b003e7a7 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -41,7 +41,7 @@ // ---------- SwAttrPool::SwAttrPool( SwDoc* pD ) - : SfxItemPool( rtl::OUString("SWG"), + : SfxItemPool( OUString("SWG"), POOLATTR_BEGIN, POOLATTR_END-1, aSlotTab, aAttrTab ), pDoc( pD ) diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 10a53fa2ae2a..4dc6242326f5 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -95,7 +95,7 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang ) m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() ); } -sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const +sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const { createBreakIterator(); sal_uInt16 nScript = i18n::ScriptType::WEAK; @@ -137,7 +137,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 return nScript; } -sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const +sal_uInt16 SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const { const sal_uInt16 coAllScripts = ( SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | @@ -170,7 +170,7 @@ sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const return nRet; } -sal_Int32 SwBreakIt::getGraphemeCount(const rtl::OUString& rText, +sal_Int32 SwBreakIt::getGraphemeCount(const OUString& rText, sal_Int32 nStart, sal_Int32 nEnd) const { sal_Int32 nGraphemeCount = 0; diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index b8fbcfc858f4..5d013e3b000d 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -548,7 +548,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) if( 0 != ( pFnd = Find( sDBNum, VarTable, TBLSZ ) ) ) nTmpRec = ((SwCalcExp*)pFnd)->nValue.GetULong(); - rtl::OUString sResult; + OUString sResult; double nNumber = DBL_MAX; long nLang = pLclData->getLanguageTag().getLanguageType(); diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 7fc890930c0f..bd0d54384b79 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -68,7 +68,7 @@ void SwCache::Check() SwCache::SwCache( const sal_uInt16 nInitSize #ifdef DBG_UTIL - , const rtl::OString &rNm + , const OString &rNm #endif ) : m_aCacheObjects(), diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index 8716f1836a80..8c094120200a 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -84,8 +84,8 @@ namespace // at CurCrsr.SPoint ::sw::mark::IMark* SwCrsrShell::SetBookmark( const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName, + const OUString& rName, + const OUString& rShortName, IDocumentMarkAccess::MarkType eMark) { StartAction(); diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx index 0e8a08d83818..1cc7aea1abfd 100644 --- a/sw/source/core/crsr/crossrefbookmark.cxx +++ b/sw/source/core/crsr/crossrefbookmark.cxx @@ -21,7 +21,6 @@ #include <crossrefbookmark.hxx> #include <ndtxt.hxx> -using ::rtl::OUString; namespace sw { namespace mark { CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM, @@ -67,10 +66,10 @@ namespace sw { namespace mark const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefHeadingBookmark_NamePrefix)) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefHeadingBookmark_NamePrefix)) { } - bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName) + bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName) { return rName.match(CrossRefHeadingBookmark_NamePrefix); } @@ -81,10 +80,10 @@ namespace sw { namespace mark const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefNumItemBookmark_NamePrefix)) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefNumItemBookmark_NamePrefix)) { } - bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName) + bool CrossRefNumItemBookmark::IsLegalName(const OUString& rName) { return rName.match(CrossRefNumItemBookmark_NamePrefix); } diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e0e2ab8e770d..d5999cd591b0 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -3153,12 +3153,12 @@ String SwCrsrShell::GetCrsrDescr() const // SMARTTAGS -static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes, +static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, const SwWrongList& rSmartTagList, xub_StrLen nCurrent ) { // Insert smart tag information - std::vector< rtl::OUString > aSmartTagTypes; + std::vector< OUString > aSmartTagTypes; std::vector< uno::Reference< container::XStringKeyMap > > aStringKeyMaps; for ( sal_uInt16 i = 0; i < rSmartTagList.Count(); ++i ) @@ -3182,7 +3182,7 @@ static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTyp rSmartTagTypes.realloc( aSmartTagTypes.size() ); rStringKeyMaps.realloc( aSmartTagTypes.size() ); - std::vector< rtl::OUString >::const_iterator aTypesIter = aSmartTagTypes.begin(); + std::vector< OUString >::const_iterator aTypesIter = aSmartTagTypes.begin(); sal_uInt16 i = 0; for ( aTypesIter = aSmartTagTypes.begin(); aTypesIter != aSmartTagTypes.end(); ++aTypesIter ) rSmartTagTypes[i++] = *aTypesIter; @@ -3211,7 +3211,7 @@ static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange, rRange = xRange; } -void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagTypes, +void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, uno::Reference< text::XTextRange>& rRange ) const { @@ -3249,7 +3249,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagType // see also SwEditShell::GetCorrection( const Point* pPt, SwRect& rSelectRect ) void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - uno::Sequence< rtl::OUString >& rSmartTagTypes, + uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, uno::Reference<text::XTextRange>& rRange ) { diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index b3ff53c18222..6e9d24d2446e 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1788,7 +1788,7 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ) case FILL_TAB: case FILL_SPACE: { - rtl::OUStringBuffer sInsert; + OUStringBuffer sInsert; if (aFPos.nTabCnt) comphelper::string::padToLength(sInsert, aFPos.nTabCnt, '\t'); if (aFPos.nSpaceCnt) diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 41d47d37fa6b..ac3643817a8f 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -47,7 +47,7 @@ using namespace std; -static rtl::OString aDbgOutResult; +static OString aDbgOutResult; bool bDbgOutStdErr = false; bool bDbgOutPrintAttrSet = false; @@ -92,7 +92,7 @@ SW_DLLPUBLIC const char * dbg_out(const void * pVoid) SW_DLLPUBLIC const char * dbg_out(const String & aStr) { - aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); + aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); if (bDbgOutStdErr) fprintf(stderr, "%s", aDbgOutResult.getStr()); @@ -100,9 +100,9 @@ SW_DLLPUBLIC const char * dbg_out(const String & aStr) return aDbgOutResult.getStr(); } -SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr) +SW_DLLPUBLIC const char * dbg_out(const OUString & aStr) { - aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); + aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); return aDbgOutResult.getStr(); } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 907ff63528c7..7ca4fa9eae72 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -133,7 +133,6 @@ #include <layouter.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; /* IInterface */ sal_Int32 SwDoc::acquire() diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 8b3e48ba4821..1437e6135e15 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -33,7 +33,6 @@ #include <swevent.hxx> using namespace ::com::sun::star::uno; -using ::rtl::OUString; static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs ) { @@ -117,7 +116,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs ) Sequence< sal_Int16 > aOutArgsIndex; Sequence< Any > aOutArgs; - OSL_TRACE( "SwDoc::ExecMacro URL is %s", rtl::OUStringToOString( rMacro.GetMacName(), + OSL_TRACE( "SwDoc::ExecMacro URL is %s", OUStringToOString( rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() ); eErr = mpDocShell->CallXScript( @@ -229,7 +228,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve Sequence< sal_Int16 > aOutArgsIndex; Sequence< Any > aOutArgs; - OSL_TRACE( "SwDoc::CallEvent URL is %s", rtl::OUStringToOString( + OSL_TRACE( "SwDoc::CallEvent URL is %s", OUStringToOString( rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() ); nRet += 0 == mpDocShell->CallXScript( diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 93c212d7b793..7d6f59cc97d5 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -187,7 +187,7 @@ namespace if(ppCurrentMark->get() == rpMarkToFind.get()) { //OSL_TRACE("found mark named '%s'", - // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); + // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); return ppCurrentMark; } ++ppCurrentMark; @@ -216,7 +216,7 @@ namespace if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType) { //OSL_TRACE("found mark named '%s'", - // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); + // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); return ppCurrentMark; } } @@ -226,14 +226,14 @@ namespace }; static IDocumentMarkAccess::const_iterator_t lcl_FindMarkByName( - const ::rtl::OUString& rName, + const OUString& rName, IDocumentMarkAccess::const_iterator_t ppMarksBegin, IDocumentMarkAccess::const_iterator_t ppMarksEnd) { return find_if( ppMarksBegin, ppMarksEnd, - boost::bind(&::rtl::OUString::equals, boost::bind(&IMark::GetName, _1), rName)); + boost::bind(&OUString::equals, boost::bind(&IMark::GetName, _1), rName)); } #if 0 @@ -245,7 +245,7 @@ namespace ppMark++) { IMark* pMark = ppMark->get(); - ::rtl::OString sName = ::rtl::OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8); + OString sName = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8); const SwPosition* const pStPos = &pMark->GetMarkStart(); const SwPosition* const pEndPos = &pMark->GetMarkEnd(); OSL_TRACE("%s %s %d,%d %d,%d", @@ -294,12 +294,12 @@ namespace sw { namespace mark : m_pDoc(&rDoc) { } ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM, - const ::rtl::OUString& rName, + const OUString& rName, const IDocumentMarkAccess::MarkType eType) { #if 0 { - ::rtl::OString sName = ::rtl::OUStringToOString(rName, RTL_TEXTENCODING_UTF8); + OString sName = OUStringToOString(rName, RTL_TEXTENCODING_UTF8); const SwPosition* const pPos1 = rPaM.GetPoint(); const SwPosition* pPos2 = pPos1; if(rPaM.HasMark()) @@ -337,16 +337,16 @@ namespace sw { namespace mark pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM)); break; case IDocumentMarkAccess::BOOKMARK: - pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::DDE_BOOKMARK: pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM)); break; case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK: - pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK: - pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::UNO_BOOKMARK: pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM)); @@ -399,8 +399,8 @@ namespace sw { namespace mark } ::sw::mark::IFieldmark* MarkManager::makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType ) + const OUString& rName, + const OUString& rType ) { sw::mark::IMark* pMark = makeMark( rPaM, rName, IDocumentMarkAccess::TEXT_FIELDMARK ); @@ -411,8 +411,8 @@ namespace sw { namespace mark } ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType) + const OUString& rName, + const OUString& rType) { sw::mark::IMark* pMark = makeMark( rPaM, rName, IDocumentMarkAccess::CHECKBOX_FIELDMARK ); @@ -431,7 +431,7 @@ namespace sw { namespace mark if(ppExistingMark != m_vBookmarks.end()) return ppExistingMark->get(); const SwPaM aPaM(aPos); - return makeMark(aPaM, ::rtl::OUString(), eType); + return makeMark(aPaM, OUString(), eType); } void MarkManager::repositionMark( ::sw::mark::IMark* const io_pMark, @@ -453,7 +453,7 @@ namespace sw { namespace mark sortMarks(); } - bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName) + bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) { OSL_PRECOND(io_pMark->GetMarkPos().GetDoc() == m_pDoc, "<MarkManager::renameMark(..)>" @@ -789,12 +789,12 @@ namespace sw { namespace mark m_vMarks.clear(); } - IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const ::rtl::OUString& rName) const + IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const OUString& rName) const { return lcl_FindMarkByName(rName, m_vMarks.begin(), m_vMarks.end()); } - IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const ::rtl::OUString& rName) const + IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const OUString& rName) const { return lcl_FindMarkByName(rName, m_vBookmarks.begin(), m_vBookmarks.end()); } @@ -834,14 +834,14 @@ namespace sw { namespace mark { return dynamic_cast<IFieldmark*>(lcl_getMarkBefore(m_vFieldmarks, rPos)); } - ::rtl::OUString MarkManager::getUniqueMarkName(const ::rtl::OUString& rName) const + OUString MarkManager::getUniqueMarkName(const OUString& rName) const { OSL_ENSURE(!rName.isEmpty(), "<MarkManager::getUniqueMarkName(..)>" " - a name should be proposed"); if(!hasMark(rName)) return rName; - ::rtl::OUStringBuffer sBuf; - ::rtl::OUString sTmp; + OUStringBuffer sBuf; + OUString sTmp; // try the name "<rName>XXX" (where XXX is a number starting from 1) unless there is // a unused name. Due to performance-reasons (especially in mailmerge-Szenarios) there @@ -868,7 +868,7 @@ namespace sw { namespace mark sort(m_vFieldmarks.begin(), m_vFieldmarks.end(), &lcl_MarkOrderingByStart); } - bool MarkManager::hasMark(const ::rtl::OUString& rName) const + bool MarkManager::hasMark(const OUString& rName) const { return (m_aMarkNamesSet.find(rName) != m_aMarkNamesSet.end()); } diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index 20677cf0d9f8..ae7437fc14f5 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -43,10 +43,10 @@ using namespace ::com::sun::star; namespace { - static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const rtl::OUString& rName, bool bCaseSensitive) + static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const OUString& rName, bool bCaseSensitive) { //Iterating over all bookmarks, checking DdeBookmarks - const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName); + const OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName); for(IDocumentMarkAccess::const_iterator_t ppMark = rMarkAccess.getMarksBegin(); ppMark != rMarkAccess.getMarksEnd(); ++ppMark) @@ -133,7 +133,7 @@ static bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem ) -bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType, +bool SwDoc::GetData( const OUString& rItem, const String& rMimeType, uno::Any & rValue ) const { // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive @@ -178,7 +178,7 @@ bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType, -bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType, +bool SwDoc::SetData( const OUString& rItem, const String& rMimeType, const uno::Any & rValue ) { // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive @@ -224,7 +224,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType, -::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const rtl::OUString& rItem) +::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const OUString& rItem) { SwServerObject* pObj = NULL; diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 6ff4c1a155bb..bcd931ebd77e 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -252,7 +252,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) pObj->NbcMove( Size( aAnchorPos.X(), aAnchorPos.Y() ) ); } - pFmt = MakeDrawFrmFmt( rtl::OUString("DrawObject"), + pFmt = MakeDrawFrmFmt( OUString("DrawObject"), GetDfltFrmFmt() ); pFmt->SetFmtAttr( aAnch ); // #i36010# - set layout direction of the position @@ -317,7 +317,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); if( !pMyObj->GetUpGroup() ) { - rtl::OUString sDrwFmtNm("DrawObject"); + OUString sDrwFmtNm("DrawObject"); for ( sal_uInt16 i = 0; i < nMarkCount; ++i ) { SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -913,7 +913,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) else { OSL_FAIL("unknown field command"); - pInfo->SetRepresentation( rtl::OUString( '?' ) ); + pInfo->SetRepresentation( OUString( '?' ) ); } } diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 67252d931e8b..7351b1dcb447 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -771,7 +771,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr ) // start behind the characters (to fix the attributes!) if (nStart < pNode->GetTxt().getLength()) ++rIdx; - pNode->InsertText( rtl::OUString(c), rIdx, INS_EMPTYEXPAND ); + pNode->InsertText( OUString(c), rIdx, INS_EMPTYEXPAND ); if( nStart+1 < rIdx.GetIndex() ) { rIdx = nStart; @@ -1930,7 +1930,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, uno::Reference< lang::XComponent > xDoc( ((SwDocShell*)GetDocShell())->GetBaseModel(), uno::UNO_QUERY ); // Expand the string: const ModelToViewHelper aConversionMap(*(SwTxtNode*)pNd); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // get XFlatParagraph to use... uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *((SwTxtNode*)pNd), aExpandText, aConversionMap ); @@ -2137,7 +2137,7 @@ static bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, bool bRegExpRpl if( bRegExpRplc ) { xub_StrLen nPos = 0; - rtl::OUString sPara("\\n"); + OUString sPara("\\n"); while( STRING_NOTFOUND != ( nPos = rStr.Search( sPara, nPos )) ) { // Has this been escaped? @@ -2283,7 +2283,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr, GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); //JP 06.01.98: MUSS noch optimiert werden!!! SetRedlineMode( @@ -2375,7 +2375,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr, GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); SwIndex& rIdx = aDelPam.GetPoint()->nContent; rIdx.Assign( 0, 0 ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 8474c968f359..a4539972320e 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2285,11 +2285,11 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) } } - rtl::OUString sTrue("TRUE"), sFalse("FALSE"); + OUString sTrue("TRUE"), sFalse("FALSE"); bool bIsDBMgr = 0 != rDoc.GetNewDBMgr(); sal_uInt16 nWhich, n; - const rtl::OUString* pFormel = 0; + const OUString* pFormel = 0; const SfxPoolItem* pItem; sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_FIELD ); for( n = 0; n < nMaxItems; ++n ) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index e69c47d61850..ddac41e81653 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -198,11 +198,11 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c switch( eDocType ) { case SPLITDOC_TO_HTML: - pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString("HTML")); + pFilter = SwIoSystem::GetFilterOfFormat(OUString("HTML")); break; default: - pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString(FILTER_XML)); + pFilter = SwIoSystem::GetFilterOfFormat(OUString(FILTER_XML)); eDocType = SPLITDOC_TO_GLOBALDOC; break; } diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index dbce466caee0..9593bf8039c8 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -86,7 +86,7 @@ static void lcl_copyDocumentProperties( = xSourceUDSet->getPropertySetInfo(); uno::Sequence<beans::Property> srcprops = xSetInfo->getProperties(); for (sal_Int32 i = 0; i < srcprops.getLength(); ++i) { - ::rtl::OUString name = srcprops[i].Name; + OUString name = srcprops[i].Name; xTargetUD->addProperty(name, srcprops[i].Attributes, xSourceUDSet->getPropertyValue(name)); } diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 3759b6eb6207..d14e1991a3ec 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -96,7 +96,6 @@ #include <vector> using namespace ::com::sun::star; -using ::rtl::OUString; #define DEF_FLY_WIDTH 2268 // Default width for FlyFrms (2268 == 4cm) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 2e4ae8187393..32cf8e3f8785 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -106,7 +106,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule ) } mpOutlineRule->SetRuleType( OUTLINE_RULE ); - mpOutlineRule->SetName( rtl::OUString::createFromAscii( + mpOutlineRule->SetName( OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ), *this); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 6d15761c3897..a706b180f349 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1734,7 +1734,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, size_t nSize = rBase.aTOXSources.size(); if (nSize > 0) { - String aInsStr = rtl::OUString(cNumRepl); + String aInsStr = OUString(cNumRepl); for (size_t i = 1; i < nSize; ++i) { aInsStr.AppendAscii( sPageDeli ); @@ -2005,10 +2005,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd, // collect starts end ends of main entry character style std::vector<sal_uInt16>* pCharStyleIdx = pMainEntryNums ? new std::vector<sal_uInt16> : 0; - rtl::OUString sSrchStr = rtl::OUStringBuffer().append(cNumRepl). + OUString sSrchStr = OUStringBuffer().append(cNumRepl). append(sPageDeli).append(cNumRepl).makeStringAndClear(); sal_Int32 nStartPos = pNd->GetTxt().indexOf(sSrchStr); - sSrchStr = rtl::OUStringBuffer().append(cNumRepl). + sSrchStr = OUStringBuffer().append(cNumRepl). append(cEndPageNum).makeStringAndClear(); sal_Int32 nEndPos = pNd->GetTxt().indexOf(sSrchStr); sal_uInt16 i; diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 6841e9730822..11d264b44eb4 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -41,7 +41,6 @@ using container::XNameContainer; using xforms::XModel2; using frame::XModule; using xforms::XFormsUIHelper1; -using ::rtl::OUString; Reference<XNameContainer> SwDoc::getXForms() const diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index c42d80201065..23252d6ebe07 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -98,7 +98,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, pFont = new Font(); pFont->SetWeight( WEIGHT_BOLD ); pFont->SetStyleName( aEmptyStr ); - pFont->SetName(rtl::OUString("Arial Unicode")); + pFont->SetName(OUString("Arial Unicode")); pFont->SetFamily( FAMILY_SWISS ); pFont->SetTransparent( sal_True ); } diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 7c36432c29ea..6d4a0ea1584a 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1928,7 +1928,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId ) pNewRule->Set( 1, aFmt ); aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); - aFmt.SetSuffix(rtl::OUString(static_cast<sal_Unicode>(')'))); + aFmt.SetSuffix(OUString(static_cast<sal_Unicode>(')'))); aFmt.SetIncludeUpperLevels( 1 ); aFmt.SetStart( 3 ); diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 49c0d3396a92..0ad79d78649c 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -26,10 +26,10 @@ #include <swtypes.hxx> #include <istyleaccess.hxx> -typedef ::boost::unordered_map< const ::rtl::OUString, +typedef ::boost::unordered_map< const OUString, StylePool::SfxItemSet_Pointer_t, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > SwStyleNameCache; + OUStringHash, + ::std::equal_to< OUString > > SwStyleNameCache; class SwStyleCache { @@ -39,7 +39,7 @@ public: void addStyleName( StylePool::SfxItemSet_Pointer_t pStyle ) { mMap[ StylePool::nameOf(pStyle) ] = pStyle; } void addCompletePool( StylePool& rPool ); - StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName ) { return mMap[rName]; } + StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName ) { return mMap[rName]; } }; void SwStyleCache::addCompletePool( StylePool& rPool ) @@ -48,7 +48,7 @@ void SwStyleCache::addCompletePool( StylePool& rPool ) StylePool::SfxItemSet_Pointer_t pStyle = pIter->getNext(); while( pStyle.get() ) { - rtl::OUString aName( StylePool::nameOf(pStyle) ); + OUString aName( StylePool::nameOf(pStyle) ); mMap[ aName ] = pStyle; pStyle = pIter->getNext(); } @@ -73,7 +73,7 @@ public: virtual ~SwStyleManager(); virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet, IStyleAccess::SwAutoStyleFamily eFamily ); - virtual StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName, + virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName, IStyleAccess::SwAutoStyleFamily eFamily ); virtual void getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t> &rStyles, IStyleAccess::SwAutoStyleFamily eFamily ); @@ -121,7 +121,7 @@ StylePool::SfxItemSet_Pointer_t SwStyleManager::cacheAutomaticStyle( const SfxIt return pStyle; } -StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const rtl::OUString& rName, +StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const OUString& rName, IStyleAccess::SwAutoStyleFamily eFamily ) { StylePool& rAutoPool = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? aAutoCharPool : aAutoParaPool; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 976273306639..516df7ae7867 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1119,7 +1119,7 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl() sal_Bool SwTableAutoFmtTbl::Load() { sal_Bool bRet = sal_False; - String sNm(rtl::OUString(sAutoTblFmtName)); + String sNm(OUString(sAutoTblFmtName)); SvtPathOptions aOpt; if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG )) { diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 065bb3fe6ccb..38a558849628 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -679,7 +679,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData, ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo()); // The LinkFileName could only consist of separators - String sCompareString = rtl::OUString(sfx2::cTokenSeperator); + String sCompareString = OUString(sfx2::cTokenSeperator); sCompareString += sfx2::cTokenSeperator; const bool bUpdate = (!pSection->IsLinkType() && rNewData.IsLinkType()) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 95237af5b484..5cad0d70ea8e 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1523,7 +1523,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ) // Inserting the separator SwIndex aCntIdx( pDelPara->pLastNd, pDelPara->pLastNd->GetTxt().getLength()); - pDelPara->pLastNd->InsertText( rtl::OUString(pDelPara->cCh), aCntIdx, + pDelPara->pLastNd->InsertText( OUString(pDelPara->cCh), aCntIdx, IDocumentContentOperations::INS_EMPTYEXPAND ); if( pDelPara->pUndo ) pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx, aDelRg.aEnd.GetIndex(), @@ -4196,7 +4196,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos ) if ( pUndo ) pUndo->AddNode( *pTxtNode , sal_False ); SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone(); - pNewItem->SetValue(rtl::OUString()); + pNewItem->SetValue(OUString()); rSet.Put( *pNewItem ); pTxtNode->SetAttr( rSet ); delete pNewItem; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index ca2efd4fc7c5..ffeb80517b1c 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -268,10 +268,10 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) writer.startElement( "text" ); writer.writeFormatAttribute( "ptr", "%p", this ); writer.writeFormatAttribute( "index", "%lu", GetIndex() ); - rtl::OUString txt = GetTxt(); + OUString txt = GetTxt(); for( int i = 0; i < 32; ++i ) txt = txt.replace( i, '*' ); - rtl::OString txt8 = ::rtl::OUStringToOString( txt, RTL_TEXTENCODING_UTF8 ); + OString txt8 = OUStringToOString( txt, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteString( writer, BAD_CAST( txt8.getStr())); writer.endElement(); } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 40db3665646c..56239af0f94f 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1140,7 +1140,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) SwBaseLink* pBLink; String sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE )); uno::Any aValue; - aValue <<= ::rtl::OUString( sName ); // Arbitrary name + aValue <<= OUString( sName ); // Arbitrary name const ::sfx2::SvBaseLinks& rLnks = pDoc->GetLinkManager().GetLinks(); for( sal_uInt16 n = rLnks.size(); n; ) @@ -1243,7 +1243,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh, const SfxFilter* pSfxFlt = 0; if( !pMed->GetError() ) { - String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName())); SfxFilterMatcher aMatcher( sFactory ); // No Filter, so search for it. Else test if the one passed is a valid one @@ -1344,7 +1344,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh, SwSection& rSection = pSectNd->GetSection(); rSection.SetConnectFlag(false); - ::rtl::OUString sNewFileName; + OUString sNewFileName; Reader* pRead = 0; switch( nDataFormat ) { diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 6dcee9022f1e..ae8ed8a5cde5 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -105,7 +105,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem ) nFmt == sfx2::LinkManager::RegisterStatusInfoId() ) { // Only a status change - serve Events? - ::rtl::OUString sState; + OUString sState; if( rValue.hasValue() && ( rValue >>= sState )) { sal_uInt16 nEvent = 0; diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 5b0d25255c5f..0ebf8e9b8c0d 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -133,7 +133,7 @@ SwDrawDocument::~SwDrawDocument() SdrPage* SwDrawDocument::AllocPage(bool bMasterPage) { SwDPage* pPage = new SwDPage(*this, 0 != bMasterPage); - pPage->SetName(rtl::OUString("Controls")); + pPage->SetName(OUString("Controls")); return pPage; } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 1508ab6aecf9..5cb58fd7df5b 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -298,7 +298,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId ) } #if OSL_DEBUG_LEVEL > 0 else - sTxt = rtl::OUString("Action-Text fehlt"); + sTxt = OUString("Action-Text fehlt"); #endif pDoc->SetAutoFmtRedlineComment( &sTxt, nSeqNo ); @@ -1258,7 +1258,7 @@ void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks ) DeleteSel( *pNxt ); if( !bHasBlnks ) { - pDoc->InsertString( *pNxt, rtl::OUString(' ') ); + pDoc->InsertString( *pNxt, OUString(' ') ); } } @@ -1317,7 +1317,7 @@ void SwAutoFormat::BuildIndent() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() )) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1358,7 +1358,7 @@ void SwAutoFormat::BuildTextIndent() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1394,7 +1394,7 @@ void SwAutoFormat::BuildText() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1503,8 +1503,8 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) aFmt.SetBulletChar( cBullChar ); aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(::rtl::OUString()); - aFmt.SetSuffix(::rtl::OUString()); + aFmt.SetPrefix(OUString()); + aFmt.SetSuffix(OUString()); aFmt.SetFirstLineOffset( lBullFirstLineOffset ); aFmt.SetAbsLSpace( nAbsPos ); if( !aFmt.GetCharFmt() ) @@ -1666,7 +1666,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) if( !aFlags.bSetNumRule ) { - String sChgStr = rtl::OUString('\t'); + String sChgStr = OUString('\t'); if( bChgBullet ) sChgStr.Insert( aFlags.cBullet, 0 ); pDoc->InsertString( aDelPam, sChgStr ); @@ -1710,7 +1710,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1780,7 +1780,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) DeleteSel( aDelPam ); if( bInsTab ) { - pDoc->InsertString( aDelPam, rtl::OUString('\t') ); + pDoc->InsertString( aDelPam, OUString('\t') ); } } } @@ -1800,7 +1800,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1818,7 +1818,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) { String sTxt(ViewShell::GetShellRes()->GetAutoFmtNameLst()[ STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] ); - sTxt.SearchAndReplace( rtl::OUString("$(ARG1)"), + sTxt.SearchAndReplace( OUString("$(ARG1)"), OUString::number( nLvl + 1 ) ); pDoc->SetAutoFmtRedlineComment( &sTxt ); } @@ -1931,7 +1931,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) aDelPam.DeleteMark(); if( bSetHardBlank ) { - pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) ); + pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) ); ++nPos; } } @@ -1986,7 +1986,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( bSetHardBlank ) { aDelPam.GetPoint()->nContent = nPos; - pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) ); + pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) ); aDelPam.GetPoint()->nContent = ++nPos; } } diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 7d1fc81d3e72..290666c61688 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -34,7 +34,6 @@ #include <switerator.hxx> using namespace com::sun::star; -using ::rtl::OUString; sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const { diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 210ce3f3ee53..f63912efa299 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -288,7 +288,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) #if defined(UNX) rBuf += '\012'; #else - rBuf += rtl::OUString("\015\012"); + rBuf += OUString("\015\012"); #endif } } @@ -301,7 +301,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); #endif WriterRef xWrt; - SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT), String(), xWrt ); + SwReaderWriter::GetWriter( OUString(FILTER_TEXT), String(), xWrt ); if( xWrt.Is() ) { // Selektierte Bereiche in ein ASCII Dokument schreiben @@ -336,7 +336,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer(); if( p ) - rBuf = rtl::OUString(p); + rBuf = OUString(p); else { rtl_uString *pStr = rtl_uString_alloc(lLen / sizeof( sal_Unicode )); @@ -344,7 +344,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) aStream.ResetError(); //endian specific?, yipes! aStream.Read(pStr->buffer, lLen); - rBuf = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rBuf = OUString(pStr, SAL_NO_ACQUIRE); } } } diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 2b33da081222..8185efb40488 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -72,7 +72,7 @@ void SwEditShell::Insert( sal_Unicode c, sal_Bool bOnlyCurrCrsr ) StartAllAction(); FOREACHPAM_START(this) - const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, rtl::OUString(c)); + const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, OUString(c)); OSL_ENSURE( bSuccess, "Doc->Insert() failed." ); (void) bSuccess; @@ -508,7 +508,7 @@ const SwFmtRefMark* SwEditShell::GetRefMark( const String& rName ) const } // returne die Namen aller im Doc gesetzten Referenzen -sal_uInt16 SwEditShell::GetRefMarks( std::vector<rtl::OUString>* pStrings ) const +sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const { return GetDoc()->GetRefMarks( pStrings ); } @@ -1062,7 +1062,7 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, sal_Bool bInsText String sRet; if( pDel ) { - rtl::OUString sTmp; + OUString sTmp; SwUnoCursorHelper::GetTextFromPam(*pDel, sTmp); sRet = sTmp; SET_CURR_SHELL( this ); diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 598547f6abfb..7bd4337ff35f 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -361,7 +361,7 @@ void SwEditShell::ApplyAutoMark() nSrchFlags |= (SearchFlags::REG_NOT_BEGINOFLINE | SearchFlags::REG_NOT_ENDOFLINE ); // - rtl::OUString sEmpty; + OUString sEmpty; SearchOptions aSearchOpt( SearchAlgorithms_ABSOLUTE, nSrchFlags, sEmpty, sEmpty, @@ -371,7 +371,7 @@ void SwEditShell::ApplyAutoMark() while( !rStrm.GetError() && !rStrm.IsEof() ) { - rtl::OString aRdLine; + OString aRdLine; rStrm.ReadLine( aRdLine ); // # -> comment @@ -380,7 +380,7 @@ void SwEditShell::ApplyAutoMark() // Leading and trailing blanks are ignored if( !aRdLine.isEmpty() && '#' != aRdLine[0] ) { - String sLine(rtl::OStringToOUString(aRdLine, eChrSet)); + String sLine(OStringToOUString(aRdLine, eChrSet)); sal_Int32 nTokenPos = 0; String sToSelect( sLine.GetToken(0, ';', nTokenPos ) ); diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 1f807160c790..5baad3c8a2e2 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -136,7 +136,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) } } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Undo(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } @@ -191,7 +191,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) } } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Redo(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } @@ -221,7 +221,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount) || bRet; } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Repeat(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 5490252b8282..c99ea28290e9 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -284,14 +284,14 @@ SwUndoId SwEditShell::EndUndo(SwUndoId eUndoId, { return GetDoc()->GetIDocumentUndoRedo().EndUndo(eUndoId, pRewriter); } -bool SwEditShell::GetLastUndoInfo(::rtl::OUString *const o_pStr, +bool SwEditShell::GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const { return GetDoc()->GetIDocumentUndoRedo().GetLastUndoInfo(o_pStr, o_pId); } -bool SwEditShell::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const +bool SwEditShell::GetFirstRedoInfo(OUString *const o_pStr) const { return GetDoc()->GetIDocumentUndoRedo().GetFirstRedoInfo(o_pStr); } -SwUndoId SwEditShell::GetRepeatInfo(::rtl::OUString *const o_pStr) const +SwUndoId SwEditShell::GetRepeatInfo(OUString *const o_pStr) const { return GetDoc()->GetIDocumentUndoRedo().GetRepeatInfo(o_pStr); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 8870c4e4710e..ab369586a8f7 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using rtl::OUString; SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) @@ -396,8 +395,8 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) const { Sequence<PropertyValues> aRet(m_SortKeyArr.size()); PropertyValues* pValues = aRet.getArray(); - OUString sProp1( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ), - sProp2( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING))); + OUString sProp1( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ), + sProp2( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING))); for(sal_uInt16 i = 0; i < m_SortKeyArr.size(); i++) { const SwTOXSortKey* pKey = &m_SortKeyArr[i]; @@ -580,7 +579,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const return pEntry->GetAuthorField( eField ); } -void SwAuthorityField::SetPar1(const rtl::OUString& rStr) +void SwAuthorityField::SetPar1(const OUString& rStr) { SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp(); pInitType->RemoveField(m_nHandle); @@ -638,7 +637,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const PropertyValue* pValues = aRet.getArray(); for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++) { - pValues[i].Name = rtl::OUString::createFromAscii(aFieldNames[i]); + pValues[i].Name = OUString::createFromAscii(aFieldNames[i]); const String& rField = pAuthEntry->GetAuthorField((ToxAuthorityField) i); if(i == AUTH_FIELD_AUTHORITY_TYPE) pValues[i].Value <<= sal_Int16(rField.ToInt32()); @@ -667,7 +666,7 @@ bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ ) if(!(rAny >>= aParam)) return false; - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; comphelper::string::padToLength(sBuf, AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER); String sToSet(sBuf.makeStringAndClear()); const PropertyValue* pParam = aParam.getConstArray(); diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 44ca2e3323dd..1eb50c940dbe 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -411,7 +411,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, if( pLastBox ) { if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) ) - rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox)); + rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox)); else rNewStr += '0'; rNewStr += ':'; @@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, } if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) ) - rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox)); + rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox)); else rNewStr += '0'; @@ -506,13 +506,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr, if( pLastBox ) { pBox = rTbl.GetTblBox( *pLastBox ); - rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox)); + rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox)); rNewStr += ':'; rFirstBox.Erase( 0, pLastBox->Len()+1 ); } pBox = rTbl.GetTblBox( rFirstBox ); - rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox)); + rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox)); // Kennung fuer Box erhalten rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 ); @@ -827,7 +827,7 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd, // in die Externe Darstellung umwandeln. SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.ToInt64())); if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() ) - return rtl::OUString('?'); + return OUString('?'); sTmp = pBox->GetName(); } @@ -1175,8 +1175,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr, } if( pLastBox ) - ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':'; - ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) ) + ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':'; + ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) ) += rFirstBox.GetChar( rFirstBox.Len() - 1 ); } diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index bea128ecd751..c3c63381b527 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen @@ -70,7 +69,7 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& { if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty()) { - sName = rtl::OUStringBuffer(aDBData.sDataSource).append(DB_DELIM). + sName = OUStringBuffer(aDBData.sDataSource).append(DB_DELIM). append(aDBData.sCommand).append(DB_DELIM).makeStringAndClear(); } sName += GetColumnName(); @@ -88,7 +87,7 @@ SwFieldType* SwDBFieldType::Copy() const } //------------------------------------------------------------------------------ -const rtl::OUString& SwDBFieldType::GetName() const +const OUString& SwDBFieldType::GetName() const { return sName; } @@ -205,7 +204,7 @@ void SwDBField::InitContent() { if (!IsInitialized()) { - aContent = rtl::OUStringBuffer().append('<') + aContent = OUStringBuffer().append('<') .append(((const SwDBFieldType*)GetTyp())->GetColumnName()) .append('>').makeStringAndClear(); } @@ -364,7 +363,7 @@ void SwDBField::Evaluate() Beschreibung: Namen erfragen --------------------------------------------------------------------*/ -const rtl::OUString& SwDBField::GetPar1() const +const OUString& SwDBField::GetPar1() const { return ((const SwDBFieldType*)GetTyp())->GetName(); } @@ -640,12 +639,12 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc) Beschreibung: Bedingung --------------------------------------------------------------------*/ -const rtl::OUString& SwDBNextSetField::GetPar1() const +const OUString& SwDBNextSetField::GetPar1() const { return aCond; } -void SwDBNextSetField::SetPar1(const rtl::OUString& rStr) +void SwDBNextSetField::SetPar1(const OUString& rStr) { aCond = rStr; } @@ -743,12 +742,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc) Beschreibung: LogDBName --------------------------------------------------------------------*/ -const rtl::OUString& SwDBNumSetField::GetPar1() const +const OUString& SwDBNumSetField::GetPar1() const { return aCond; } -void SwDBNumSetField::SetPar1(const rtl::OUString& rStr) +void SwDBNumSetField::SetPar1(const OUString& rStr) { aCond = rStr; } @@ -757,12 +756,12 @@ void SwDBNumSetField::SetPar1(const rtl::OUString& rStr) Beschreibung: Bedingung --------------------------------------------------------------------*/ -rtl::OUString SwDBNumSetField::GetPar2() const +OUString SwDBNumSetField::GetPar2() const { return aPar2; } -void SwDBNumSetField::SetPar2(const rtl::OUString& rStr) +void SwDBNumSetField::SetPar2(const OUString& rStr) { aPar2 = rStr; } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index e11c113c1fb7..5f79e3c7823a 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -32,7 +32,6 @@ #include <unofldmid.h> #include <hints.hxx> -using rtl::OUString; using namespace ::com::sun::star; #define DDE_TXT_ENCODING osl_getThreadTextEncoding() @@ -263,7 +262,7 @@ SwFieldType* SwDDEFieldType::Copy() const return pType; } -const rtl::OUString& SwDDEFieldType::GetName() const +const OUString& SwDDEFieldType::GetName() const { return aName; } @@ -333,7 +332,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR5: - rVal <<= ::rtl::OUString(aExpansion); + rVal <<= OUString(aExpansion); break; default: OSL_FAIL("illegal property"); @@ -358,7 +357,7 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) break; case FIELD_PROP_PAR5: { - ::rtl::OUString sTemp; + OUString sTemp; rVal >>= sTemp; aExpansion = sTemp; } @@ -411,7 +410,7 @@ SwField* SwDDEField::Copy() const Beschreibung: Parameter des Typen erfragen Name --------------------------------------------------------------------*/ -const rtl::OUString& SwDDEField::GetPar1() const +const OUString& SwDDEField::GetPar1() const { return ((const SwDDEFieldType*)GetTyp())->GetName(); } @@ -420,12 +419,12 @@ const rtl::OUString& SwDDEField::GetPar1() const Beschreibung: Parameter des Typen erfragen Commando --------------------------------------------------------------------*/ -rtl::OUString SwDDEField::GetPar2() const +OUString SwDDEField::GetPar2() const { return ((const SwDDEFieldType*)GetTyp())->GetCmd(); } -void SwDDEField::SetPar2(const rtl::OUString& rStr) +void SwDDEField::SetPar2(const OUString& rStr) { ((SwDDEFieldType*)GetTyp())->SetCmd(rStr); } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 98bb00f9f77d..5783b506aae9 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -96,7 +96,6 @@ #define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace nsSwDocInfoSubType; @@ -236,12 +235,12 @@ SwField* SwPageNumberField::Copy() const return pTmp; } -rtl::OUString SwPageNumberField::GetPar2() const +OUString SwPageNumberField::GetPar2() const { return OUString::number(nOffset); } -void SwPageNumberField::SetPar2(const rtl::OUString& rStr) +void SwPageNumberField::SetPar2(const OUString& rStr) { nOffset = (short)rStr.toInt32(); } @@ -394,7 +393,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_PAR1: - rAny <<= rtl::OUString(GetContent()); + rAny <<= OUString(GetContent()); break; default: @@ -951,7 +950,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, break; case DI_CUSTOM: { - ::rtl::OUString sVal; + OUString sVal; try { uno::Any aAny; @@ -1109,7 +1108,7 @@ String SwDocInfoField::Expand() const if ( !IsFixed() ) { // if the field is "fixed" we don't update it from the property - ::rtl::OUString sVal; + OUString sVal; uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(comphelper::getProcessComponentContext()) ); util::Date aDate; util::DateTime aDateTime; @@ -1130,14 +1129,14 @@ String SwDocInfoField::Expand() const } else if( aAny >>= aDuration ) { - String sText = aDuration.Negative ? rtl::OUString('-') : rtl::OUString('+'); + String sText = aDuration.Negative ? OUString('-') : OUString('+'); sText += ViewShell::GetShellRes()->sDurationFormat; - sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( aDuration.Years ) ); - sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( aDuration.Months ) ); - sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( aDuration.Days ) ); - sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( aDuration.Hours ) ); - sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( aDuration.Minutes) ); - sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( aDuration.Seconds) ); + sText.SearchAndReplace(OUString("%1"), OUString::number( aDuration.Years ) ); + sText.SearchAndReplace(OUString("%2"), OUString::number( aDuration.Months ) ); + sText.SearchAndReplace(OUString("%3"), OUString::number( aDuration.Days ) ); + sText.SearchAndReplace(OUString("%4"), OUString::number( aDuration.Hours ) ); + sText.SearchAndReplace(OUString("%5"), OUString::number( aDuration.Minutes) ); + sText.SearchAndReplace(OUString("%6"), OUString::number( aDuration.Seconds) ); sVal = sText; } else @@ -1243,7 +1242,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR3: - rAny <<= rtl::OUString(Expand()); + rAny <<= OUString(Expand()); break; case FIELD_PROP_BOOL2: { @@ -1488,13 +1487,13 @@ SwField* SwHiddenTxtField::Copy() const Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar1(const rtl::OUString& rStr) +void SwHiddenTxtField::SetPar1(const OUString& rStr) { aCond = rStr; bCanToggle = aCond.getLength() > 0; } -const rtl::OUString& SwHiddenTxtField::GetPar1() const +const OUString& SwHiddenTxtField::GetPar1() const { return aCond; } @@ -1503,7 +1502,7 @@ const rtl::OUString& SwHiddenTxtField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr) +void SwHiddenTxtField::SetPar2(const OUString& rStr) { if (nSubType == TYP_CONDTXTFLD) { @@ -1520,7 +1519,7 @@ void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr) aTRUETxt = rStr; } -rtl::OUString SwHiddenTxtField::GetPar2() const +OUString SwHiddenTxtField::GetPar2() const { String aRet(aTRUETxt); if(nSubType == TYP_CONDTXTFLD) @@ -1538,7 +1537,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { - const rtl::OUString* pOut = 0; + const OUString* pOut = 0; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -1573,7 +1572,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { case FIELD_PROP_PAR1: { - rtl::OUString sVal; + OUString sVal; rAny >>= sVal; SetPar1(sVal); } @@ -1710,12 +1709,12 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenParaField::SetPar1(const rtl::OUString& rStr) +void SwHiddenParaField::SetPar1(const OUString& rStr) { aCond = rStr; } -const rtl::OUString& SwHiddenParaField::GetPar1() const +const OUString& SwHiddenParaField::GetPar1() const { return aCond; } @@ -1800,12 +1799,12 @@ SwField* SwPostItField::Copy() const Beschreibung: Author setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar1(const rtl::OUString& rStr) +void SwPostItField::SetPar1(const OUString& rStr) { sAuthor = rStr; } -const rtl::OUString& SwPostItField::GetPar1() const +const OUString& SwPostItField::GetPar1() const { return sAuthor; } @@ -1814,27 +1813,27 @@ const rtl::OUString& SwPostItField::GetPar1() const Beschreibung: Text fuers PostIt setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar2(const rtl::OUString& rStr) +void SwPostItField::SetPar2(const OUString& rStr) { sTxt = rStr; } -rtl::OUString SwPostItField::GetPar2() const +OUString SwPostItField::GetPar2() const { return sTxt; } -const rtl::OUString& SwPostItField::GetInitials() const +const OUString& SwPostItField::GetInitials() const { return sInitials; } -void SwPostItField::SetName(const rtl::OUString& rName) +void SwPostItField::SetName(const OUString& rName) { sName = rName; } -const rtl::OUString& SwPostItField::GetName() const +const OUString& SwPostItField::GetName() const { return sName; } @@ -2146,12 +2145,12 @@ SwField* SwRefPageSetField::Copy() const return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn ); } -rtl::OUString SwRefPageSetField::GetPar2() const +OUString SwRefPageSetField::GetPar2() const { return OUString::number(GetOffset()); } -void SwRefPageSetField::SetPar2(const rtl::OUString& rStr) +void SwRefPageSetField::SetPar2(const OUString& rStr) { SetOffset( (short) rStr.toInt32() ); } @@ -2477,7 +2476,7 @@ SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm, String SwJumpEditField::Expand() const { - return rtl::OUStringBuffer().append('<'). + return OUStringBuffer().append('<'). append(sTxt).append('>').makeStringAndClear(); } @@ -2489,24 +2488,24 @@ SwField* SwJumpEditField::Copy() const // Platzhalter-Text -const rtl::OUString& SwJumpEditField::GetPar1() const +const OUString& SwJumpEditField::GetPar1() const { return sTxt; } -void SwJumpEditField::SetPar1(const rtl::OUString& rStr) +void SwJumpEditField::SetPar1(const OUString& rStr) { sTxt = rStr; } // HinweisText -rtl::OUString SwJumpEditField::GetPar2() const +OUString SwJumpEditField::GetPar2() const { return sHelp; } -void SwJumpEditField::SetPar2(const rtl::OUString& rStr) +void SwJumpEditField::SetPar2(const OUString& rStr) { sHelp = rStr; } @@ -2610,12 +2609,12 @@ SwField* SwCombinedCharField::Copy() const sCharacters ); } -const rtl::OUString& SwCombinedCharField::GetPar1() const +const OUString& SwCombinedCharField::GetPar1() const { return sCharacters; } -void SwCombinedCharField::SetPar1(const rtl::OUString& rStr) +void SwCombinedCharField::SetPar1(const OUString& rStr) { sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS)); } @@ -2626,7 +2625,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny, switch( nWhichId ) { case FIELD_PROP_PAR1: - rAny <<= rtl::OUString( sCharacters ); + rAny <<= OUString( sCharacters ); break; default: OSL_FAIL("illegal property"); @@ -2641,7 +2640,7 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny, { case FIELD_PROP_PAR1: { - rtl::OUString sTmp; + OUString sTmp; rAny >>= sTmp; SetPar1(sTmp); } diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 4407919bb519..fd7e96a12000 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; -using ::rtl::OUString; //----------------------------------------------------------------------------- static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) @@ -386,12 +385,12 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld ) } } -rtl::OUString SwGetExpField::GetPar2() const +OUString SwGetExpField::GetPar2() const { return GetFormula(); } -void SwGetExpField::SetPar2(const rtl::OUString& rStr) +void SwGetExpField::SetPar2(const OUString& rStr) { SetFormula(rStr); } @@ -443,7 +442,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR4: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; default: return SwField::QueryValue(rAny, nWhichId); @@ -495,7 +494,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt1 : SwValueFieldType( pDc, RES_SETEXPFLD ), sName( rName ), pOutlChgNd( 0 ), - sDelim( rtl::OUString(".") ), + sDelim( OUString(".") ), nType(nTyp), nLevel( UCHAR_MAX ), bDeleted( sal_False ) { @@ -513,7 +512,7 @@ SwFieldType* SwSetExpFieldType::Copy() const return pNew; } -const rtl::OUString& SwSetExpFieldType::GetName() const +const OUString& SwSetExpFieldType::GetName() const { return sName; } @@ -674,7 +673,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) if( ::GetString( rAny, sTmp ).Len() ) SetDelimiter( sTmp ); else - SetDelimiter(rtl::OUString(" ")); + SetDelimiter(OUString(" ")); } break; case FIELD_PROP_SHORT1: @@ -944,12 +943,12 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc Beschreibung: Parameter setzen --------------------------------------------------------------------*/ -const rtl::OUString& SwSetExpField::GetPar1() const +const OUString& SwSetExpField::GetPar1() const { return ((const SwSetExpFieldType*)GetTyp())->GetName(); } -rtl::OUString SwSetExpField::GetPar2() const +OUString SwSetExpField::GetPar2() const { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); @@ -958,7 +957,7 @@ rtl::OUString SwSetExpField::GetPar2() const return GetExpandedFormula(); } -void SwSetExpField::SetPar2(const rtl::OUString& rStr) +void SwSetExpField::SetPar2(const OUString& rStr) { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); @@ -1084,12 +1083,12 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwInputField::SetPar1(const rtl::OUString& rStr) +void SwInputField::SetPar1(const OUString& rStr) { aContent = rStr; } -const rtl::OUString& SwInputField::GetPar1() const +const OUString& SwInputField::GetPar1() const { return aContent; } @@ -1098,12 +1097,12 @@ const rtl::OUString& SwInputField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwInputField::SetPar2(const rtl::OUString& rStr) +void SwInputField::SetPar2(const OUString& rStr) { aPText = rStr; } -rtl::OUString SwInputField::GetPar2() const +OUString SwInputField::GetPar2() const { return aPText; } @@ -1200,7 +1199,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR4: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; default: return SwField::QueryValue(rAny, nWhichId); diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 93532197dbdf..da56d0dd1446 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -141,7 +141,7 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId ) { } -const rtl::OUString& SwFieldType::GetName() const +const OUString& SwFieldType::GetName() const { return aEmptyOUStr; } @@ -257,14 +257,14 @@ String SwField::GetFieldName() const Beschreibung: Parameter setzen auslesen --------------------------------------------------------------------*/ -const rtl::OUString& SwField::GetPar1() const +const OUString& SwField::GetPar1() const { return aEmptyOUStr; } -rtl::OUString SwField::GetPar2() const +OUString SwField::GetPar2() const { - return rtl::OUString(); + return OUString(); } String SwField::GetFormula() const @@ -272,10 +272,10 @@ String SwField::GetFormula() const return GetPar2(); } -void SwField::SetPar1(const rtl::OUString& ) +void SwField::SetPar1(const OUString& ) {} -void SwField::SetPar2(const rtl::OUString& ) +void SwField::SetPar2(const OUString& ) {} sal_uInt16 SwField::GetSubType() const diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 3d841e4be409..ddd92926b508 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -106,16 +106,16 @@ void SwDateTimeField::SetSubType(sal_uInt16 nType) nSubType = nType; } -void SwDateTimeField::SetPar2(const rtl::OUString& rStr) +void SwDateTimeField::SetPar2(const OUString& rStr) { nOffset = rStr.toInt32(); } -rtl::OUString SwDateTimeField::GetPar2() const +OUString SwDateTimeField::GetPar2() const { if (nOffset) return OUString::number(nOffset); - return rtl::OUString(); + return OUString(); } void SwDateTimeField::SetDateTime(const DateTime& rDT) diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 31cd495d0c2e..417f5e6aa236 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; -using rtl::OUString; using std::vector; static String aEmptyString; @@ -68,7 +67,7 @@ String SwDropDownField::Expand() const String sSelect = GetSelectedItem(); if(!sSelect.Len()) { - vector<rtl::OUString>::const_iterator aIt = aValues.begin(); + vector<OUString>::const_iterator aIt = aValues.begin(); if ( aIt != aValues.end()) sSelect = *aIt; } @@ -83,27 +82,27 @@ SwField * SwDropDownField::Copy() const return new SwDropDownField(*this); } -const rtl::OUString & SwDropDownField::GetPar1() const +const OUString & SwDropDownField::GetPar1() const { return GetSelectedItem(); } -rtl::OUString SwDropDownField::GetPar2() const +OUString SwDropDownField::GetPar2() const { return GetName(); } -void SwDropDownField::SetPar1(const rtl::OUString & rStr) +void SwDropDownField::SetPar1(const OUString & rStr) { SetSelectedItem(rStr); } -void SwDropDownField::SetPar2(const rtl::OUString & rName) +void SwDropDownField::SetPar2(const OUString & rName) { SetName(rName); } -void SwDropDownField::SetItems(const vector<rtl::OUString> & rItems) +void SwDropDownField::SetItems(const vector<OUString> & rItems) { aValues = rItems; aSelectedItem = aEmptyString; @@ -125,7 +124,7 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const uno::Sequence<OUString> aSeq( aValues.size() ); OUString* pSeq = aSeq.getArray(); int i = 0; - vector<rtl::OUString>::const_iterator aIt; + vector<OUString>::const_iterator aIt; for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt) { @@ -136,50 +135,50 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const return aSeq; } -const rtl::OUString & SwDropDownField::GetSelectedItem() const +const OUString & SwDropDownField::GetSelectedItem() const { return aSelectedItem; } -const rtl::OUString & SwDropDownField::GetName() const +const OUString & SwDropDownField::GetName() const { return aName; } -const rtl::OUString & SwDropDownField::GetHelp() const +const OUString & SwDropDownField::GetHelp() const { return aHelp; } -const rtl::OUString & SwDropDownField::GetToolTip() const +const OUString & SwDropDownField::GetToolTip() const { return aToolTip; } -sal_Bool SwDropDownField::SetSelectedItem(const rtl::OUString & rItem) +sal_Bool SwDropDownField::SetSelectedItem(const OUString & rItem) { - vector<rtl::OUString>::const_iterator aIt = + vector<OUString>::const_iterator aIt = std::find(aValues.begin(), aValues.end(), rItem); if (aIt != aValues.end()) aSelectedItem = *aIt; else - aSelectedItem = rtl::OUString(); + aSelectedItem = OUString(); return (aIt != aValues.end()); } -void SwDropDownField::SetName(const rtl::OUString & rName) +void SwDropDownField::SetName(const OUString & rName) { aName = rName; } -void SwDropDownField::SetHelp(const rtl::OUString & rHelp) +void SwDropDownField::SetHelp(const OUString & rHelp) { aHelp = rHelp; } -void SwDropDownField::SetToolTip(const rtl::OUString & rToolTip) +void SwDropDownField::SetToolTip(const OUString & rToolTip) { aToolTip = rToolTip; } @@ -219,7 +218,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, { case FIELD_PROP_PAR1: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetSelectedItem(aTmpStr); @@ -228,7 +227,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR2: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetName(aTmpStr); @@ -237,7 +236,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR3: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetHelp(aTmpStr); @@ -246,7 +245,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR4: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetToolTip(aTmpStr); diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index c4a7e580bec3..d62f72a56d4d 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: MacroFeldtypen @@ -137,13 +136,13 @@ SvxMacro SwMacroField::GetSvxMacro() const Beschreibung: LibName und MacroName --------------------------------------------------------------------*/ -void SwMacroField::SetPar1(const rtl::OUString& rStr) +void SwMacroField::SetPar1(const OUString& rStr) { aMacro = rStr; bIsScriptURL = isScriptURL(aMacro); } -const rtl::OUString& SwMacroField::GetPar1() const +const OUString& SwMacroField::GetPar1() const { return aMacro; } @@ -152,12 +151,12 @@ const rtl::OUString& SwMacroField::GetPar1() const Beschreibung: Macrotext --------------------------------------------------------------------*/ -void SwMacroField::SetPar2(const rtl::OUString& rStr) +void SwMacroField::SetPar2(const OUString& rStr) { aText = rStr; } -rtl::OUString SwMacroField::GetPar2() const +OUString SwMacroField::GetPar2() const { return aText; } @@ -186,7 +185,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { - rtl::OUString sTmp; + OUString sTmp; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -213,14 +212,14 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) // create an internally used macro name from the library and macro name parts void SwMacroField::CreateMacroString( - rtl::OUString& rMacro, + OUString& rMacro, const String& rMacroName, const String& rLibraryName ) { // concatenate library and name; use dot only if both strings have content rMacro = rLibraryName; if ( rLibraryName.Len() > 0 && rMacroName.Len() > 0 ) - rMacro += rtl::OUString('.'); + rMacro += OUString('.'); rMacro += rMacroName; } diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 43eae4b57bd3..68a00d7a47a4 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::lang; -using ::rtl::OUString; extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); @@ -294,7 +293,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) return ; } // where is the category name (e.g. "Illustration")? - rtl::OUString const Text = pTxtNd->GetTxt(); + OUString const Text = pTxtNd->GetTxt(); unsigned const nCatStart = Text.indexOf(sSetRefName); unsigned const nCatEnd = nCatStart == unsigned(-1) ? unsigned(-1) : nCatStart + sSetRefName.getLength(); @@ -585,19 +584,19 @@ SwField* SwGetRefField::Copy() const --------------------------------------------------------------------*/ -const rtl::OUString& SwGetRefField::GetPar1() const +const OUString& SwGetRefField::GetPar1() const { return sSetRefName; } -void SwGetRefField::SetPar1( const rtl::OUString& rName ) +void SwGetRefField::SetPar1( const OUString& rName ) { sSetRefName = rName; } -rtl::OUString SwGetRefField::GetPar2() const +OUString SwGetRefField::GetPar2() const { return Expand(); } @@ -658,11 +657,11 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; } } - rAny <<= rtl::OUString(sTmp); + rAny <<= OUString(sTmp); } break; case FIELD_PROP_PAR3: - rAny <<= rtl::OUString(Expand()); + rAny <<= OUString(Expand()); break; case FIELD_PROP_SHORT1: rAny <<= (sal_Int16)nSeqNo; diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index 4aa7bcc04841..8432bad839c0 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -23,7 +23,6 @@ #include <tools/resid.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: ScriptField --------------------------------------------------------------------*/ @@ -68,12 +67,12 @@ SwField* SwScriptField::Copy() const Beschreibung: Type setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar1( const rtl::OUString& rStr ) +void SwScriptField::SetPar1( const OUString& rStr ) { sType = rStr; } -const rtl::OUString& SwScriptField::GetPar1() const +const OUString& SwScriptField::GetPar1() const { return sType; } @@ -82,13 +81,13 @@ const rtl::OUString& SwScriptField::GetPar1() const Beschreibung: Code setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar2( const rtl::OUString& rStr ) +void SwScriptField::SetPar2( const OUString& rStr ) { sCode = rStr; } -rtl::OUString SwScriptField::GetPar2() const +OUString SwScriptField::GetPar2() const { return sCode; } diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index e2af9eccd654..8b425e03996b 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -30,7 +30,6 @@ #include <unofldmid.h> using namespace ::com::sun::star; -using ::rtl::OUString; SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr) @@ -64,7 +63,7 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel, : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ), nSubType(nType) { - sExpand = rtl::OUString('0'); + sExpand = OUString('0'); } @@ -160,13 +159,13 @@ void SwTblField::SetValue( const double& rVal ) --------------------------------------------------------------------*/ -rtl::OUString SwTblField::GetPar2() const +OUString SwTblField::GetPar2() const { return SwTableFormula::GetFormula(); } -void SwTblField::SetPar2(const rtl::OUString& rStr) +void SwTblField::SetPar2(const OUString& rStr) { SetFormula( rStr ); } @@ -181,7 +180,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const sal_uInt16 nOldSubType = nSubType; SwTblField* pThis = (SwTblField*)this; pThis->nSubType |= nsSwExtendedSubType::SUB_CMD; - rAny <<= rtl::OUString( Expand() ); + rAny <<= OUString( Expand() ); pThis->nSubType = nOldSubType; } break; @@ -192,7 +191,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR1: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; case FIELD_PROP_FORMAT: rAny <<= (sal_Int32)GetFormat(); diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index 0ae5e2eb4541..fdc145ae461e 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -39,7 +39,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index aa5c181ebb77..df7253b60bcb 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: Benutzerfelder @@ -86,7 +85,7 @@ void SwUserField::SetValue( const double& rVal ) Beschreibung: Name --------------------------------------------------------------------*/ -const rtl::OUString& SwUserField::GetPar1() const +const OUString& SwUserField::GetPar1() const { return ((const SwUserFieldType*)GetTyp())->GetName(); } @@ -95,12 +94,12 @@ const rtl::OUString& SwUserField::GetPar1() const Beschreibung: Content --------------------------------------------------------------------*/ -rtl::OUString SwUserField::GetPar2() const +OUString SwUserField::GetPar2() const { return ((SwUserFieldType*)GetTyp())->GetContent(GetFormat()); } -void SwUserField::SetPar2(const rtl::OUString& rStr) +void SwUserField::SetPar2(const OUString& rStr) { ((SwUserFieldType*)GetTyp())->SetContent(rStr, GetFormat()); } @@ -212,7 +211,7 @@ SwFieldType* SwUserFieldType::Copy() const return pTmp; } -const rtl::OUString& SwUserFieldType::GetName() const +const OUString& SwUserFieldType::GetName() const { return aName; } @@ -301,7 +300,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= (double) nValue; break; case FIELD_PROP_PAR2: - rAny <<= rtl::OUString(aContent); + rAny <<= OUString(aContent); break; case FIELD_PROP_BOOL1: { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 9ab687510da2..2819819160b5 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -69,7 +69,6 @@ #include <ndole.hxx> #include <editeng/opaqitem.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; // To register Flys in Flys in ... diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 0c0ce9494592..72a0a8920478 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -2353,7 +2353,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const if( !pTab ) return sal_False; - rFml = rtl::OUString::createFromAscii( sCalc_Sum ); + rFml = OUString::createFromAscii( sCalc_Sum ); SwCellFrms aCells; if( ::GetAutoSumSel( *this, aCells )) @@ -2383,7 +2383,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const // restore previous spaces! for( size_t i = aCells.size(); n+1 < i; ) { - String sTmp(rtl::OUString("|<")); + String sTmp(OUString("|<")); sTmp += aCells[ --i ]->GetTabBox()->GetName(); sTmp += '>'; rFml.Insert( sTmp, nInsPos ); @@ -2420,7 +2420,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const // restore previous spaces! for( size_t i = aCells.size(); n+1 < i; ) { - String sTmp(rtl::OUString("|<" )); + String sTmp(OUString("|<" )); sTmp += aCells[ --i ]->GetTabBox()->GetName(); sTmp += '>'; rFml.Insert( sTmp, nInsPos ); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 96365a4519a1..5b52817bc967 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -885,7 +885,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( String aExtStr = _aStrmName.Copy( nExtPos ); if ( GetGrfObj().GetType() != GRAPHIC_NONE ) { - _aStrmName = rtl::OStringToOUString(GetGrfObj().GetUniqueID(), + _aStrmName = OStringToOUString(GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); _aStrmName += aExtStr; } diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index cf19e6037049..e5f08b342c27 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -27,7 +27,7 @@ namespace sw { namespace mark { - typedef boost::unordered_map<rtl::OUString, sal_Int32, rtl::OUStringHash> MarkBasenameMapUniqueOffset_t; + typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> MarkBasenameMapUniqueOffset_t; class MarkManager : private ::boost::noncopyable @@ -36,19 +36,19 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark); virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType); + const OUString& rName, + const OUString& rType); virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType); + const OUString& rName, + const OUString& rType); virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark); virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM); - virtual bool renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName); + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName); virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset); virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset); @@ -64,14 +64,14 @@ namespace sw { virtual const_iterator_t getMarksBegin() const; virtual const_iterator_t getMarksEnd() const; virtual sal_Int32 getMarksCount() const; - virtual const_iterator_t findMark(const ::rtl::OUString& rName) const; - virtual bool hasMark(const ::rtl::OUString& rName) const; + virtual const_iterator_t findMark(const OUString& rName) const; + virtual bool hasMark(const OUString& rName) const; // bookmarks virtual const_iterator_t getBookmarksBegin() const; virtual const_iterator_t getBookmarksEnd() const; virtual sal_Int32 getBookmarksCount() const; - virtual const_iterator_t findBookmark(const ::rtl::OUString& rName) const; + virtual const_iterator_t findBookmark(const OUString& rName) const; // Fieldmarks virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const; @@ -81,13 +81,13 @@ namespace sw { void dumpAsXml(xmlTextWriterPtr w); private: // make names - ::rtl::OUString getUniqueMarkName(const ::rtl::OUString& rName) const; + OUString getUniqueMarkName(const OUString& rName) const; void sortMarks(); container_t m_vMarks; container_t m_vBookmarks; container_t m_vFieldmarks; - boost::unordered_set<rtl::OUString, rtl::OUStringHash> m_aMarkNamesSet; + boost::unordered_set<OUString, OUStringHash> m_aMarkNamesSet; mutable MarkBasenameMapUniqueOffset_t m_aMarkBasenameMapUniqueOffset; SwDoc * const m_pDoc; }; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 10597655f56e..ff3c637b649a 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -34,7 +34,7 @@ public: SwXMLBlockListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport ( void ) {} @@ -53,7 +53,7 @@ public: SwXMLTextBlockExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport ( void ) {} diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 27b470143fb1..bbe47d578c31 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -33,7 +33,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -59,7 +59,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 3fd001aff5cf..204de9a0cffc 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -33,12 +33,12 @@ private: public: SwXMLBlockListContext( SwXMLBlockListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockListContext ( void ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -49,7 +49,7 @@ class SwXMLBlockContext : public SvXMLImportContext public: SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockContext ( void ); @@ -63,11 +63,11 @@ private: public: SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockDocumentContext ( void ); @@ -81,11 +81,11 @@ private: public: SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockBodyContext ( void ); @@ -99,11 +99,11 @@ private: public: SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockTextContext ( void ); @@ -117,10 +117,10 @@ private: public: SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); ~SwXMLTextBlockParContext ( void ); }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index df6aefd52bd1..36486638d61b 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -39,7 +39,7 @@ protected: sal_Bool bBlock; SfxObjectShellRef xDocShellRef; sal_uInt16 nFlags; - rtl::OUString aPackageName; + OUString aPackageName; SfxMediumRef xMedium; void ReadInfo(); @@ -55,7 +55,7 @@ public: SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile ); void AddName( const String&, const String&, const String&, sal_Bool bOnlyTxt = sal_False ); virtual void AddName( const String&, const String&, sal_Bool bOnlyTxt = sal_False ); - rtl::OUString GeneratePackageName ( const String& rShort ); + OUString GeneratePackageName ( const String& rShort ); virtual ~SwXMLTextBlocks(); //virtual sal_Bool IsOld() const; virtual sal_uLong Delete( sal_uInt16 ); diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 3bf50a620518..6df0bc2cb547 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -44,33 +44,33 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 3e85c4d2be8e..54f335cd4d9d 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -45,7 +45,7 @@ public: virtual void UndoImpl( ::sw::UndoRedoContext & ); virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; class SwUndoDrawGroup : public SwUndo diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index d24359bbdee5..e16644ce5811 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -81,14 +81,14 @@ public: SwRewriter SW_DLLPRIVATE MakeUndoReplaceRewriter(sal_uLong const ocurrences, - ::rtl::OUString const& sOld, ::rtl::OUString const& sNew); + OUString const& sOld, OUString const& sNew); class SwUndoReplace : public SwUndo { public: SwUndoReplace(SwPaM const& rPam, - ::rtl::OUString const& rInsert, bool const bRegExp); + OUString const& rInsert, bool const bRegExp); virtual ~SwUndoReplace(); diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index 693deaafd48c..14696b380477 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -58,15 +58,15 @@ public: virtual SwUndoId EndUndo(SwUndoId const eUndoId, SwRewriter const*const pRewriter); virtual void DelAllUndoObj(); - virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + virtual bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const; virtual SwUndoComments_t GetUndoComments() const; - virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const; + virtual bool GetFirstRedoInfo(OUString *const o_pStr) const; virtual SwUndoComments_t GetRedoComments() const; virtual bool Repeat(::sw::RepeatContext & rContext, sal_uInt16 const nRepeatCnt); - virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const; virtual void AppendUndo(SwUndo *const pUndo); virtual void ClearRedo(); virtual bool IsUndoNodes(SwNodes const& rNodes) const; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 54dc9722d1ec..37f32ee19e17 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -49,7 +49,7 @@ namespace sw { public: virtual SwPosition& GetMarkPos() const { return *m_pPos1; } - virtual const ::rtl::OUString& GetName() const + virtual const OUString& GetName() const { return m_aName; } virtual SwPosition& GetOtherMarkPos() const { @@ -77,14 +77,14 @@ namespace sw { virtual bool IsExpanded() const { return static_cast< bool >(m_pPos2); } - virtual void SetName(const ::rtl::OUString& rName) + virtual void SetName(const OUString& rName) { m_aName = rName; } virtual void SetMarkPos(const SwPosition& rNewPos); virtual void SetOtherMarkPos(const SwPosition& rNewPos); virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual rtl::OUString ToString( ) const; + virtual OUString ToString( ) const; virtual void Swap() { @@ -109,11 +109,11 @@ namespace sw { // SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); - MarkBase(const SwPaM& rPaM, const ::rtl::OUString& rName); + MarkBase(const SwPaM& rPaM, const OUString& rName); ::boost::scoped_ptr<SwPosition> m_pPos1; ::boost::scoped_ptr<SwPosition> m_pPos2; - ::rtl::OUString m_aName; - static ::rtl::OUString GenerateNewName(const ::rtl::OUString& rPrefix); + OUString m_aName; + static OUString GenerateNewName(const OUString& rPrefix); ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextContent> m_wXBookmark; @@ -164,15 +164,15 @@ namespace sw { public: Bookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); + const OUString& rName, + const OUString& rShortName); virtual void InitDoc(SwDoc* const io_Doc); - virtual const ::rtl::OUString& GetShortName() const + virtual const OUString& GetShortName() const { return m_sShortName; } virtual const KeyCode& GetKeyCode() const { return m_aCode; } - virtual void SetShortName(const ::rtl::OUString& rShortName) + virtual void SetShortName(const OUString& rShortName) { m_sShortName = rShortName; } virtual void SetKeyCode(const KeyCode& rCode) { m_aCode = rCode; } @@ -187,7 +187,7 @@ namespace sw { private: KeyCode m_aCode; - ::rtl::OUString m_sShortName; + OUString m_sShortName; }; class Fieldmark @@ -197,9 +197,9 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual ::rtl::OUString GetFieldname() const + virtual OUString GetFieldname() const { return m_aFieldname; } - virtual ::rtl::OUString GetFieldHelptext() const + virtual OUString GetFieldHelptext() const { return m_aFieldHelptext; } virtual IFieldmark::parameter_map_t* GetParameters() @@ -208,19 +208,19 @@ namespace sw { virtual const IFieldmark::parameter_map_t* GetParameters() const { return &m_vParams; } - virtual void SetFieldname(const ::rtl::OUString& aFieldname) + virtual void SetFieldname(const OUString& aFieldname) { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext) + virtual void SetFieldHelptext(const OUString& aFieldHelptext) { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; virtual void Invalidate(); - virtual rtl::OUString ToString() const; + virtual OUString ToString() const; private: - ::rtl::OUString m_aFieldname; - ::rtl::OUString m_aFieldHelptext; + OUString m_aFieldname; + OUString m_aFieldHelptext; IFieldmark::parameter_map_t m_vParams; }; @@ -244,7 +244,7 @@ namespace sw { bool IsChecked() const; void SetChecked(bool checked); - virtual rtl::OUString toString( ) const; + virtual OUString toString( ) const; }; } } diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index de96ad8f7f0e..314cdf83fdb5 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -32,9 +32,9 @@ namespace sw { public: CrossRefBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName, - const ::rtl::OUString& rPrefix); + const OUString& rName, + const OUString& rShortName, + const OUString& rPrefix); virtual SwPosition& GetOtherMarkPos() const; virtual SwPosition& GetMarkStart() const @@ -65,10 +65,10 @@ namespace sw { public: CrossRefHeadingBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); - static ::rtl::OUString GenerateNewName(); - static bool IsLegalName(const ::rtl::OUString& rName); + const OUString& rName, + const OUString& rShortName); + static OUString GenerateNewName(); + static bool IsLegalName(const OUString& rName); }; class CrossRefNumItemBookmark @@ -77,10 +77,10 @@ namespace sw { public: CrossRefNumItemBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); - static ::rtl::OUString GenerateNewName(); - static bool IsLegalName(const ::rtl::OUString& rName); + const OUString& rName, + const OUString& rShortName); + static OUString GenerateNewName(); + static bool IsLegalName(const OUString& rName); }; } } diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 1a6dc5ce4b29..53890928a549 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -71,11 +71,11 @@ namespace sw { throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // 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 ) + virtual sal_Bool SAL_CALL supportsService( 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); }; diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 4a44f7df7088..b0df0acdc808 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -38,8 +38,8 @@ class SwPauseThreadStarting; namespace comp_FinalThreadManager { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context ); @@ -53,9 +53,9 @@ public: explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XJobManager: virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 1757c9ab7096..12d8fa3d5cdc 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -39,7 +39,7 @@ class SwFntCache : public SwCache public: inline SwFntCache() : SwCache(50 #ifdef DBG_UTIL - , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) + , OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif ) {} diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index ecf78a659e46..5117481f86ea 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -58,8 +58,8 @@ namespace sw { namespace mark { return m_eOrigBkmType; } private: - ::rtl::OUString m_aName; - ::rtl::OUString m_aShortName; + OUString m_aName; + OUString m_aShortName; KeyCode m_aCode; bool m_bSavePos; bool m_bSaveOtherPos; diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 3343747e680f..138c177840d2 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -257,11 +257,11 @@ class SwHistoryBookmark : public SwHistoryHint virtual void SetInDoc(SwDoc * pDoc, bool); bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); - const ::rtl::OUString& GetName() const; + const OUString& GetName() const; private: - const ::rtl::OUString m_aName; - ::rtl::OUString m_aShortName; + const OUString m_aName; + OUString m_aShortName; KeyCode m_aKeycode; const sal_uLong m_nNode; const sal_uLong m_nOtherNode; diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index bb05d1dae161..f9ebf7be32b5 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -23,8 +23,7 @@ #include <list> #include <deque> #include "swscanner.hxx" - -namespace rtl { class OUStringBuffer; } +#include <rtl/ustrbuf.hxx> class SwTxtNode; class Point; @@ -194,7 +193,7 @@ public: If set, the hidden ranges will be deleted from the text node. */ static sal_uInt16 MaskHiddenRanges( - const SwTxtNode& rNode, ::rtl::OUStringBuffer& rText, + const SwTxtNode& rNode, OUStringBuffer& rText, const xub_StrLen nStt, const xub_StrLen nEnd, const sal_Unicode cChar ); @@ -288,7 +287,7 @@ public: Start index of the text @return Returns if the language is an Arabic language */ - static bool IsArabicText( const rtl::OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen ); + static bool IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen ); /** Performes a thai justification on the kerning array @@ -308,7 +307,7 @@ public: The value which has to be added to the cells. @return The number of extra spaces in the given range */ - static sal_Int32 ThaiJustify( const rtl::OUString& rTxt, sal_Int32* pKernArray, + static sal_Int32 ThaiJustify( const OUString& rTxt, sal_Int32* pKernArray, sal_Int32* pScrArray, sal_Int32 nIdx, sal_Int32 nLen, sal_Int32 nNumberOfBlanks = 0, long nSpaceAdd = 0 ); diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 74f7f716c79a..e3a58653655b 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -38,7 +38,7 @@ class SwBlockName public: String aShort; // Short name String aLong; // Long name - rtl::OUString aPackageName; // Package name + OUString aPackageName; // Package name sal_Bool bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig? sal_Bool bIsOnlyTxt : 1; // unformatted text sal_Bool bInPutMuchBlocks : 1; // put serveral block entries @@ -96,7 +96,7 @@ public: sal_uInt16 GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln const String& GetShortName( sal_uInt16 ) const; // Kurzname fuer Index zurueck const String& GetLongName( sal_uInt16 ) const; // Langname fuer Index zurueck - rtl::OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck + OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern void SetName( const String& rName ) // logic name diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index a2b5bfae3622..6899521853f7 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -72,7 +72,7 @@ class SwCache void DeleteObj( SwCacheObj *pObj ); #ifdef DBG_UTIL - rtl::OString m_aName; + OString m_aName; long m_nAppend; /// number of entries appended long m_nInsertFree; /// number of entries inserted on freed position long m_nReplace; /// number of LRU replacements @@ -94,7 +94,7 @@ public: //nur sal_uInt8 hineinstecken!!! #ifdef DBG_UTIL - SwCache( const sal_uInt16 nInitSize, const rtl::OString &rNm ); + SwCache( const sal_uInt16 nInitSize, const OString &rNm ); #else SwCache( const sal_uInt16 nInitSize ); #endif diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 9a28e020292e..fc127574107f 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -205,7 +205,7 @@ class SwTxtFrm: public SwCntntFrm void _CalcHeightOfLastLine( const bool _bUseFont = false ); // ST2 - SwWrongList* _SmartTagScan ( ::rtl::OUString aTxtToScan, SwWrongList *pSmartTagList, + SwWrongList* _SmartTagScan ( OUString aTxtToScan, SwWrongList *pSmartTagList, xub_StrLen nBegin,xub_StrLen nEnd, xub_StrLen nInsertPos, xub_StrLen nActPos, xub_StrLen &nChgStart, xub_StrLen &nChgEnd, diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index ca43a7992bdb..74354448568d 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -106,12 +106,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -133,7 +133,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -141,33 +141,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -175,9 +175,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent @@ -203,14 +203,14 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); @@ -245,14 +245,14 @@ public: ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFieldType(void) + virtual OUString SAL_CALL getFieldType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setFieldType(const ::rtl::OUString& description ) + virtual void SAL_CALL setFieldType(const OUString& description ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -261,7 +261,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index a35756e1ea42..94926455e1aa 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -36,10 +36,10 @@ class SwFmtINetFmt; class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor { - const ::rtl::OUString sImplName; + const OUString sImplName; //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: virtual ~SwHyperlinkEventDescriptor(); @@ -66,7 +66,7 @@ public: // All these objects are an SwXFrame, so they can use a common implementation class SwFrameEventDescriptor : public SvEventDescriptor { - ::rtl::OUString sSwFrameEventDescriptor; + OUString sSwFrameEventDescriptor; SwXFrame& rFrame; @@ -77,7 +77,7 @@ public: ~SwFrameEventDescriptor(); - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: @@ -88,7 +88,7 @@ protected: class SwFrameStyleEventDescriptor : public SvEventDescriptor { - ::rtl::OUString sSwFrameStyleEventDescriptor; + OUString sSwFrameStyleEventDescriptor; SwXFrameStyle& rStyle; @@ -97,7 +97,7 @@ public: ~SwFrameStyleEventDescriptor(); - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 63ebb68a6dfb..f83fcd8bfac8 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -93,12 +93,12 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XComponent virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -106,12 +106,12 @@ public: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - static rtl::OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc); - static rtl::OUString LocalizeFormula(const SwSetExpField& rFld, const rtl::OUString& rFormula, sal_Bool bQuery); + static OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc); + static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, sal_Bool bQuery); SwFieldType* GetFldType(sal_Bool bDontCreate = sal_False) const; SwDoc* GetDoc() {return m_pDoc;} @@ -171,7 +171,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTextFieldMaster(void) throw( ::com::sun::star::uno::RuntimeException ); //XTextField - virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException ); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -184,17 +184,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XUpdatable virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); @@ -235,9 +235,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 6de6eae6a81f..ff499abe71aa 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -50,7 +50,7 @@ class SwXFlatParagraph: public SwXTextMarkup { public: - SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rConversionMap ); + SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rConversionMap ); virtual ~SwXFlatParagraph(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -62,16 +62,16 @@ public: // text::XTextMarkup: virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException); - virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException); + virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException); // text::XFlatParagraph: - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException); virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException); @@ -87,7 +87,7 @@ private: SwXFlatParagraph( const SwXFlatParagraph & ); // not defined SwXFlatParagraph & operator = ( const SwXFlatParagraph & ); // not defined - rtl::OUString maExpandText; + OUString maExpandText; }; /****************************************************************************** diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index c16c237c681b..da579dc0516c 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -103,12 +103,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -130,7 +130,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -138,33 +138,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -194,9 +194,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XFootnote - virtual ::rtl::OUString SAL_CALL getLabel() + virtual OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const ::rtl::OUString& rLabel) + virtual void SAL_CALL setLabel(const OUString& rLabel) throw (::com::sun::star::uno::RuntimeException); // XSimpleText diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index b924bf10c6a5..c975617695cd 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -89,12 +89,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -116,7 +116,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -124,33 +124,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -158,9 +158,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XRefreshable @@ -187,7 +187,7 @@ public: // XDocumentIndex - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); @@ -233,12 +233,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -260,7 +260,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -268,33 +268,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -312,9 +312,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDocumentIndexMark - virtual rtl::OUString SAL_CALL getMarkEntry() + virtual OUString SAL_CALL getMarkEntry() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMarkEntry(const rtl::OUString& rIndexEntry) + virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index ff39750518f9..01f1d12401ef 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -125,12 +125,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -188,9 +188,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); // XSimpleText @@ -207,7 +207,7 @@ public: virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, - const rtl::OUString& aString, sal_Bool bAbsorb) + const OUString& aString, sal_Bool bAbsorb) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< @@ -267,12 +267,12 @@ public: SwXMetaField(SwDoc *const pDoc); // 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 + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); @@ -294,7 +294,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -302,33 +302,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyValue(const ::rtl::OUString& rPropertyName) + getPropertyValue(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -346,7 +346,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XTextField - virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand) + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw (::com::sun::star::uno::RuntimeException); }; @@ -357,7 +357,7 @@ void getPrefixAndSuffix( ::com::sun::star::frame::XModel>& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>& xMetaField, - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix); + OUString *const o_pPrefix, OUString *const o_pSuffix); #endif // SW_UNOMETA_HXX diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index bd1d02ded56e..54d2313eacdd 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -91,12 +91,12 @@ public: const enum ParaFrameMode eParaFrameMode, SwFrmFmt *const pFmt = 0); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 0eacbb0ddef3..be32d74647b2 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -132,14 +132,14 @@ private: protected: void SAL_CALL SetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void GetPropertyValues( const ::rtl::OUString *pPropertyNames, + void GetPropertyValues( const OUString *pPropertyNames, ::com::sun::star::uno::Any *pValues, sal_Int32 nLength ); @@ -147,7 +147,7 @@ protected: const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl( - const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException); virtual ~SwXTextPortion(); @@ -170,35 +170,35 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); //XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -214,13 +214,13 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const rtl::OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException ); void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -297,11 +297,11 @@ public: ::com::sun::star::uno::RuntimeException ); //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) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); protected: @@ -339,7 +339,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 98bd60eb902b..6aa02a2311d9 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -72,12 +72,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -99,7 +99,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -107,33 +107,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -141,9 +141,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 26ea51c3d26c..a7a178e9ee8d 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -88,12 +88,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // 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& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -115,7 +115,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -123,33 +123,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -158,29 +158,29 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& rPropertyName) + getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& rPropertyNames) + OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues) @@ -190,11 +190,11 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) @@ -204,16 +204,16 @@ public: ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index de7aa158399c..8a5b3c7eb362 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -52,7 +52,7 @@ public: // ::com::sun::star::text::XTextMarkup: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::text::XMultiTextMarkup: virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -80,11 +80,11 @@ public: SwXStringKeyMap(); // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException); - virtual ::sal_Bool SAL_CALL hasValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertValue(const ::rtl::OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); + virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException); + virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); private: @@ -93,7 +93,7 @@ private: virtual ~SwXStringKeyMap() {} - std::map< rtl::OUString, ::com::sun::star::uno::Any > maMap; + std::map< OUString, ::com::sun::star::uno::Any > maMap; }; #endif diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 6b90bb26a085..a2add8569bcd 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -32,14 +32,14 @@ class SwWrongList; class SwWrongArea { public: - rtl::OUString maType; + OUString maType; com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxPropertyBag; xub_StrLen mnPos; xub_StrLen mnLen; SwWrongList* mpSubList; SwWrongArea() : mnPos(0), mnLen(0), mpSubList(NULL) {} - SwWrongArea( const rtl::OUString& rType, + SwWrongArea( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nPos, xub_StrLen nLen, @@ -122,7 +122,7 @@ public: inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } - inline void Insert( const rtl::OUString& rType, + inline void Insert( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nNewPos, xub_StrLen nNewLen, sal_uInt16 nWhere ) { @@ -134,7 +134,7 @@ public: maList.insert(i, SwWrongArea( rType, xPropertyBag, nNewPos, nNewLen, 0 ) ); } - void Insert( const rtl::OUString& rType, + void Insert( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nNewPos, xub_StrLen nNewLen ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8a4aef86e7cb..447f55d4b44a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -103,7 +103,6 @@ #endif using namespace ::com::sun::star; -using ::rtl::OUString; TYPEINIT1(SwFmtVertOrient, SfxPoolItem); TYPEINIT1(SwFmtHoriOrient, SfxPoolItem); diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 9f383dca58b3..5b61015cbfc2 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -184,7 +184,7 @@ class SwImplProtocol SvFileStream *pStream; // output stream std::set<sal_uInt16> *pFrmIds; // which FrmIds shall be logged ( NULL == all) std::vector<long> aVars; // variables - rtl::OStringBuffer aLayer; // indentation of output (" " per start/end) + OStringBuffer aLayer; // indentation of output (" " per start/end) sal_uInt16 nTypes; // which types shall be logged sal_uInt16 nLineCount; // printed lines sal_uInt16 nMaxLines; // max lines to be printed @@ -192,8 +192,8 @@ class SwImplProtocol sal_uInt8 nTestMode; // special for test formating, logging may only be done in test formating. void _Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ); bool NewStream(); - void CheckLine( rtl::OString& rLine ); - void SectFunc( rtl::OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam ); + void CheckLine( OString& rLine ); + void SectFunc( OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam ); public: SwImplProtocol(); ~SwImplProtocol(); @@ -292,7 +292,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void SwProtocol::Init() { nRecord = 0; - rtl::OUString aName("dbg_lay.go"); + OUString aName("dbg_lay.go"); SvFileStream aStream( aName, STREAM_READ ); if( aStream.IsOpen() ) { @@ -325,7 +325,7 @@ SwImplProtocol::SwImplProtocol() bool SwImplProtocol::NewStream() { - rtl::OUString aName("dbg_lay.out"); + OUString aName("dbg_lay.out"); nLineCount = 0; pStream = new SvFileStream( aName, STREAM_WRITE | STREAM_TRUNC ); if( pStream->GetError() ) @@ -352,7 +352,7 @@ SwImplProtocol::~SwImplProtocol() * SwImplProtocol::CheckLine analyzes a line in the INI file * --------------------------------------------------*/ -void SwImplProtocol::CheckLine( rtl::OString& rLine ) +void SwImplProtocol::CheckLine( OString& rLine ) { rLine = rLine.toAsciiLowerCase(); // upper/lower case is the same rLine = rLine.replace( '\t', ' ' ); @@ -360,7 +360,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) return; if( '[' == rLine[0] ) // section: FrmIds, type or funciton { - rtl::OString aTmp = comphelper::string::getToken(rLine, 0, ']'); + OString aTmp = comphelper::string::getToken(rLine, 0, ']'); if (aTmp == "[frmid") // section FrmIds { nInitFile = 1; @@ -401,7 +401,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) sal_Int32 nIndex = 0; do { - rtl::OString aTok = rLine.getToken( 0, ' ', nIndex ); + OString aTok = rLine.getToken( 0, ' ', nIndex ); bool bNo = false; if( '!' == aTok[0] ) { @@ -457,11 +457,11 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) * --------------------------------------------------*/ void SwImplProtocol::FileInit() { - rtl::OUString aName("dbg_lay.ini"); + OUString aName("dbg_lay.ini"); SvFileStream aStream( aName, STREAM_READ ); if( aStream.IsOpen() ) { - rtl::OString aLine; + OString aLine; nInitFile = 0; while( aStream.good() ) { @@ -472,10 +472,10 @@ void SwImplProtocol::FileInit() aLine = aLine.trim(); if( !aLine.isEmpty() ) CheckLine( aLine ); // evaluate line - aLine = rtl::OString(); + aLine = OString(); } else - aLine = rtl::OString(c); + aLine = OString(c); } if( !aLine.isEmpty() ) CheckLine( aLine ); // evaluate last line @@ -487,7 +487,7 @@ void SwImplProtocol::FileInit() * lcl_Start enables indentation by two spaces during ACT_START and disables * it again at ACT_END. * --------------------------------------------------*/ -static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAction) +static void lcl_Start(OStringBuffer& rOut, OStringBuffer& rLay, sal_uLong nAction) { if( nAction == ACT_START ) { @@ -510,7 +510,7 @@ static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uL * of the frame; "+" stands for valid, "-" stands for invalid. * --------------------------------------------------*/ -static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) +static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm) { rOut.append(" Sz"); rOut.append(pFrm->GetValidSizeFlag() ? '+' : '-'); @@ -524,7 +524,7 @@ static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) * lcl_FrameType outputs the type of the frame as clear text. * --------------------------------------------------*/ -static void lcl_FrameType( rtl::OStringBuffer& rOut, const SwFrm* pFrm ) +static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm ) { if( pFrm->IsTxtFrm() ) rOut.append("Txt "); @@ -602,7 +602,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong if( 1 == nTestMode && nFunction != PROT_TESTFORMAT ) return; // we may only log inside a test formating sal_Bool bTmp = sal_False; - rtl::OStringBuffer aOut(aLayer); + OStringBuffer aOut(aLayer); aOut.append(static_cast<sal_Int64>(lcl_GetFrameId(pFrm))); aOut.append(' '); lcl_FrameType( aOut, pFrm ); // then the frame type @@ -739,7 +739,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong * here we handle the output of the SectionFrms. * --------------------------------------------------*/ -void SwImplProtocol::SectFunc(rtl::OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam) +void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam) { bool bTmp = false; switch( nAct ) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 6c982fc006e2..865193ebe844 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -465,7 +465,7 @@ void InitCurrShells( SwRootFrm *pRoot ) SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt( - rtl::OUString("Root"), pFmt ), 0 ), + OUString("Root"), pFmt ), 0 ), maPagesArea(), mnViewWidth( -1 ), mnColumns( 0 ), diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a261fb4026e0..3e5f308c0a02 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3566,7 +3566,7 @@ void SwColumnFrm::PaintBreak( ) const aSeq.realloc( aSeq.getLength( ) + 1 ); // Add the text above - rtl::OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); + OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); basegfx::B2DVector aFontSize; OutputDevice* pOut = pGlobalShell->GetOut(); @@ -6892,7 +6892,7 @@ const Font& SwPageFrm::GetEmptyPageFont() pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt pEmptyPgFont->SetWeight( WEIGHT_BOLD ); pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName(rtl::OUString("Helvetica")); + pEmptyPgFont->SetName(OUString("Helvetica")); pEmptyPgFont->SetFamily( FAMILY_SWISS ); pEmptyPgFont->SetTransparent( sal_True ); pEmptyPgFont->SetColor( COL_GRAY ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 062c3c52683d..46f7dd7754d8 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -54,7 +54,6 @@ #include <vcl/graphicfilter.hxx> #include <comcore.hrc> -using ::rtl::OUString; using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 1db5303764c6..a93423e8c448 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -152,7 +152,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_DROPCAP_CHAR_STYLE_NAME : { - rtl::OUString sName; + OUString sName; if(GetCharFmt()) sName = SwStyleNameMapper::GetProgName( GetCharFmt()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); @@ -240,14 +240,14 @@ int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const bool SwNumRuleItem::QueryValue( uno::Any& rVal, sal_uInt8 ) const { - rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); + OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); rVal <<= sRet; return true; } bool SwNumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 ) { - rtl::OUString uName; + OUString uName; rVal >>= uName; SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE)); return true; diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index d35b5cf40323..15dd5d95ab29 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -25,13 +25,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; // #110680# SwXMLBlockListExport::SwXMLBlockListExport( const uno::Reference< uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, uno::Reference< xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rBlockList(rBlocks) @@ -82,7 +81,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) SwXMLTextBlockExport::SwXMLTextBlockExport( const uno::Reference< uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, uno::Reference< xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rBlockList(rBlocks) diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index f8258c533ad0..c007cd871e57 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; sal_Char const sXML_np__block_list[] = "_block-list"; sal_Char const sXML_np__office[] = "_ooffice"; diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx index 586a43d4b7d3..c1bf14ee2a2a 100644 --- a/sw/source/core/swg/SwXMLBlockListContext.cxx +++ b/sw/source/core/swg/SwXMLBlockListContext.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; SwXMLBlockListContext::SwXMLBlockListContext( SwXMLBlockListImport& rImport, @@ -223,7 +222,7 @@ SwXMLTextBlockParContext::SwXMLTextBlockParContext( { } -void SwXMLTextBlockParContext::Characters( const ::rtl::OUString& rChars ) +void SwXMLTextBlockParContext::Characters( const OUString& rChars ) { rLocalRef.m_rText.Append ( rChars.getStr()); } diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 0406e20b0170..d1e1028d65d9 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -24,7 +24,6 @@ #include <vector> using namespace ::com::sun::star; -using ::rtl::OUString; using namespace ::xmloff::token; sal_Char const sXML_np__office[] = "_ooffice"; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 0d3b03a23e1f..7012180acccb 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -561,8 +561,8 @@ OUString SwXMLTextBlocks::GeneratePackageName ( const String& rShort ) String aRet = rShort; xub_StrLen nPos = 0; sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 }; - rtl::OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7)); - aRet = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); + OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7)); + aRet = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); while( STRING_NOTFOUND != ( nPos = aRet.SearchChar( pDelims, nPos ))) { aRet.SetChar( nPos, '_' ); diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 1b6ef4ea75c3..b0822d251452 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -44,7 +44,6 @@ const char XMLN_BLOCKLIST[] = "BlockList.xml"; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -using ::rtl::OUString; using ::xmloff::token::XML_BLOCK_LIST; using ::xmloff::token::XML_UNFORMATTED_TEXT; diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index e122e511778f..574d04ecc560 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -175,11 +175,11 @@ const String& SwImpBlocks::GetLongName( sal_uInt16 n ) const return aEmptyStr; } -rtl::OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const +OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const { if( n < aNames.size() ) return aNames[n]->aPackageName; - return rtl::OUString(); + return OUString(); } void SwImpBlocks::AddName( const String& rShort, const String& rLong, diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 515037c3d956..393383787d1d 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -289,7 +289,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo, else if ( mpPorInfo ) BeginInlineStructureElements(); else - BeginTag( vcl::PDFWriter::NonStructElement, rtl::OUString() ); + BeginTag( vcl::PDFWriter::NonStructElement, OUString() ); #if OSL_DEBUG_LEVEL > 1 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement(); @@ -424,7 +424,7 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const String& rString ) { // write new tag - const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) ); + const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, OUString( rString ) ); ++nEndStructureElement; #if OSL_DEBUG_LEVEL > 1 @@ -982,12 +982,12 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements() const bool bNewItemTag = bNewListTag || pTxtNd->IsCountedInList(); // If the text node is not counted, we do not start a new list item: if ( bNewListTag ) - BeginTag( vcl::PDFWriter::List, rtl::OUString(aListString) ); + BeginTag( vcl::PDFWriter::List, OUString(aListString) ); if ( bNewItemTag ) { - BeginTag( vcl::PDFWriter::ListItem, rtl::OUString(aListItemString) ); - BeginTag( vcl::PDFWriter::LIBody, rtl::OUString(aListBodyString) ); + BeginTag( vcl::PDFWriter::ListItem, OUString(aListItemString) ); + BeginTag( vcl::PDFWriter::LIBody, OUString(aListBodyString) ); } } @@ -1023,7 +1023,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Document: Document // nPDFType = vcl::PDFWriter::Document; - aPDFType = rtl::OUString(aDocumentString); + aPDFType = OUString(aDocumentString); break; case FRM_HEADER : @@ -1039,7 +1039,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Footnote container: Division // nPDFType = vcl::PDFWriter::Division; - aPDFType = rtl::OUString(aDivString); + aPDFType = OUString(aDivString); break; case FRM_FTN : @@ -1049,7 +1049,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Note: vcl::PDFWriter::Note is actually a ILSE. Nevertheless // we treat it like a grouping element! nPDFType = vcl::PDFWriter::Note; - aPDFType = rtl::OUString(aNoteString); + aPDFType = OUString(aNoteString); break; case FRM_SECTION : @@ -1067,19 +1067,19 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( TOX_INDEX == pTOXBase->GetType() ) { nPDFType = vcl::PDFWriter::Index; - aPDFType = rtl::OUString(aIndexString); + aPDFType = OUString(aIndexString); } else { nPDFType = vcl::PDFWriter::TOC; - aPDFType = rtl::OUString(aTOCString); + aPDFType = OUString(aTOCString); } } } else if ( CONTENT_SECTION == pSection->GetType() ) { nPDFType = vcl::PDFWriter::Section; - aPDFType = rtl::OUString(aSectString); + aPDFType = OUString(aSectString); } } break; @@ -1116,7 +1116,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( sStyleName.EqualsAscii(aQuotations) ) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::BlockQuote); - aPDFType = rtl::OUString(aBlockQuoteString); + aPDFType = OUString(aBlockQuoteString); } // @@ -1125,7 +1125,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sStyleName.EqualsAscii(aCaption) ) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption); - aPDFType = rtl::OUString(aCaptionString); + aPDFType = OUString(aCaptionString); } // @@ -1134,7 +1134,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sParentStyleName.EqualsAscii(aCaption) ) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption); - aPDFType = sStyleName.Append(rtl::OUString(aCaptionString)); + aPDFType = sStyleName.Append(OUString(aCaptionString)); } // @@ -1143,7 +1143,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sStyleName.EqualsAscii(aHeading) ) { nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Heading); - aPDFType = rtl::OUString(aHString); + aPDFType = OUString(aHString); } // @@ -1159,22 +1159,22 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() switch(nRealLevel) { case 0 : - aPDFType = rtl::OUString(aH1String); + aPDFType = OUString(aH1String); break; case 1 : - aPDFType = rtl::OUString(aH2String); + aPDFType = OUString(aH2String); break; case 2 : - aPDFType = rtl::OUString(aH3String); + aPDFType = OUString(aH3String); break; case 3 : - aPDFType = rtl::OUString(aH4String); + aPDFType = OUString(aH4String); break; case 4 : - aPDFType = rtl::OUString(aH5String); + aPDFType = OUString(aH5String); break; default: - aPDFType = rtl::OUString(aH6String); + aPDFType = OUString(aH6String); break; } } @@ -1194,7 +1194,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( pTOXBase && TOX_INDEX != pTOXBase->GetType() ) { // Special case: Open additional TOCI tag: - BeginTag( vcl::PDFWriter::TOCI, rtl::OUString(aTOCIString) ); + BeginTag( vcl::PDFWriter::TOCI, OUString(aTOCIString) ); } } } @@ -1206,7 +1206,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // TabFrm: Table // nPDFType = vcl::PDFWriter::Table; - aPDFType = rtl::OUString(aTableString); + aPDFType = OUString(aTableString); { // set up table column data: @@ -1260,7 +1260,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( !static_cast<const SwRowFrm*>(pFrm)->IsRepeatedHeadline() ) { nPDFType = vcl::PDFWriter::TableRow; - aPDFType = rtl::OUString(aTRString); + aPDFType = OUString(aTRString); } else { @@ -1277,12 +1277,12 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( pTable->IsInHeadline( *pFrm ) || lcl_IsHeadlineCell( *static_cast<const SwCellFrm*>(pFrm) ) ) { nPDFType = vcl::PDFWriter::TableHeader; - aPDFType = rtl::OUString(aTHString); + aPDFType = OUString(aTHString); } else { nPDFType = vcl::PDFWriter::TableData; - aPDFType = rtl::OUString(aTDString); + aPDFType = OUString(aTDString); } } break; @@ -1314,18 +1314,18 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( bFormula ) { nPDFType = vcl::PDFWriter::Formula; - aPDFType = rtl::OUString(aFormulaString); + aPDFType = OUString(aFormulaString); } else { nPDFType = vcl::PDFWriter::Figure; - aPDFType = rtl::OUString(aFigureString); + aPDFType = OUString(aFigureString); } } else { nPDFType = vcl::PDFWriter::Division; - aPDFType = rtl::OUString(aDivString); + aPDFType = OUString(aDivString); } } break; @@ -1377,7 +1377,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() case POR_HYPHSTR : case POR_SOFTHYPHSTR : nPDFType = vcl::PDFWriter::Span; - aPDFType = rtl::OUString(aSpanString); + aPDFType = OUString(aSpanString); break; case POR_LAY : @@ -1404,18 +1404,18 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if( pInetFmtAttr ) { nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); } // Check for Quote/Code character style: else if ( sStyleName.EqualsAscii(aQuotation) ) { nPDFType = vcl::PDFWriter::Quote; - aPDFType = rtl::OUString(aQuoteString); + aPDFType = OUString(aQuoteString); } else if ( sStyleName.EqualsAscii(aSourceText) ) { nPDFType = vcl::PDFWriter::Code; - aPDFType = rtl::OUString(aCodeString); + aPDFType = OUString(aCodeString); } else { @@ -1436,7 +1436,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if ( sStyleName.Len() > 0 ) aPDFType = sStyleName; else - aPDFType = rtl::OUString(aSpanString); + aPDFType = OUString(aSpanString); } } } @@ -1444,7 +1444,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() case POR_FTN : nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); break; case POR_FLD : @@ -1461,12 +1461,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if ( RES_GETREFFLD == pFld->Which() ) { nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); } else if ( RES_AUTHORITY == pFld->Which() ) { nPDFType = vcl::PDFWriter::BibEntry; - aPDFType = rtl::OUString(aBibEntryString); + aPDFType = OUString(aBibEntryString); } } } @@ -1500,7 +1500,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() */ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh, OutputDevice& rOut, - const rtl::OUString& rPageRange, + const OUString& rPageRange, bool bSkipEmptyPages, bool bEditEngineOnly ) : mrSh( rSh ), @@ -2060,7 +2060,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() //get the name const ::sw::mark::IMark* pBkmk = ppMark->get(); mrSh.SwCrsrShell::ClearMark(); - rtl::OUString sBkName = pBkmk->GetName(); + OUString sBkName = pBkmk->GetName(); //jump to it JumpToSwMark( &mrSh, sBkName ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 8b51fc953f6d..13f723f1fbcb 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1095,7 +1095,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const OSL_TRACE("Found Fieldmark"); #if OSL_DEBUG_LEVEL > 1 OUString str = pFieldmark->ToString( ); - fprintf( stderr, "%s\n", rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) ); + fprintf( stderr, "%s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) ); #endif } if(bIsStartMark) OSL_TRACE("Found StartMark"); diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index c4dee6e1e77b..fdf965d36d6a 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -30,7 +30,6 @@ #include <guess.hxx> // #include <splargs.hxx> // SwInterHyphInfo -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index c6eda0a7f6d3..c12355bb5495 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -619,7 +619,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const { // 6864: always with kerning, also on printer! KSHORT nChar = Width() / nCharWidth; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChar, ' '); rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True); } @@ -638,7 +638,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const KSHORT nChar = Width() / nCharWidth; if ( cFill == '_' ) ++nChar; // to avoid gaps (Bug 13430) - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChar, cFill); rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True); } diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 2cf0fca2f1c3..5f0918d0bc33 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -178,7 +178,7 @@ class XmlPortionDumper:public SwPortionHandler BAD_CAST( "nType" ), "%s", getTypeName( nType ) ); OUString sText( rText ); - OString sText8 =::rtl::OUStringToOString( sText, + OString sText8 =OUStringToOString( sText, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "rText" ), "%s", sText8.getStr( ) ); @@ -335,7 +335,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) { aTxt = aTxt.replace( i, '*' ); } - OString aTxt8 =::rtl::OUStringToOString( aTxt, + OString aTxt8 =OUStringToOString( aTxt, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteString( writer, ( const xmlChar * ) aTxt8.getStr( ) ); @@ -388,7 +388,7 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) { SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this; OUString aFmtName = pHeadFootFrm->GetFmt()->GetName(); - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(rtl::OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt()); } } diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 21e0fb208446..677d84fe920d 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -121,10 +121,10 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER; aRet.push_back( aStartToken ); SwFormToken aSeparatorToken( TOKEN_TEXT ); - aSeparatorToken.sText = rtl::OUString(": "); + aSeparatorToken.sText = OUString(": "); aRet.push_back( aSeparatorToken ); SwFormToken aTextToken( TOKEN_TEXT ); - aTextToken.sText = rtl::OUString(", "); + aTextToken.sText = OUString(", "); for(sal_uInt16 i = 0; i < 5 ; i++) { diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index bdee756d557d..9c58de47f79e 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -72,10 +72,10 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const return sRet; } -::com::sun::star::uno::Sequence< ::rtl::OUString > +::com::sun::star::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const { - uno::Sequence< ::rtl::OUString > sRet; + uno::Sequence< OUString > sRet; try { sRet = xIES->getAlgorithmList( rLcl ); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 942d2399e750..106ef4741f91 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -48,7 +48,6 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos, using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; /*-------------------------------------------------------------------- Initialize strings --------------------------------------------------------------------*/ diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 3035a93c952b..d174d803b48c 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem); TYPEINIT1_AUTOFACTORY(SwFmtAutoFmt, SfxPoolItem); @@ -369,9 +368,9 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else { // all string properties: - if(rVal.getValueType() != ::getCppuType((rtl::OUString*)0)) + if(rVal.getValueType() != ::getCppuType((OUString*)0)) return false; - XubString sVal = *(rtl::OUString*)rVal.getValue(); + XubString sVal = *(OUString*)rVal.getValue(); switch(nMemberId) { case MID_URL_URL: @@ -767,7 +766,7 @@ MetaField::MetaField(SwFmtMeta * const i_pFmt, } void MetaField::GetPrefixAndSuffix( - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix) + OUString *const o_pPrefix, OUString *const o_pSuffix) { try { @@ -789,7 +788,7 @@ void MetaField::GetPrefixAndSuffix( } } -sal_uInt32 MetaField::GetNumberFormat(::rtl::OUString const & rContent) const +sal_uInt32 MetaField::GetNumberFormat(OUString const & rContent) const { //TODO: this probably lacks treatment for some special cases sal_uInt32 nNumberFormat( m_nNumberFormat ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index de510714e6bf..40369b05b7f7 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -646,8 +646,8 @@ static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar ) static bool lcl_IsMonoSpaceFont( const OutputDevice& rOut ) { - const rtl::OUString aStr1( sal_Unicode( 0x3008 ) ); - const rtl::OUString aStr2( sal_Unicode( 0x307C ) ); + const OUString aStr1( sal_Unicode( 0x3008 ) ); + const OUString aStr2( sal_Unicode( 0x307C ) ); const long nWidth1 = rOut.GetTextWidth( aStr1 ); const long nWidth2 = rOut.GetTextWidth( aStr2 ); return nWidth1 == nWidth2; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 6421edd675cd..248255a863ef 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1470,7 +1470,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, { // #i111677# cache expansion of source (for clipboard) pDest->m_pNumStringCache.reset( - new ::rtl::OUString(this->GetNumString())); + new OUString(this->GetNumString())); } if( !nLen ) @@ -3157,7 +3157,7 @@ struct containsPos ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) { - const rtl::OUString& rNodeText = rNode.GetTxt(); + const OUString& rNodeText = rNode.GetTxt(); m_aRetText = rNodeText; if (eMode == PASSTHROUGH) @@ -3223,7 +3223,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) const sal_Int32 nHiddenStart = i->m_nStart; const sal_Int32 nHiddenLen = i->m_nLen; - m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, rtl::OUString() ); + m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, OUString() ); m_aMap.push_back( ConversionMapEntry( nHiddenStart, nOffset + nHiddenStart ) ); nOffset -= nHiddenLen; } @@ -3233,7 +3233,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) { const SwTxtAttr* pAttr = *j; xub_StrLen nFieldPos = *pAttr->GetStart(); - rtl::OUString aExpand; + OUString aExpand; switch (pAttr->Which()) { case RES_TXTATR_FIELD: diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 95e199c267ed..54fe4ce5ba8c 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -797,7 +797,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART); + OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); rInf.SetLen( aNewText.getLength() ); @@ -809,7 +809,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND); + OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); rInf.SetLen( aNewText.getLength() ); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 96ff07de161f..0c767c22bc28 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1253,7 +1253,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) (const SfxPoolItem**)&pAnchor ); SwIndex aIdx( this, *pAttr->GetStart() ); - const rtl::OUString c(GetCharOfTxtAttr(*pAttr)); + const OUString c(GetCharOfTxtAttr(*pAttr)); OUString const ins( InsertText(c, aIdx, nInsertFlags) ); if (ins.isEmpty()) { @@ -1378,7 +1378,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) // entstehen koennen und das Attribut im _SortArr_ am // Dokument nicht eingetrage wird. SwIndex aNdIdx( this, *pAttr->GetStart() ); - const rtl::OUString c(GetCharOfTxtAttr(*pAttr)); + const OUString c(GetCharOfTxtAttr(*pAttr)); OUString const ins( InsertText(c, aNdIdx, nInsertFlags) ); if (ins.isEmpty()) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index bfc312f09ed0..38b52f597df2 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -76,7 +76,6 @@ #include <vector> #include <utility> -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::i18n; @@ -643,7 +642,7 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const aBndry.endPos - aBndry.startPos); } -SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, +SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt, const LanguageType* pLang, const ModelToViewHelper& rConvMap, sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClp ) : rNode( rNd ) @@ -666,8 +665,8 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, //additional ones can be added in under tools->options if (nWordType == i18n::WordType::WORD_COUNT) { - rtl::OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); - rtl::OUStringBuffer aBuf(aPreDashReplacementText); + OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); + OUStringBuffer aBuf(aPreDashReplacementText); for (sal_Int32 i = nStartPos; i < nEndPos; ++i) { sal_Unicode cChar = aBuf[i]; @@ -699,7 +698,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, namespace { //fdo#45271 for Asian words count characters instead of words - sal_Int32 forceEachAsianCodePointToWord(const rtl::OUString &rText, sal_Int32 nBegin, sal_Int32 nLen) + sal_Int32 forceEachAsianCodePointToWord(const OUString &rText, sal_Int32 nBegin, sal_Int32 nLen) { if (nLen > 1) { @@ -760,7 +759,7 @@ sal_Bool SwScanner::NextWord() if ( nWordType != i18n::WordType::WORD_COUNT ) { rCC.setLanguageTag( LanguageTag( pBreakIt->GetLocale( aCurrLang )) ); - if ( rCC.isLetterNumeric(rtl::OUString(aText[nBegin])) ) + if ( rCC.isLetterNumeric(OUString(aText[nBegin])) ) break; } else @@ -814,7 +813,7 @@ sal_Bool SwScanner::NextWord() // restrict boundaries to script boundaries and nEndPos const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, nBegin ); - rtl::OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin ); + OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin ); const sal_Int32 nScriptEnd = nBegin + pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript ); const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd ); @@ -837,7 +836,7 @@ sal_Bool SwScanner::NextWord() else { const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, aBound.startPos ); - rtl::OUString aTmpWord = aText.copy( aBound.startPos, + OUString aTmpWord = aText.copy( aBound.startPos, aBound.endPos - aBound.startPos ); const sal_Int32 nScriptEnd = aBound.startPos + pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript ); @@ -1056,7 +1055,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs ) ? m_Text.getLength() : ::std::min<xub_StrLen>(rArgs.pEndIdx->GetIndex(), m_Text.getLength()); - rArgs.aConvText = rtl::OUString(); + rArgs.aConvText = OUString(); // modify string according to redline information and hidden text const OUString aOldTxt( m_Text ); @@ -1302,7 +1301,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV } if( pNode->GetWrong()->Fresh( nChgStart, nChgEnd, nBegin, nLen, nInsertPos, nActPos ) ) - pNode->GetWrong()->Insert( rtl::OUString(), 0, nBegin, nLen, nInsertPos++ ); + pNode->GetWrong()->Insert( OUString(), 0, nBegin, nLen, nInsertPos++ ); else { nInvStart = nBegin; @@ -1375,7 +1374,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ { SwRect aRet; SwTxtNode *pNode = GetTxtNode(); - const rtl::OUString& rText = pNode->GetTxt(); + const OUString& rText = pNode->GetTxt(); // Iterate over language portions SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get(); @@ -1420,7 +1419,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ { // Expand the string: const ModelToViewHelper aConversionMap(*pNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // Ownership ov ConversionMap is passed to SwXTextMarkup object! com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup > xTextMarkup = @@ -1918,7 +1917,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, // count words in numbering string if started at beginning of para: bool bCountNumbering = nStt == 0; bool bHasBullet = false, bHasNumbering = false; - rtl::OUString sNumString; + OUString sNumString; if (bCountNumbering) { sNumString = GetNumString(); @@ -1949,7 +1948,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, // ConversionMap to expand fields, remove invisible and redline deleted text for scanner const ModelToViewHelper aConversionMap(*this, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // map start and end points onto the ConversionMap const sal_uInt32 nExpandBegin = aConversionMap.ConvertToViewPosition( nStt ); @@ -1979,7 +1978,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, nExpandBegin, nExpandEnd, true ); // used to filter out scanner returning almost empty strings (len=1; unichar=0x0001) - const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD ); + const OUString aBreakWord( CH_TXTATR_BREAKWORD ); while ( aScanner.NextWord() ) { @@ -1987,7 +1986,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, if( 1 != aExpandText.match(aBreakWord, aScanner.GetBegin() )) { ++nTmpWords; - const rtl::OUString &rWord = aScanner.GetWord(); + const OUString &rWord = aScanner.GetWord(); if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN) ++nTmpAsianWords; nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord); @@ -2015,7 +2014,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, while ( aScanner.NextWord() ) { ++nTmpWords; - const rtl::OUString &rWord = aScanner.GetWord(); + const OUString &rWord = aScanner.GetWord(); if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN) ++nTmpAsianWords; nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord); diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index cc506f62f87b..f38cd4c47528 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -279,7 +279,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter) bool UndoManager::GetLastUndoInfo( - ::rtl::OUString *const o_pStr, SwUndoId *const o_pId) const + OUString *const o_pStr, SwUndoId *const o_pId) const { // this is actually expected to work on the current level, // but that was really not obvious from the previous implementation... @@ -311,7 +311,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const sal_uInt16 const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel)); for (sal_uInt16 n = 0; n < nUndoCount; ++n) { - ::rtl::OUString const comment( + OUString const comment( SfxUndoManager::GetUndoActionComment(n, TopLevel)); ret.push_back(comment); } @@ -321,7 +321,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const /**************** REDO ******************/ -bool UndoManager::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const +bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr) const { if (!SfxUndoManager::GetRedoActionCount(CurrentLevel)) { @@ -346,7 +346,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const sal_uInt16 const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel)); for (sal_uInt16 n = 0; n < nRedoCount; ++n) { - ::rtl::OUString const comment( + OUString const comment( SfxUndoManager::GetRedoActionComment(n, TopLevel)); ret.push_back(comment); } @@ -356,7 +356,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const /**************** REPEAT ******************/ -SwUndoId UndoManager::GetRepeatInfo(::rtl::OUString *const o_pStr) const +SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const { SwUndoId nRepeatId(UNDO_EMPTY); GetLastUndoInfo(o_pStr, & nRepeatId); @@ -535,8 +535,8 @@ UndoManager::Repeat(::sw::RepeatContext & rContext, return false; } - ::rtl::OUString const comment(pRepeatAction->GetComment()); - ::rtl::OUString const rcomment(pRepeatAction->GetRepeatComment(rContext)); + OUString const comment(pRepeatAction->GetComment()); + OUString const rcomment(pRepeatAction->GetRepeatComment(rContext)); sal_uInt16 const nId(pRepeatAction->GetId()); if (DoesUndo()) { diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index b90c9a127d2c..ced76e507c80 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -663,7 +663,7 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk) && m_aName == rBkmk.GetName(); } -const ::rtl::OUString& SwHistoryBookmark::GetName() const +const OUString& SwHistoryBookmark::GetName() const { return m_aName; } diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 8cf6e1886cf6..2fbe933c3cb0 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -460,7 +460,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam ) sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ]; CharClass& rCC = GetAppCharClass(); if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) || - rCC.isLetterNumeric( rtl::OUString( cDelChar ), 0 ) != + rCC.isLetterNumeric( OUString( cDelChar ), 0 ) != rCC.isLetterNumeric( *pSttStr, nUChrPos ) ) return sal_False; @@ -579,7 +579,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart, case CH_TXTATR_INWORD: case CH_TXTATR_BREAKWORD: - aResult = rtl::OUString(UNDO_ARG2); + aResult = OUString(UNDO_ARG2); break; @@ -638,7 +638,7 @@ String DenoteSpecialCharacters(const String & rStr) aResult += lcl_DenotedPortion(rStr, nStart, rStr.Len()); } else - aResult = rtl::OUString(UNDO_ARG2); + aResult = OUString(UNDO_ARG2); return aResult; } @@ -686,7 +686,7 @@ SwRewriter SwUndoDelete::GetRewriter() const } else { - aStr = rtl::OUString(UNDO_ARG2); + aStr = OUString(UNDO_ARG2); } } @@ -1084,7 +1084,7 @@ void SwUndoDelete::SetTableName(const String & rName) String SwRewriter::Apply(const String & rStr) const { - rtl::OUString aResult = rStr; + OUString aResult = rStr; std::vector<SwRewriteRule>::const_iterator aIt; for (aIt = mRules.begin(); aIt != mRules.end(); ++aIt) diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index d6fb9fd6091e..30a86778525f 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -267,7 +267,7 @@ bool SwUndo::CanRepeatImpl( ::sw::RepeatContext & ) const return ((REPEAT_START <= GetId()) && (GetId() < REPEAT_END)); } -rtl::OUString SwUndo::GetComment() const +OUString SwUndo::GetComment() const { String aResult; diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index b2791fae0930..c99c19e97aab 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -332,7 +332,7 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext) } // #111827# -rtl::OUString SwUndoInsLayFmt::GetComment() const +OUString SwUndoInsLayFmt::GetComment() const { String aResult; diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index f725c29fe212..e9ba3a388cbc 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -107,7 +107,7 @@ void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext) rContext.SetSelections(0, pMarkList); } -rtl::OUString SwSdrUndo::GetComment() const +OUString SwSdrUndo::GetComment() const { return pSdrUndo->GetComment(); } diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 18951111bc3e..4ac9ecb76ba1 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -128,7 +128,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd ) sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns ) { if( !bIsAppend && bIsWordDelim == - !GetAppCharClass().isLetterNumeric( rtl::OUString( cIns )) ) + !GetAppCharClass().isLetterNumeric( OUString( cIns )) ) { nLen++; nCntnt++; @@ -433,7 +433,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) // TODO/MBA: seems that here a physical copy is done - not as in drawing layer! Testing! // TODO/LATER: Copying through the container would copy the replacement image as well comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aName = aCnt.CreateUniqueObjectName(); + OUString aName = aCnt.CreateUniqueObjectName(); if ( aCnt.StoreEmbeddedObject( rSwOLE.GetOleRef(), aName, sal_True ) ) { uno::Reference < embed::XEmbeddedObject > aNew = aCnt.GetEmbeddedObject( aName ); @@ -486,8 +486,8 @@ SwRewriter SwUndoInsert::GetRewriter() const class SwUndoReplace::Impl : private SwUndoSaveCntnt { - ::rtl::OUString m_sOld; - ::rtl::OUString m_sIns; + OUString m_sOld; + OUString m_sIns; sal_uLong m_nSttNd, m_nEndNd, m_nOffset; xub_StrLen m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd; bool m_bSplitNext : 1; @@ -497,7 +497,7 @@ class SwUndoReplace::Impl ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; public: - Impl(SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp); + Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp); virtual ~Impl() { } @@ -507,13 +507,13 @@ public: void SetEnd(SwPaM const& rPam); - ::rtl::OUString const& GetOld() const { return m_sOld; } - ::rtl::OUString const& GetIns() const { return m_sIns; } + OUString const& GetOld() const { return m_sOld; } + OUString const& GetIns() const { return m_sIns; } }; SwUndoReplace::SwUndoReplace(SwPaM const& rPam, - ::rtl::OUString const& rIns, bool const bRegExp) + OUString const& rIns, bool const bRegExp) : SwUndo( UNDO_REPLACE ) , m_pImpl(new Impl(rPam, rIns, bRegExp)) { @@ -535,7 +535,7 @@ void SwUndoReplace::RedoImpl(::sw::UndoRedoContext & rContext) SwRewriter MakeUndoReplaceRewriter(sal_uLong const occurrences, - ::rtl::OUString const& sOld, ::rtl::OUString const& sNew) + OUString const& sOld, OUString const& sNew) { SwRewriter aResult; @@ -593,7 +593,7 @@ void SwUndoReplace::SetEnd(SwPaM const& rPam) } SwUndoReplace::Impl::Impl( - SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp) + SwPaM const& rPam, OUString const& rIns, bool const bRegExp) : m_sIns( rIns ) , m_nOffset( 0 ) , m_bRegExp(bRegExp) diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index c317354a5148..b223846b6eaf 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -76,7 +76,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos, bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand(); pTxtNd->SetIgnoreDontExpand( true ); - pTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent, + pTxtNd->InsertText( OUString(cIns), rPos.nContent, IDocumentContentOperations::INS_EMPTYEXPAND ); aInsStr.Insert( cIns ); @@ -116,7 +116,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos, // ask the char that should be inserted if (( CH_TXTATR_BREAKWORD == cIns || CH_TXTATR_INWORD == cIns ) || - rCC.isLetterNumeric( rtl::OUString( cIns ), 0 ) != + rCC.isLetterNumeric( OUString( cIns ), 0 ) != rCC.isLetterNumeric( aInsStr, aInsStr.Len()-1 ) ) return sal_False; @@ -200,7 +200,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext) if( aDelStr.Len() ) { - String aTmpStr = rtl::OUString('1'); + String aTmpStr = OUString('1'); sal_Unicode* pTmpStr = aTmpStr.GetBufferAccess(); bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand(); @@ -248,10 +248,10 @@ void SwUndoOverwrite::RepeatImpl(::sw::RepeatContext & rContext) { ::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo()); - rDoc.Overwrite(*pAktPam, rtl::OUString(aInsStr.GetChar(0))); + rDoc.Overwrite(*pAktPam, OUString(aInsStr.GetChar(0))); } for( xub_StrLen n = 1; n < aInsStr.Len(); ++n ) - rDoc.Overwrite( *pAktPam, rtl::OUString(aInsStr.GetChar(n)) ); + rDoc.Overwrite( *pAktPam, OUString(aInsStr.GetChar(n)) ); } void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext) @@ -282,7 +282,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext) { // do it individually, to keep the attributes! OUString const ins( - pTxtNd->InsertText( rtl::OUString(aInsStr.GetChar(n)), rIdx, + pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx, IDocumentContentOperations::INS_EMPTYEXPAND) ); assert(ins.getLength() == 1); // cannot fail if( n < aDelStr.Len() ) diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 7cec5d8ef2c5..25293cc4b227 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using rtl::OUString; SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc ) : @@ -241,22 +240,22 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName } -rtl::OUString SAL_CALL SwXTextDefaults::getImplementationName( ) +OUString SAL_CALL SwXTextDefaults::getImplementationName( ) throw (RuntimeException) { return OUString("SwXTextDefaults"); } -sal_Bool SAL_CALL SwXTextDefaults::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - uno::Sequence< ::rtl::OUString > aSeq(getSupportedServiceNames()); + uno::Sequence< OUString > aSeq(getSupportedServiceNames()); return std::find(comphelper::stl_begin(aSeq), comphelper::stl_end(aSeq), rServiceName) != comphelper::stl_end(aSeq); } -uno::Sequence< ::rtl::OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( ) throw (RuntimeException) { uno::Sequence< OUString > aRet(7); diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 25026ed1ad19..471a0c3cc583 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -25,8 +25,6 @@ #include <algorithm> #include <functional> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -39,7 +37,7 @@ namespace class lcl_Escape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aQuote( '\'' ); @@ -52,7 +50,7 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- @@ -64,7 +62,7 @@ private: class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aBackslash( '\\' ); @@ -74,12 +72,12 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- -void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output ) +void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, r } void lcl_getSingleCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::Cell & rOutCell ) { @@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString( static const sal_Unicode aDollar( '$' ); static const sal_Unicode aLetterA( 'A' ); - ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); + OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); const sal_Unicode* pStrArray = aCellStr.getStr(); sal_Int32 nLength = aCellStr.getLength(); sal_Int32 i = nLength - 1, nColumn = 0; @@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString( } bool lcl_getCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::Cell & rOutCell, - ::rtl::OUString& rOutTableName ) + OUString& rOutTableName ) { static const sal_Unicode aDot( '.' ); static const sal_Unicode aQuote( '\'' ); @@ -193,7 +191,7 @@ bool lcl_getCellAddressFromXMLString( { // there is a table name before the address - ::rtl::OUStringBuffer aTableNameBuffer; + OUStringBuffer aTableNameBuffer; const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name @@ -206,7 +204,7 @@ bool lcl_getCellAddressFromXMLString( if( pBuf[ 0 ] == aQuote && pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote ) { - ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear(); + OUString aName = aTableNameBuffer.makeStringAndClear(); rOutTableName = aName.copy( 1, aName.getLength() - 2 ); } else @@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString( } bool lcl_getCellRangeAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::CellRange & rOutRange ) { @@ -270,7 +268,7 @@ bool lcl_getCellRangeAddressFromXMLString( bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nDelimiterPos - 1, rOutRange.aUpperLeft, rOutRange.aTableName ); - ::rtl::OUString sTableSecondName; + OUString sTableSecondName; if( bResult ) { bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos, @@ -353,7 +351,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) static const sal_Unicode aSpace( ' ' ); static const sal_Unicode aQuote( '\'' ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if( !rRange.aTableName.isEmpty()) { diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx index 2857c4d8ead5..18f692fccb5a 100644 --- a/sw/source/core/unocore/XMLRangeHelper.hxx +++ b/sw/source/core/unocore/XMLRangeHelper.hxx @@ -55,12 +55,12 @@ struct CellRange { Cell aUpperLeft; Cell aLowerRight; - ::rtl::OUString aTableName; + OUString aTableName; }; -CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString ); +CellRange getCellRangeFromXMLString( const OUString & rXMLString ); -::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange ); +OUString getXMLStringFromCellRange( const CellRange & rRange ); } // namespace XMLRangeHelper diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 78b195f3855a..98d076bac5e1 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -63,7 +63,7 @@ sal_Bool UCB_DeleteFile( const String& rURL ) ucbhelper::Content aTempContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aTempContent.executeCommand(rtl::OUString("delete"), + aTempContent.executeCommand(OUString("delete"), ::com::sun::star::uno::makeAny( sal_True ) ); bRemoved = sal_True; } @@ -96,7 +96,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy aInfo.SourceURL = rURL; aInfo.MoveData = bCopyIsMove; aAny <<= aInfo; - aTempContent.executeCommand( rtl::OUString("transfer"), + aTempContent.executeCommand( OUString("transfer"), aAny ); } catch( ::com::sun::star::uno::Exception& ) @@ -142,7 +142,7 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL ) { ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue( - rtl::OUString("IsReadOnly")); + OUString("IsReadOnly")); if(aAny.hasValue()) bIsReadOnly = *(sal_Bool*)aAny.getValue(); } @@ -198,11 +198,11 @@ bool UCB_GetFileListOfFolder( const String& rURL, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1; - ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize ); - rtl::OUString* pProps = aProps.getArray(); - pProps[ 0 ] = rtl::OUString("Title"); + ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize ); + OUString* pProps = aProps.getArray(); + pProps[ 0 ] = OUString("Title"); if( pDateTimeList ) - pProps[ 1 ] = rtl::OUString("DateModified"); + pProps[ 1 ] = OUString("DateModified"); try { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 365425fcdc93..dd832ddb14eb 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -41,7 +41,6 @@ using namespace ::sw::mark; using namespace ::com::sun::star; -using ::rtl::OUString; namespace @@ -50,7 +49,7 @@ namespace { static const OUString sStart = OUString(String(SW_RES(STR_START_QUOTE))); static const OUString sEnd = OUString(String(SW_RES(STR_END_QUOTE))); - ::rtl::OUStringBuffer sBuf(64); + OUStringBuffer sBuf(64); return sBuf.append(sStart).append(rName).append(sEnd).makeStringAndClear(); } } @@ -70,7 +69,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; SwDoc * m_pDoc; ::sw::mark::IMark * m_pRegisteredBookmark; - ::rtl::OUString m_sMarkName; + OUString m_sMarkName; Impl( SwXBookmark & rThis, @@ -440,7 +439,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::RuntimeException) { // nothing to set here - throw lang::IllegalArgumentException( ::rtl::OUString("Property is read-only: ") + throw lang::IllegalArgumentException( OUString("Property is read-only: ") + PropertyName, static_cast< cppu::OWeakObject * >(this), 0 ); } @@ -463,7 +462,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -473,7 +472,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -483,7 +482,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -493,7 +492,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -607,7 +606,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe ( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) ); } -::rtl::OUString SwXFieldmark::getFieldType(void) +OUString SwXFieldmark::getFieldType(void) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -617,7 +616,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe return pBkm->GetFieldname(); } -void SwXFieldmark::setFieldType(const::rtl::OUString & fieldType) +void SwXFieldmark::setFieldType(const OUString & fieldType) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -667,7 +666,7 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark & rMark) SwXFieldmark::getCheckboxFieldmark() { ::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL; - if ( getFieldType() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) ) + if ( getFieldType() == OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) ) { // evil #TODO #FIXME casting away the const-ness pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark())); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index bfcb64724693..7fe2b3ee85ab 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -52,7 +52,6 @@ #define SN_LABELED_DATA_SEQUENCE "com.sun.star.chart2.data.LabeledDataSequence" using namespace ::com::sun::star; -using ::rtl::OUString; // from unotbl.cxx extern void sw_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow); @@ -1751,7 +1750,7 @@ void SwChartDataProvider::AddRowCols( } // XRangeXMLConversion --------------------------------------------------- -rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUString& rRangeRepresentation ) +OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -1819,7 +1818,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri return aRes; } -rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUString& rXMLRange ) +OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -1832,7 +1831,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt // multiple ranges are delimeted by a ' ' like in // "Table1.$A$1:.$A$4 Table1.$C$2:.$C$5" the same table must be used in all ranges! xub_StrLen nNumRanges = comphelper::string::getTokenCount(aXMLRange, ' '); - rtl::OUString aFirstFoundTable; // to check that only one table will be used + OUString aFirstFoundTable; // to check that only one table will be used for (sal_uInt16 i = 0; i < nNumRanges; ++i) { String aRange( aXMLRange.GetToken(i, ' ') ); @@ -2169,13 +2168,13 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( String aNew; if (bUseCol) { - aRplc = rtl::OUString("%COLUMNLETTER"); - aNew = rtl::OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer()); + aRplc = OUString("%COLUMNLETTER"); + aNew = OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer()); } else { - aRplc = rtl::OUString("%ROWNUMBER"); - aNew = rtl::OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf); + aRplc = OUString("%ROWNUMBER"); + aNew = OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf); } xub_StrLen nPos = aTxt.Search( aRplc ); if (nPos != STRING_NOTFOUND) diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index a55f2fb56753..eb7d5b86b07a 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -79,7 +79,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceasvector.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; @@ -87,25 +86,24 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using rtl::OUString; #ifndef DISABLE_SCRIPTING class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery > { SwDocShell* mpDocShell; - rtl::OUString msThisDocumentCodeName; + OUString msThisDocumentCodeName; public: SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery - rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException ) { // not implemented... - return rtl::OUString(); + return OUString(); } - rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { // Initialise the code name if ( msThisDocumentCodeName.isEmpty() ) @@ -113,14 +111,14 @@ public: try { uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString("BasicLibraries") ), uno::UNO_QUERY_THROW ); - rtl::OUString sProjectName( "Standard"); + uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( OUString("BasicLibraries") ), uno::UNO_QUERY_THROW ); + OUString sProjectName( "Standard"); if ( !mpDocShell->GetBasicManager()->GetName().isEmpty() ) { sProjectName = mpDocShell->GetBasicManager()->GetName(); } uno::Reference< container::XNameAccess > xLib( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sModuleNames = xLib->getElementNames(); + uno::Sequence< OUString > sModuleNames = xLib->getElementNames(); uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i ) @@ -138,7 +136,7 @@ public: { } } - rtl::OUString sCodeName; + OUString sCodeName; if ( mpDocShell ) { OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject"); @@ -173,7 +171,7 @@ public: } }; -typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap; +typedef boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer > { StringHashMap mTemplateToProject; @@ -181,19 +179,19 @@ public: SwVbaProjectNameProvider() { } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() ); + uno::Sequence< OUString > aElements( mTemplateToProject.size() ); StringHashMap::iterator it_end = mTemplateToProject.end(); sal_Int32 index = 0; for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index ) @@ -201,24 +199,24 @@ public: return aElements; } - virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException ) { - rtl::OUString sProjectName; + OUString sProjectName; aElement >>= sProjectName; OSL_TRACE("** Template cache inserting template name %s with project %s" - , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() - , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() ); + , OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() + , OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() ); mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -227,7 +225,7 @@ public: // XElemenAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) { - return ::getCppuType((const rtl::OUString*)0); + return ::getCppuType((const OUString*)0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException ) { @@ -246,7 +244,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -255,7 +253,7 @@ public: return sal_False; } - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -266,9 +264,9 @@ public: OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() ); return uno::makeAny( xDocObj ); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< rtl::OUString > aNames; + uno::Sequence< OUString > aNames; return aNames; } // XElemenAccess @@ -484,7 +482,7 @@ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) OUString sRet; sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); if(nObjectType < nEntries) - sRet = rtl::OUString::createFromAscii(aProvNamesId[nObjectType].pName); + sRet = OUString::createFromAscii(aProvNamesId[nObjectType].pName); return sRet; } @@ -496,7 +494,7 @@ uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames() sal_uInt16 n = 0; for(sal_uInt16 i = 0; i < nEntries; i++) { - String sProv(rtl::OUString::createFromAscii(aProvNamesId[i].pName)); + String sProv(OUString::createFromAscii(aProvNamesId[i].pName)); if(sProv.Len()) { pArray[n] = sProv; @@ -612,7 +610,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel(); - aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString("ooo.vba.word.Globals"), aArgs ); + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString("ooo.vba.word.Globals"), aArgs ); pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs ); } aGlobs >>= xRet; @@ -1683,7 +1681,7 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) throw IndexOutOfBoundsException(); } -uno::Any SwXBookmarks::getByName(const rtl::OUString& rName) +uno::Any SwXBookmarks::getByName(const OUString& rName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1709,7 +1707,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void) if(!IsValid()) throw uno::RuntimeException(); - ::comphelper::SequenceAsVector< ::rtl::OUString > ret; + ::comphelper::SequenceAsVector< OUString > ret; IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess(); for (IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin(); @@ -1997,7 +1995,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R uno::Sequence<OUString> aRet; if(IsValid()) { - std::vector<rtl::OUString> aStrings; + std::vector<OUString> aStrings; sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings ); aRet.realloc(nCount); OUString* pNames = aRet.getArray(); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 28ab19a9bfac..d949481bb89e 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -90,7 +90,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace SwUnoCursorHelper { @@ -678,7 +677,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry nPaMStart = nPaMEnd; nPaMEnd = nTmp; } - Sequence< ::rtl::OUString> aCharStyles; + Sequence< OUString> aCharStyles; SwpHints* pHints = pTxtNode->GetpSwpHints(); for(sal_uInt16 nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ ) { @@ -960,8 +959,8 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, SwDoc* pDoc = pUnoCrsr->GetDoc(); SwDocShell* pDocSh = pDoc->GetDocShell(); comphelper::MediaDescriptor aMediaDescriptor( rOptions ); - ::rtl::OUString sFileName = rURL; - ::rtl::OUString sFilterName, sFilterOptions, sPassword, sBaseURL; + OUString sFileName = rURL; + OUString sFilterName, sFilterOptions, sPassword, sBaseURL; uno::Reference < io::XStream > xStream; uno::Reference < io::XInputStream > xInputStream; @@ -1163,7 +1162,7 @@ bool DocInsertStringSplitCR( } void makeRedline( SwPaM& rPaM, - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -1182,15 +1181,15 @@ void makeRedline( SwPaM& rPaM, //todo: what about REDLINE_FMTCOLL? comphelper::SequenceAsHashMap aPropMap( rRedlineProperties ); uno::Any aAuthorValue; - aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineAuthor"), aAuthorValue); + aAuthorValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineAuthor"), aAuthorValue); sal_uInt16 nAuthor = 0; - ::rtl::OUString sAuthor; + OUString sAuthor; if( aAuthorValue >>= sAuthor ) nAuthor = pRedlineAccess->InsertRedlineAuthor(sAuthor); - ::rtl::OUString sComment; + OUString sComment; uno::Any aCommentValue; - aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineComment"), aCommentValue); + aCommentValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineComment"), aCommentValue); SwRedlineData aRedlineData( eType, nAuthor ); if( aCommentValue >>= sComment ) @@ -1198,7 +1197,7 @@ void makeRedline( SwPaM& rPaM, ::util::DateTime aStamp; uno::Any aDateTimeValue; - aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineDateTime"), aDateTimeValue); + aDateTimeValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineDateTime"), aDateTimeValue); if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index c86eabaa25cb..7540b1640ab8 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -61,7 +61,6 @@ #include <com/sun/star/drawing/PointSequence.hpp> #include <switerator.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, SwShapeImplementationIdMap ); @@ -450,20 +449,20 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) t new SwXShapesEnumeration(this)); } -rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXDrawPage"); } -sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return rServiceName == "com.sun.star.drawing.GenericDrawPage"; } -uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException ) +uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); pArray[0] = "com.sun.star.drawing.GenericDrawPage"; return aRet; } @@ -1041,7 +1040,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx if( xAggShape.is() ) { - const rtl::OUString aShapeType( xAggShape->getShapeType() ); + const OUString aShapeType( xAggShape->getShapeType() ); // did we already compute an implementation id for the agregated shape type? SwShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) ); if( aIter == aImplementationIdMap.end() ) @@ -1095,7 +1094,7 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) th return aRet; } -void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::Any& aValue) +void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1108,7 +1107,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); //mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert if(pFmt) { @@ -1465,7 +1464,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A } } -uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) +uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1541,7 +1540,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); + aRet = _getPropAtAggrObj( OUString("Transformation") ); } else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID ) { @@ -1552,13 +1551,13 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); + aRet = _getPropAtAggrObj( OUString("StartPosition") ); } else if ( FN_SHAPE_ENDPOSITION_IN_HORI_L2R == pEntry->nWID ) { // get property <::drawing::Shape::EndPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); + aRet = _getPropAtAggrObj( OUString("EndPosition") ); } else { @@ -1618,7 +1617,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); + aRet = _getPropAtAggrObj( OUString("Transformation") ); } break; case FN_SHAPE_POSITION_LAYOUT_DIR: @@ -1631,14 +1630,14 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); + aRet = _getPropAtAggrObj( OUString("StartPosition") ); } break; case FN_SHAPE_ENDPOSITION_IN_HORI_L2R: { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); + aRet = _getPropAtAggrObj( OUString("EndPosition") ); } break; } @@ -1685,7 +1684,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) return aRet; } -uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) +uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1705,19 +1704,19 @@ uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) return aRet; } -beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyName ) +beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence< rtl::OUString > aNames(1); - rtl::OUString* pStrings = aNames.getArray(); + uno::Sequence< OUString > aNames(1); + OUString* pStrings = aNames.getArray(); pStrings[0] = rPropertyName; uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aNames); return aStates.getConstArray()[0]; } uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1734,7 +1733,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( bGroupMember = pObject->GetUpGroup() != 0; bFormControl = pObject->GetObjInventor() == FmFormInventor; } - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); beans::PropertyState* pRet = aRet.getArray(); uno::Reference< XPropertyState > xShapePrState; for(sal_Int32 nProperty = 0; nProperty < aPropertyNames.getLength(); nProperty++) @@ -1818,7 +1817,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( return aRet; } -void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) +void SwXShape::setPropertyToDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1829,7 +1828,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw uno::RuntimeException( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(pFmt) { const SfxItemSet& rSet = pFmt->GetAttrSet(); @@ -1880,7 +1879,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) throw uno::RuntimeException(); } -uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) +uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1917,13 +1916,13 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) } void SwXShape::addPropertyChangeListener( - const rtl::OUString& _propertyName, + const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); + throw uno::RuntimeException( OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -1932,13 +1931,13 @@ void SwXShape::addPropertyChangeListener( } void SwXShape::removePropertyChangeListener( - const rtl::OUString& _propertyName, + const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); + throw uno::RuntimeException( OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -1947,7 +1946,7 @@ void SwXShape::removePropertyChangeListener( } void SwXShape::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1956,7 +1955,7 @@ void SwXShape::addVetoableChangeListener( } void SwXShape::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2125,12 +2124,12 @@ void SwXShape::removeEventListener( pSvxShape->removeEventListener(aListener); } -rtl::OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXShape"); } -sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { sal_Bool bRet = sal_False; if(COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.drawing.Shape")) @@ -2144,9 +2143,9 @@ sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno return bRet; } -uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException ) +uno::Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq; + uno::Sequence< OUString > aSeq; if(xShapeAgg.is()) { uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY); @@ -2327,9 +2326,9 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize ) } // #i31698# // implementation of virtual methods from drawing::XShapeDescriptor -::rtl::OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException ) +OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException ) { - ::rtl::OUString aType; + OUString aType; if ( mxShape.is() ) { aType = mxShape->getShapeType(); @@ -2367,9 +2366,9 @@ awt::Point SwXShape::_GetAttrPosition() { awt::Point aAttrPos; - uno::Any aHoriPos( getPropertyValue( rtl::OUString("HoriOrientPosition") ) ); + uno::Any aHoriPos( getPropertyValue( OUString("HoriOrientPosition") ) ); aHoriPos >>= aAttrPos.X; - uno::Any aVertPos( getPropertyValue( rtl::OUString("VertOrientPosition") ) ); + uno::Any aVertPos( getPropertyValue( OUString("VertOrientPosition") ) ); aVertPos >>= aAttrPos.Y; // #i35798# - fallback, if attribute position is (0,0) // and no anchor position is applied to the drawing object @@ -2392,7 +2391,7 @@ awt::Point SwXShape::_GetAttrPosition() text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( "AnchorType" ); + OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } @@ -2521,14 +2520,14 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( "AnchorType" ); + OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER ) { // determine current x-postion - rtl::OUString aHoriPosPropStr("HoriOrientPosition"); + OUString aHoriPosPropStr("HoriOrientPosition"); uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) ); sal_Int32 dCurrX = 0; aHoriPos >>= dCurrX; @@ -2537,7 +2536,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust x-position orientation to text::HoriOrientation::NONE, if needed // Note: has to be done before setting x-position attribute - rtl::OUString aHoriOrientPropStr("HoriOrient"); + OUString aHoriOrientPropStr("HoriOrient"); uno::Any aHoriOrient( getPropertyValue( aHoriOrientPropStr ) ); sal_Int16 eHoriOrient; if (aHoriOrient >>= eHoriOrient) // may be void @@ -2558,7 +2557,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) // handle y-position { // determine current y-postion - rtl::OUString aVertPosPropStr("VertOrientPosition"); + OUString aVertPosPropStr("VertOrientPosition"); uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) ); sal_Int32 dCurrY = 0; aVertPos >>= dCurrY; @@ -2567,7 +2566,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust y-position orientation to text::VertOrientation::NONE, if needed // Note: has to be done before setting y-position attribute - rtl::OUString aVertOrientPropStr("VertOrient"); + OUString aVertOrientPropStr("VertOrient"); uno::Any aVertOrient( getPropertyValue( aVertOrientPropStr ) ); sal_Int16 eVertOrient; if (aVertOrient >>= eVertOrient) // may be void diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index a5695cae9bc9..a9683f74fb5b 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -42,8 +42,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; using ::cppu::WeakImplHelper2; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // // tables of allowed events for specific objects diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 130e668a810e..53a3de7ebb79 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -88,7 +88,6 @@ #include <vector> #include <xmloff/odffields.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; @@ -447,7 +446,7 @@ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( un } if( pEntry ) { - rtl::OString aTmp = rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OString aTmp = OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.fieldmaster.")).append(pEntry). makeStringAndClear(); bRet = rServiceName.equalsAsciiL(aTmp.getStr(), aTmp.getLength()); @@ -613,7 +612,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, { SwSetExpFieldType aType(m_pDoc, sTypeName); if(sParam1.Len()) - aType.SetDelimiter(rtl::OUString(sParam1.GetChar(0))); + aType.SetDelimiter(OUString(sParam1.GetChar(0))); if(nParam1 > -1 && nParam1 < MAXLEVEL) aType.SetOutlineLvl(nParam1); pType2 = m_pDoc->InsertFldType(aType); @@ -1218,7 +1217,7 @@ OUString SwXTextField::getPresentation(sal_Bool bShowCommand) throw( uno::Runtim { throw uno::RuntimeException(); } - ::rtl::OUString const ret( (bShowCommand) + OUString const ret( (bShowCommand) ? pField->GetFieldName() : pField->ExpandField(true) ); return ret; @@ -1665,7 +1664,7 @@ void SwXTextField::attachToRange( case SW_SERVICE_FIELDTYPE_MACRO: { SwFieldType* pFldType = pDoc->GetSysFldType(RES_MACROFLD); - rtl::OUString aName; + OUString aName; // support for Scripting Framework macros if (m_pProps->sPar4.Len() != 0) diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index ae666e0c19c4..2c3696a1bf77 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -61,7 +61,7 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const nTextMarkupType, * SwXFlatParagraph ******************************************************************************/ -SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rMap ) : +SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rMap ) : SwXTextMarkup( rTxtNode, rMap ), maExpandText( aExpandText ) { @@ -119,14 +119,14 @@ css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph:: return SwXTextMarkup::getMarkupInfoContainer(); } -void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) +void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); } // text::XFlatParagraph: -::rtl::OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException) { return maExpandText; } @@ -201,7 +201,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo } // text::XFlatParagraph: -void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) +void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { SolarMutexGuard aGuard; @@ -419,7 +419,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() { // Expand the string: const ModelToViewHelper aConversionMap(*pRet); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pRet, aExpandText, aConversionMap ); // keep hard references... @@ -471,7 +471,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co { // Expand the string: const ModelToViewHelper aConversionMap(*pNextTxtNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pNextTxtNode, aExpandText, aConversionMap ); // keep hard references... @@ -517,7 +517,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(c { // Expand the string: const ModelToViewHelper aConversionMap(*pPrevTxtNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pPrevTxtNode, aExpandText, aConversionMap ); // keep hard references... diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 0990c4fc9890..e2f223d3d8fb 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -115,7 +115,6 @@ extern sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::frame::XModel; using ::com::sun::star::container::XNameAccess; @@ -1189,7 +1188,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: else if( sTmp.EqualsAscii( sGraphicObjectProtocol, 0, sizeof(sGraphicObjectProtocol)-1 ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( sTmp.Copy(sizeof(sGraphicObjectProtocol)-1), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -1256,10 +1255,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: // the package URL based graphics are handled in different way currently // TODO/LATER: actually this is the correct place to handle them - ::rtl::OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) ); + OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) ); if( aGrfUrl.startsWith( aGraphicProtocol ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -1289,7 +1288,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: { svt::EmbeddedObjectRef &rObj = pOleNode->GetOLEObj().GetObject(); - ::rtl::OUString aMediaType; + OUString aMediaType; rObj.SetGraphic( aGraphic, aMediaType ); } } @@ -1565,8 +1564,8 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else { - rtl::OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); - rtl::OUString sId(rtl::OStringToOUString( + OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); + OUString sId(OStringToOUString( pGrfNode->GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); sGrfName = sPrefix + sId; @@ -1740,7 +1739,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) aAny <<= aHexCLSID; else if(FN_UNO_STREAM_NAME == pEntry->nWID) { - aAny <<= ::rtl::OUString(pOleNode->GetOLEObj().GetCurrentPersistName()); + aAny <<= OUString(pOleNode->GetOLEObj().GetCurrentPersistName()); } else if(FN_EMBEDDED_OBJECT == pEntry->nWID) { @@ -2247,7 +2246,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan else if( sGraphicURL.EqualsAscii( sGraphicObjectProtocol, 0, sizeof(sGraphicObjectProtocol)-1 ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( sGraphicURL.Copy( sizeof(sGraphicObjectProtocol)-1 ), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -2290,19 +2289,19 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } const ::uno::Any* pSurroundContour; if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUR, pSurroundContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour); const ::uno::Any* pContourOutside; if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUROUTSIDE, pContourOutside)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside); const ::uno::Any* pContourPoly; if(pProps->GetProperty(FN_PARAM_COUNTOUR_PP, 0, pContourPoly)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly); const ::uno::Any* pPixelContour; if(pProps->GetProperty(FN_UNO_IS_PIXEL_CONTOUR, 0, pPixelContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour); const ::uno::Any* pAutoContour; if(pProps->GetProperty(FN_UNO_IS_AUTOMATIC_CONTOUR, 0, pAutoContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour); } else { @@ -2329,7 +2328,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } pCnt.reset( new comphelper::EmbeddedObjectContainer ); - ::rtl::OUString aName; + OUString aName; xIPObj = pCnt->CreateEmbeddedObject( aClassName.GetByteSequence(), aName ); } if ( xIPObj.is() ) @@ -2394,7 +2393,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } else if( pStreamName ) { - ::rtl::OUString sStreamName; + OUString sStreamName; (*pStreamName) >>= sStreamName; pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL); @@ -2421,7 +2420,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY ); if ( xChild.is() ) xChild->setParent( mrPers.GetModel() ); - ::rtl::OUString rName; + OUString rName; mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName ); SwFlyFrmFmt* pFrmFmt = 0; @@ -2436,21 +2435,21 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan GetOrCreateSdrObject( pFmt ); const ::uno::Any* pOrder; if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) ) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder); const ::uno::Any* pReplacement; if( pProps->GetProperty(FN_UNO_REPLACEMENT_GRAPHIC, 0, pReplacement) ) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement); // new attribute Title const ::uno::Any* pTitle; if ( pProps->GetProperty(FN_UNO_TITLE, 0, pTitle) ) { - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle); } // new attribute Description const ::uno::Any* pDescription; if ( pProps->GetProperty(FN_UNO_DESCRIPTION, 0, pDescription) ) { - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription); } } else diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 0e9ef54b7856..69526c940758 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /****************************************************************** * SwXFootnote @@ -59,7 +58,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; bool m_bIsDescriptor; const SwFmtFtn * m_pFmtFtn; - ::rtl::OUString m_sLabel; + OUString m_sLabel; Impl( SwXFootnote & rThis, SwDoc *const pDoc, SwFmtFtn const*const pFootnote, @@ -255,7 +254,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sRet; + OUString sRet; SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat(); if(pFmt) { @@ -523,7 +522,7 @@ throw (uno::RuntimeException) } void SAL_CALL -SwXFootnote::setPropertyValue(const ::rtl::OUString&, const uno::Any&) +SwXFootnote::setPropertyValue(const OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -574,7 +573,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -584,7 +583,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -594,7 +593,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -604,7 +603,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 03a8c9216b15..395f05af840d 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; static OUString lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) @@ -196,12 +195,12 @@ public: StyleAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& rServiceName) + supportsService(const OUString& rServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XElementAccess @@ -242,12 +241,12 @@ public: TokenAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& rServiceName) + supportsService(const OUString& rServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XElementAccess @@ -1201,7 +1200,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1211,7 +1210,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1221,7 +1220,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1231,7 +1230,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1926,7 +1925,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( // deshalb hier ein Leerzeichen - ob das die ideale Loesung ist? if (!bMark && !rMark.GetAlternativeText().Len()) { - rMark.SetAlternativeText( rtl::OUString(' ') ); + rMark.SetAlternativeText( OUString(' ') ); } const bool bForceExpandHints( (!bMark && pTextCursor) @@ -1975,7 +1974,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( if (!pTxtAttr) { - throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( "SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute")), 0); } @@ -2314,7 +2313,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2324,7 +2323,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2334,7 +2333,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2344,7 +2343,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 0aacac71dd86..5f3cfc282fec 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; using namespace ::comphelper; #define SW_PROP_NMID(id) ((const char*)id), 0 diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 050b9cbbc20c..1771cdc1d3e3 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -109,8 +109,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; /**************************************************************************** Hilfsklassen @@ -178,7 +176,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) #endif WriterRef xWrt; // TODO/MBA: looks like a BaseURL doesn't make sense here - SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT_DLG), String(), xWrt ); + SwReaderWriter::GetWriter( OUString(FILTER_TEXT_DLG), String(), xWrt ); if( xWrt.Is() ) { SwWriter aWriter( aStream, rPam ); @@ -205,7 +203,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) long lUniLen = (lLen / sizeof( sal_Unicode )); rtl_uString *pStr = rtl_uString_alloc(lUniLen); aStream.Read(pStr->buffer, lUniLen * sizeof(sal_Unicode)); - rBuffer = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rBuffer = OUString(pStr, SAL_NO_ACQUIRE); } xWrt->bShowProgress = bOldShowProgress; } @@ -546,7 +544,7 @@ throw (lang::IllegalArgumentException) // #i91601# else if (FN_UNO_LIST_ID == rEntry.nWID) { - ::rtl::OUString sListId; + OUString sListId; if (rValue >>= sListId) { pTxtNd->SetListId( sListId ); @@ -825,7 +823,7 @@ SwXTextCursor::~SwXTextCursor() { } -void SwXTextCursor::DeleteAndInsert(const ::rtl::OUString& rText, +void SwXTextCursor::DeleteAndInsert(const OUString& rText, const bool bForceExpandHints) { SwUnoCrsr *const pUnoCrsr = m_pImpl->GetCursor(); @@ -1879,7 +1877,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, return; SwDoc *const pDoc = rPaM.GetDoc(); - rtl::OUString aUnknownExMsg, aPropertyVetoExMsg; + OUString aUnknownExMsg, aPropertyVetoExMsg; // Build set of attributes we want to fetch std::vector<sal_uInt16> aWhichPairs; @@ -1887,7 +1885,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, aEntries.reserve(rPropertyValues.getLength()); for (sal_Int32 i = 0; i < rPropertyValues.getLength(); ++i) { - const rtl::OUString &rPropertyName = rPropertyValues[i].Name; + const OUString &rPropertyName = rPropertyValues[i].Name; SfxItemPropertySimpleEntry const* pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); @@ -2249,7 +2247,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2259,7 +2257,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2269,7 +2267,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2279,7 +2277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2333,7 +2331,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } void SAL_CALL SwXTextCursor::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& aPropertyNames, + const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, @@ -2369,7 +2367,7 @@ void SAL_CALL SwXTextCursor::setPropertyValues( } uno::Sequence< uno::Any > SAL_CALL -SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException) { // a banal implementation for now @@ -2380,7 +2378,7 @@ SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPrope } void SAL_CALL SwXTextCursor::addPropertiesChangeListener( - const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, + const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) throw (css::uno::RuntimeException) { @@ -2394,7 +2392,7 @@ void SAL_CALL SwXTextCursor::removePropertiesChangeListener( } void SAL_CALL SwXTextCursor::firePropertiesChangeEvent( - const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, + const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) throw (css::uno::RuntimeException) { @@ -2576,7 +2574,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d40071ef5ef5..aa71134fc797 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -109,13 +109,12 @@ #include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; namespace sw { sal_Bool SupportsServiceImpl( size_t const nServices, char const*const pServices[], - ::rtl::OUString const & rServiceName) + OUString const & rServiceName) { for (size_t i = 0; i < nServices; ++i) { @@ -127,14 +126,14 @@ sal_Bool SupportsServiceImpl( return sal_False; } -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > GetSupportedServiceNamesImpl( size_t const nServices, char const*const pServices[]) { - uno::Sequence< ::rtl::OUString > ret(nServices); + uno::Sequence< OUString > ret(nServices); for (size_t i = 0; i < nServices; ++i) { - ret[i] = rtl::OUString::createFromAscii(pServices[i]); + ret[i] = OUString::createFromAscii(pServices[i]); } return ret; } @@ -847,13 +846,13 @@ void SwXTextRange::SetPositions(const SwPaM& rPam) { m_pImpl->Invalidate(); IDocumentMarkAccess* const pMA = m_pImpl->m_rDoc.getIDocumentMarkAccess(); - m_pImpl->m_pMark = pMA->makeMark(rPam, ::rtl::OUString(), + m_pImpl->m_pMark = pMA->makeMark(rPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK); m_pImpl->m_pMark->Add(m_pImpl.get()); } void SwXTextRange::DeleteAndInsert( - const ::rtl::OUString& rText, const bool bForceExpandHints) + const OUString& rText, const bool bForceExpandHints) throw (uno::RuntimeException) { if (RANGE_IS_TABLE == m_pImpl->m_eRangePosition) @@ -1418,7 +1417,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1428,7 +1427,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1438,7 +1437,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1448,7 +1447,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1522,7 +1521,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) throw (lang::IllegalArgumentException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 5382e1b58a80..8a27742395f2 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; class SwParaSelection { @@ -113,7 +112,7 @@ public: bool m_bIsDescriptor; sal_Int32 m_nSelectionStartPos; sal_Int32 m_nSelectionEndPos; - ::rtl::OUString m_sText; + OUString m_sText; uno::Reference<text::XText> m_xParentText; Impl( SwXParagraph & rThis, @@ -151,7 +150,7 @@ public: bool IsDescriptor() const { return m_bIsDescriptor; } void SetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, @@ -159,13 +158,13 @@ public: uno::Sequence< uno::Any > GetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); uno::Sequence< beans::GetDirectPropertyTolerantResult > GetPropertyValuesTolerant_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly) throw (uno::RuntimeException); protected: @@ -811,7 +810,7 @@ bool ::sw::GetDefaultTextContentValue( void SAL_CALL SwXParagraph::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -821,7 +820,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -831,7 +830,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -841,7 +840,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index caea251ac319..e221f80ecfa7 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -293,7 +293,7 @@ void SwXTextPortion::GetPropertyValue( OUString sRet; if( pRet ) - sRet = rtl::OUString::createFromAscii( pRet ); + sRet = OUString::createFromAscii( pRet ); rVal <<= sRet; } break; @@ -440,7 +440,7 @@ uno::Any SwXTextPortion::getPropertyValue( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index ce0e056a024e..d891e66c28fc 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; SwXRedlineText::SwXRedlineText(SwDoc* _pDoc, SwNodeIndex aIndex) : SwXText(_pDoc, CURSOR_REDLINE), @@ -232,15 +230,15 @@ static uno::Sequence<beans::PropertyValue> lcl_GetSuccessorProperties(const SwRe if(pNext) { beans::PropertyValue* pValues = aValues.getArray(); - pValues[0].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); + pValues[0].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); // GetAuthorString(n) walks the SwRedlineData* chain; // here we always need element 1 pValues[0].Value <<= OUString(rRedline.GetAuthorString(1)); - pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); + pValues[1].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); pValues[1].Value <<= lcl_DateTimeToUno(pNext->GetTimeStamp()); - pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); + pValues[2].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); pValues[2].Value <<= OUString(pNext->GetComment()); - pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); + pValues[3].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); pValues[3].Value <<= lcl_RedlineTypeToOUString(pNext->GetType()); } return aValues; @@ -354,25 +352,25 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties sRedlineIdBuf.append( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(&rRedline) ) ); sal_Int32 nPropIdx = 0; - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); pRet[nPropIdx++].Value <<= OUString(rRedline.GetAuthorString()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); pRet[nPropIdx++].Value <<= lcl_DateTimeToUno(rRedline.GetTimeStamp()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); pRet[nPropIdx++].Value <<= OUString(rRedline.GetComment()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); pRet[nPropIdx++].Value <<= lcl_RedlineTypeToOUString(rRedline.GetType()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER)); pRet[nPropIdx++].Value <<= sRedlineIdBuf.makeStringAndClear(); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED)); sal_Bool bTmp = !rRedline.HasMark(); pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ; - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START)); pRet[nPropIdx++].Value.setValue(&bIsStart, ::getBooleanCppuType()) ; bTmp = !rRedline.IsDelLastPara(); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA)); pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ; SwNodeIndex* pNodeIdx = rRedline.GetContentIdx(); @@ -381,7 +379,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties if ( 1 < ( pNodeIdx->GetNode().EndOfSectionIndex() - pNodeIdx->GetNode().GetIndex() ) ) { uno::Reference<text::XText> xRet = new SwXRedlineText(rRedline.GetDoc(), *pNodeIdx); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT)); pRet[nPropIdx++].Value <<= xRet; } else { @@ -390,7 +388,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties } if(pNext) { - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA)); pRet[nPropIdx++].Value <<= lcl_GetSuccessorProperties(rRedline); } aRet.realloc(nPropIdx); diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 116f0aefdc49..f726abc0ae01 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -34,7 +34,6 @@ #include <switerator.hxx> using namespace ::com::sun::star; -using ::rtl::OUString; SwXRedlines::SwXRedlines(SwDoc* _pDoc) : SwUnoCollection(_pDoc) @@ -100,7 +99,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) return OUString("SwXRedlines"); } -sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) +sal_Bool SwXRedlines::supportsService(const OUString& /*ServiceName*/) throw( uno::RuntimeException ) { OSL_FAIL("not implemented"); @@ -162,12 +161,12 @@ uno::Any SwXRedlineEnumeration::nextElement(void) return aRet; } -rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXRedlineEnumeration"); } -sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) +sal_Bool SwXRedlineEnumeration::supportsService(const OUString& /*ServiceName*/) throw( uno::RuntimeException ) { return sal_False; } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 5dccc5370596..3e034316af54 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /****************************************************************** * SwXReferenceMark @@ -55,7 +54,7 @@ public: bool m_bIsDescriptor; SwDoc * m_pDoc; const SwFmtRefMark * m_pMarkFmt; - ::rtl::OUString m_sMarkName; + OUString m_sMarkName; Impl( SwXReferenceMark & rThis, SwDoc *const pDoc, SwFmtRefMark const*const pRefMark) @@ -268,7 +267,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, if (!pTxtAttr) { - throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( "SwXReferenceMark::InsertRefMark(): cannot insert attribute")), 0); } @@ -899,7 +898,7 @@ throw (uno::RuntimeException) } // XServiceInfo -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMeta::getImplementationName() throw (uno::RuntimeException) { return OUString("SwXMeta"); @@ -915,14 +914,14 @@ static const size_t g_nServicesMeta( sizeof(g_ServicesMeta)/sizeof(g_ServicesMeta[0])); sal_Bool SAL_CALL -SwXMeta::supportsService(const ::rtl::OUString& rServiceName) +SwXMeta::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return ::sw::SupportsServiceImpl( g_nServicesMeta, g_ServicesMeta, rServiceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException) { return ::sw::GetSupportedServiceNamesImpl(g_nServicesMeta, g_ServicesMeta); @@ -994,7 +993,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("SwXMeta::attach(): already attached"), + OUString("SwXMeta::attach(): already attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1002,7 +1001,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!xRangeTunnel.is()) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument is no XUnoTunnel"), + OUString("SwXMeta::attach(): argument is no XUnoTunnel"), static_cast< ::cppu::OWeakObject* >(this), 0); } SwXTextRange *const pRange( @@ -1012,7 +1011,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pRange && !pCursor) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument not supported type"), + OUString("SwXMeta::attach(): argument not supported type"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1021,7 +1020,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pDoc) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument has no SwDoc"), + OUString("SwXMeta::attach(): argument has no SwDoc"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1049,14 +1048,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!bSuccess) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): cannot create meta: range invalid?"), + OUString("SwXMeta::attach(): cannot create meta: range invalid?"), static_cast< ::cppu::OWeakObject* >(this), 1); } if (!pTxtAttr) { OSL_FAIL("meta inserted, but has no text attribute?"); throw uno::RuntimeException( - rtl::OUString("SwXMeta::attach(): cannot create meta"), + OUString("SwXMeta::attach(): cannot create meta"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1088,7 +1087,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("SwXMeta::getAnchor(): not inserted"), + OUString("SwXMeta::getAnchor(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1100,7 +1099,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (!bSuccess) { throw lang::DisposedException( - rtl::OUString("SwXMeta::getAnchor(): not attached"), + OUString("SwXMeta::getAnchor(): not attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1131,7 +1130,7 @@ SwXMeta::getEnd() throw (uno::RuntimeException) return m_pImpl->m_Text.getEnd(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwXMeta::getString() throw (uno::RuntimeException) { SolarMutexGuard g; @@ -1139,7 +1138,7 @@ SwXMeta::getString() throw (uno::RuntimeException) } void SAL_CALL -SwXMeta::setString(const rtl::OUString& rString) throw (uno::RuntimeException) +SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException) { SolarMutexGuard g; return m_pImpl->m_Text.setString(rString); @@ -1164,7 +1163,7 @@ SwXMeta::createTextCursorByRange( void SAL_CALL SwXMeta::insertString(const uno::Reference<text::XTextRange> & xRange, - const rtl::OUString& rString, sal_Bool bAbsorb) + const OUString& rString, sal_Bool bAbsorb) throw (uno::RuntimeException) { SolarMutexGuard g; @@ -1224,7 +1223,7 @@ void SAL_CALL SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/) throw (uno::RuntimeException, lang::NoSupportException) { - throw lang::NoSupportException(rtl::OUString("setting parent not supported"), *this); + throw lang::NoSupportException(OUString("setting parent not supported"), *this); } // XElementAccess @@ -1255,7 +1254,7 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("createEnumeration(): not inserted"), + OUString("createEnumeration(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1328,7 +1327,7 @@ SwXMetaField::~SwXMetaField() } // XServiceInfo -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMetaField::getImplementationName() throw (uno::RuntimeException) { return OUString("SwXMetaField"); @@ -1345,14 +1344,14 @@ static const size_t g_nServicesMetaField( sizeof(g_ServicesMetaField)/sizeof(g_ServicesMetaField[0])); sal_Bool SAL_CALL -SwXMetaField::supportsService(const ::rtl::OUString& rServiceName) +SwXMetaField::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return ::sw::SupportsServiceImpl( g_nServicesMetaField, g_ServicesMetaField, rServiceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException) { return ::sw::GetSupportedServiceNamesImpl( @@ -1410,7 +1409,7 @@ SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException) void SAL_CALL SwXMetaField::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1445,7 +1444,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } uno::Any SAL_CALL -SwXMetaField::getPropertyValue(const ::rtl::OUString& rPropertyName) +SwXMetaField::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1459,7 +1458,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if ( rPropertyName == "NumberFormat" ) { - const ::rtl::OUString text( getPresentation(sal_False) ); + const OUString text( getPresentation(sal_False) ); any <<= static_cast<sal_Int32>(pMeta->GetNumberFormat(text)); } else if ( rPropertyName == "IsFixedLanguage" ) @@ -1476,7 +1475,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1486,7 +1485,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1496,7 +1495,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1506,7 +1505,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1536,7 +1535,7 @@ lcl_getURI(const bool bPrefix) return (bPrefix) ? xOdfPrefix : xOdfSuffix; } -static ::rtl::OUString +static OUString lcl_getPrefixOrSuffix( uno::Reference<rdf::XRepository> const & xRepository, uno::Reference<rdf::XResource> const & xMetaField, @@ -1558,14 +1557,14 @@ lcl_getPrefixOrSuffix( } return xObject->getValue(); } - return ::rtl::OUString(); + return OUString(); } void getPrefixAndSuffix( const uno::Reference<frame::XModel>& xModel, const uno::Reference<rdf::XMetadatable>& xMetaField, - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix) + OUString *const o_pPrefix, OUString *const o_pSuffix) { try { const uno::Reference<rdf::XRepositorySupplier> xRS( @@ -1586,13 +1585,13 @@ getPrefixAndSuffix( throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("getPrefixAndSuffix: exception"), + OUString("getPrefixAndSuffix: exception"), 0, uno::makeAny(e)); } } // XTextField -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMetaField::getPresentation(sal_Bool bShowCommand) throw (uno::RuntimeException) { @@ -1601,14 +1600,14 @@ throw (uno::RuntimeException) if (bShowCommand) { //FIXME ? - return ::rtl::OUString(); + return OUString(); } else { // getString should check if this is invalid - const ::rtl::OUString content( this->getString() ); - ::rtl::OUString prefix; - ::rtl::OUString suffix; + const OUString content( this->getString() ); + OUString prefix; + OUString suffix; getPrefixAndSuffix(GetModel(), this, &prefix, &suffix); return prefix + content + suffix; } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 88e2b3f2e896..4ea1fcf9e464 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -61,15 +61,14 @@ using namespace ::com::sun::star; -using ::rtl::OUString; struct SwTextSectionProperties_Impl { uno::Sequence<sal_Int8> m_Password; - ::rtl::OUString m_sCondition; - ::rtl::OUString m_sLinkFileName; - ::rtl::OUString m_sSectionFilter; - ::rtl::OUString m_sSectionRegion; + OUString m_sCondition; + OUString m_sLinkFileName; + OUString m_sSectionFilter; + OUString m_sSectionRegion; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SwFmtCol> m_pColItem; @@ -113,7 +112,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; const bool m_bIndexHeader; bool m_bIsDescriptor; - ::rtl::OUString m_sName; + OUString m_sName; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SwTextSectionProperties_Impl> m_pProps; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -147,14 +146,14 @@ public: } void SAL_CALL SetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& aValues) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); uno::Sequence< uno::Any > SAL_CALL GetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); protected: @@ -337,7 +336,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) String tmp(m_pImpl->m_sName); SwSectionData aSect(eType, pDoc->GetUniqueSectionName(&tmp)); aSect.SetCondition(m_pImpl->m_pProps->m_sCondition); - ::rtl::OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); + OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); sLinkNameBuf.append(sfx2::cTokenSeperator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionFilter); sLinkNameBuf.append(sfx2::cTokenSeperator); @@ -623,7 +622,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { if (!m_pProps->m_bDDE) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(sfx2::cTokenSeperator); buf.append(sfx2::cTokenSeperator); m_pProps->m_sLinkFileName = buf.makeStringAndClear(); @@ -687,7 +686,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { pSectionData->SetType(FILE_LINK_SECTION); } - ::rtl::OUStringBuffer sFileNameBuf; + OUStringBuffer sFileNameBuf; if (!aLink.FileURL.isEmpty()) { sFileNameBuf.append( URIHelper::SmartRel2Abs( @@ -701,7 +700,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, sFileNameBuf.append( pSectionData->GetLinkFileName().GetToken(2, sfx2::cTokenSeperator)); - const ::rtl::OUString sFileName( + const OUString sFileName( sFileNameBuf.makeStringAndClear()); pSectionData->SetLinkFileName(sFileName); if (sFileName.getLength() < 3) @@ -926,7 +925,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, void SAL_CALL SwXTextSection::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -956,7 +955,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; uno::Sequence< uno::Any > aValues(1); aValues.getArray()[0] = rValue; @@ -998,7 +997,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, { OUString uTmp( (m_bIsDescriptor) ? m_pProps->m_sCondition - : ::rtl::OUString(pSect->GetCondition())); + : OUString(pSect->GetCondition())); pRet[nProperty] <<= uTmp; } break; @@ -1006,7 +1005,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, case WID_SECT_DDE_FILE: case WID_SECT_DDE_ELEMENT: { - ::rtl::OUString sRet; + OUString sRet; if (m_bIsDescriptor) { if (m_pProps->m_bDDE) @@ -1048,7 +1047,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } else if (FILE_LINK_SECTION == pSect->GetType()) { - ::rtl::OUString sRet( pSect->GetLinkFileName() ); + OUString sRet( pSect->GetLinkFileName() ); sal_Int32 nIndex(0); aLink.FileURL = sRet.getToken(0, sfx2::cTokenSeperator, nIndex); @@ -1060,7 +1059,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, break; case WID_SECT_REGION : { - ::rtl::OUString sRet; + OUString sRet; if (m_bIsDescriptor) { sRet = m_pProps->m_sSectionRegion; @@ -1278,7 +1277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Sequence< uno::Any > SAL_CALL SwXTextSection::getPropertyValues( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1310,7 +1309,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; return m_pImpl->GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } @@ -1340,7 +1339,7 @@ void SAL_CALL SwXTextSection::firePropertiesChangeEvent( void SAL_CALL SwXTextSection::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1350,7 +1349,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1360,7 +1359,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1370,7 +1369,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1530,9 +1529,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { m_pImpl->m_pProps->m_bDDE = false; - m_pImpl->m_pProps->m_sLinkFileName = ::rtl::OUString(); - m_pImpl->m_pProps->m_sSectionRegion = ::rtl::OUString(); - m_pImpl->m_pProps->m_sSectionFilter = ::rtl::OUString(); + m_pImpl->m_pProps->m_sLinkFileName = OUString(); + m_pImpl->m_pProps->m_sSectionRegion = OUString(); + m_pImpl->m_pProps->m_sSectionFilter = OUString(); } else { @@ -1685,7 +1684,7 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sRet; + OUString sRet; SwSectionFmt const*const pFmt = m_pImpl->GetSectionFmt(); if(pFmt) { diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 48771155d6f5..68b135c2a605 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1112,7 +1112,7 @@ OSL_FAIL("not implemented"); ******************************************************************/ const char aInvalidStyle[] = "__XXX___invalid"; -bool SwXNumberingRules::isInvalidStyle(const rtl::OUString &rName) +bool SwXNumberingRules::isInvalidStyle(const OUString &rName) { return rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aInvalidStyle)); } @@ -1182,8 +1182,8 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) : pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this); for(i = 0; i < MAXLEVEL; i++) { - sNewCharStyleNames[i] = rtl::OUString(aInvalidStyle); - sNewBulletFontNames[i] = rtl::OUString(aInvalidStyle); + sNewCharStyleNames[i] = OUString(aInvalidStyle); + sNewBulletFontNames[i] = OUString(aInvalidStyle); } } @@ -1602,7 +1602,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) { - OUString sCmp = rtl::OUString::createFromAscii(cName); + OUString sCmp = OUString::createFromAscii(cName); for(sal_uInt16 i = 0; i < rPropertyValues.size(); i++) { PropValData* pTemp = rPropertyValues[i]; @@ -1748,7 +1748,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); if(sCharFmtName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_CHARACTER_FORMAT_NONE))) { - sNewCharStyleNames[(sal_uInt16)nIndex] = rtl::OUString(aInvalidStyle); + sNewCharStyleNames[(sal_uInt16)nIndex] = OUString(aInvalidStyle); aFmt.SetCharFmt(0); } else if(pDocShell || pDoc) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 77303cb6251d..49502e0cdc9f 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -420,15 +420,15 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo uno::Any aVal; sal_Bool bTemp = sal_True; aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[0] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[0] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[1] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[1] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[2] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[2] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[3] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[3] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[4] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[4] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); return aSeq; } @@ -960,12 +960,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXStyleFamily::getPropertySe return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL SwXStyleFamily::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -1002,22 +1002,22 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp return aRet; } -void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } @@ -1059,11 +1059,11 @@ public: SwStyleProperties_Impl(const SfxItemPropertyMap& rMap); ~SwStyleProperties_Impl(); - sal_Bool SetProperty(const ::rtl::OUString& rName, uno::Any aVal); - sal_Bool GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny); - sal_Bool ClearProperty( const ::rtl::OUString& rPropertyName ); + sal_Bool SetProperty(const OUString& rName, uno::Any aVal); + sal_Bool GetProperty(const OUString& rName, uno::Any*& rpAny); + sal_Bool ClearProperty( const OUString& rPropertyName ); void ClearAllProperties( ); - void GetProperty(const ::rtl::OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ); + void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ); const PropertyEntryVector_t& GetPropertyVector() const {return aPropertyEntries; } @@ -1087,7 +1087,7 @@ SwStyleProperties_Impl::~SwStyleProperties_Impl() delete[] pAnyArr; } -sal_Bool SwStyleProperties_Impl::SetProperty(const ::rtl::OUString& rName, uno::Any aVal) +sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVal) { sal_uInt16 nPos = 0; sal_Bool bRet = sal_False; @@ -1136,7 +1136,7 @@ void SwStyleProperties_Impl::ClearAllProperties( ) } } -sal_Bool SwStyleProperties_Impl::GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny ) +sal_Bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& rpAny ) { sal_Bool bRet = sal_False; sal_uInt16 nPos = 0; @@ -2290,7 +2290,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, } pSeq[n].Name = GetCommandContextByIndex(n); - pSeq[n].Value <<= rtl::OUString( aStyleName ); + pSeq[n].Value <<= OUString( aStyleName ); } aRet <<= aSeq; } @@ -3601,7 +3601,7 @@ sal_Bool SwXAutoStyles::hasElements( ) throw(uno::RuntimeException) return sal_True; } -uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name) +uno::Any SwXAutoStyles::getByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Any aRet; @@ -3616,7 +3616,7 @@ uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name) return aRet; } -uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void) +uno::Sequence< OUString > SwXAutoStyles::getElementNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT); @@ -3627,7 +3627,7 @@ uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void) return aNames; } -sal_Bool SwXAutoStyles::hasByName(const rtl::OUString& Name) +sal_Bool SwXAutoStyles::hasByName(const OUString& Name) throw( uno::RuntimeException ) { if( Name.compareToAscii("CharacterStyles") == 0 || @@ -3927,7 +3927,7 @@ void SwXAutoStyle::removeVetoableChangeListener( const OUString& /*PropertyName* } void SwXAutoStyle::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Sequence< uno::Any >& /*aValues*/ ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3980,7 +3980,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( } uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( - const uno::Sequence< ::rtl::OUString >& rPropertyNames ) + const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4004,7 +4004,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( } void SwXAutoStyle::addPropertiesChangeListener( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw (uno::RuntimeException) { @@ -4017,7 +4017,7 @@ void SwXAutoStyle::removePropertiesChangeListener( } void SwXAutoStyle::firePropertiesChangeEvent( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw (uno::RuntimeException) { @@ -4052,7 +4052,7 @@ uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName ) } uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( - const uno::Sequence< ::rtl::OUString >& rPropertyNames ) + const uno::Sequence< OUString >& rPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { if( !pSet.get() ) @@ -4092,13 +4092,13 @@ void SwXAutoStyle::setAllPropertiesToDefault( ) } void SwXAutoStyle::setPropertiesToDefault( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ ) + const uno::Sequence< OUString >& /*aPropertyNames*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { } uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ ) + const uno::Sequence< OUString >& /*aPropertyNames*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 02eaaaaefd50..e0c09aad697c 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -351,8 +351,8 @@ void sw_GetCellPosition( const String &rCellName, // start of number found? if (pBuf < pEnd && ('0' <= *pBuf && *pBuf <= '9')) { - rtl::OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer()); - rtl::OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf)); + OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer()); + OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf)); if (!aColTxt.isEmpty() && !aRowTxt.isEmpty()) { sal_Int32 nColIdx = 0; @@ -461,13 +461,13 @@ String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) #if OSL_DEBUG_LEVEL > 0 { sal_Int32 nCol, nRow2; - sw_GetCellPosition( rtl::OUString("z1"), nCol, nRow2); + sw_GetCellPosition( OUString("z1"), nCol, nRow2); OSL_ENSURE( nCol == 51, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2); + sw_GetCellPosition( OUString("AA1"), nCol, nRow2); OSL_ENSURE( nCol == 52, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2); + sw_GetCellPosition( OUString("AB1"), nCol, nRow2); OSL_ENSURE( nCol == 53, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2); + sw_GetCellPosition( OUString("BB1"), nCol, nRow2); OSL_ENSURE( nCol == 105, "sw_GetCellPosition failed" ); } #endif @@ -684,14 +684,14 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB } } -static inline rtl::OUString lcl_getString( SwXCell &rCell ) +static inline OUString lcl_getString( SwXCell &rCell ) { // getString is a member function of the base class... return rCell.getString(); } /* non UNO function call to set string in SwXCell */ -void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt, +void sw_setString( SwXCell &rCell, const OUString &rTxt, sal_Bool bKeepNumberFmt ) { if(rCell.IsValid()) @@ -2657,7 +2657,7 @@ void SAL_CALL SwXTextTable::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(OUString *) rAny.getValue() ); else { double d = 0; @@ -3049,7 +3049,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, { case UNO_NAME_TABLE_NAME : { - ::rtl::OUString sName; + OUString sName; aValue >>= sName; setName( sName ); } @@ -4320,7 +4320,7 @@ void SAL_CALL SwXCellRange::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(OUString *) rAny.getValue() ); else { double d = 0; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 8d3b8c93b76a..a93a34fe73e5 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -67,7 +67,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; const sal_Char cInvalidObject[] = "this object is invalid"; @@ -464,7 +463,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } if (cIns) { - m_pImpl->m_pDoc->InsertString( aTmp, rtl::OUString(cIns), nInsertFlags ); + m_pImpl->m_pDoc->InsertString( aTmp, OUString(cIns), nInsertFlags ); } if (bAbsorb) @@ -1119,7 +1118,7 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException) } void SAL_CALL -SwXText::setPropertyValue(const ::rtl::OUString& /*aPropertyName*/, +SwXText::setPropertyValue(const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, @@ -1130,7 +1129,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXText::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1186,7 +1185,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1196,7 +1195,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1206,7 +1205,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1216,7 +1215,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1283,7 +1282,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > xRet; bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_START , NULL); // find end node, go backward - don't skip tables because the new // paragraph has to be the last node @@ -1396,7 +1395,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXText::insertTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties, const uno::Reference<text::XTextRange>& xInsertPosition) @@ -1419,7 +1418,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL); // SwPaM aPam(*pStartNode->EndOfSectionNode()); @@ -1481,7 +1480,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::appendTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -1603,7 +1602,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; SwStartNode* pStartStartNode = aStartPam.GetNode()->StartOfSectionNode(); while (pStartStartNode && pStartStartNode->IsSectionNode()) { @@ -1846,7 +1845,7 @@ void SwXText::Impl::ConvertCell( if (rCell.getLength() != 2) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "rCell needs to contain 2 elements" ), + OUString::createFromAscii( "rCell needs to contain 2 elements" ), uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) ); } const uno::Reference<text::XTextRange> xStartRange = rCell[0]; @@ -1861,7 +1860,7 @@ void SwXText::Impl::ConvertCell( !::sw::XTextRangeToSwPaM(aEndCellPam, xEndRange)) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ), + OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ), uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) ); } @@ -2034,7 +2033,7 @@ lcl_DebugCellProperties( const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& rCellProperties) { - ::rtl::OUString sNames; + OUString sNames; for (sal_Int32 nDebugRow = 0; nDebugRow < rCellProperties.getLength(); ++nDebugRow) { @@ -2052,14 +2051,14 @@ lcl_DebugCellProperties( for (sal_Int32 nDebugProperty = 0; nDebugProperty < nDebugCellProperties; ++nDebugProperty) { - const ::rtl::OUString sName = + const OUString sName = rDebugCellProperties[nDebugProperty].Name; sNames += sName; - sNames += ::rtl::OUString('-'); + sNames += OUString('-'); } - sNames += ::rtl::OUString('+'); + sNames += OUString('+'); } - sNames += ::rtl::OUString('|'); + sNames += OUString('|'); } (void)sNames; } @@ -2193,7 +2192,7 @@ lcl_MergeCells(::std::vector<VerticallyMergedCell> & rMergedCells) while (aCellIter != aMergedIter->aCells.end()) { (*aCellIter)->setPropertyValue( - rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)), + OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)), uno::makeAny(nCellCount)); if (bFirstCell) { @@ -2527,7 +2526,7 @@ throw (uno::RuntimeException) if (::sw::XTextRangeToSwPaM(aPam, xTextPosition)) { if ( !aPam.GetNode()->GetTxtNode() ) - throw uno::RuntimeException( rtl::OUString("Invalid text range"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Invalid text range"), uno::Reference< uno::XInterface >() ); SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent(); @@ -2548,7 +2547,7 @@ throw (uno::RuntimeException) } if(!aRef.is()) { - throw uno::RuntimeException( rtl::OUString::createFromAscii( "End of content node doesn't have the proper start node" ), + throw uno::RuntimeException( OUString::createFromAscii( "End of content node doesn't have the proper start node" ), uno::Reference< uno::XInterface >( *this ) ); } return aRef; diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index e1fe221773da..72ffaa762759 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -57,7 +57,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo void SAL_CALL SwXTextMarkup::commitTextMarkup( ::sal_Int32 nType, - const ::rtl::OUString & rIdentifier, + const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) @@ -226,7 +226,7 @@ static void lcl_commitGrammarMarkUp( const ModelToViewHelper& rConversionMap, SwGrammarMarkUp* pWList, ::sal_Int32 nType, - const ::rtl::OUString & rIdentifier, + const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) @@ -430,23 +430,23 @@ SwXStringKeyMap::SwXStringKeyMap() { } -uno::Any SAL_CALL SwXStringKeyMap::getValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException) +uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException) { - std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); + std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter == maMap.end() ) throw container::NoSuchElementException(); return (*aIter).second; } -::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException) +::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) throw (uno::RuntimeException) { return maMap.find( aKey ) != maMap.end(); } -void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) +void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { - std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); + std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter != maMap.end() ) throw container::ElementExistException(); @@ -458,12 +458,12 @@ void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const u return maMap.size(); } -::rtl::OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) +OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { if ( (sal_uInt32)nIndex >= maMap.size() ) throw lang::IndexOutOfBoundsException(); - return ::rtl::OUString(); + return OUString(); } uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 2e0be45974dd..b775fc094536 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -39,7 +39,6 @@ extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLs using namespace ::com::sun::star; -using ::rtl::OUString; ////////////////////////////////////////////////////////////////////// @@ -209,8 +208,8 @@ SwPrintUIOptions::SwPrintUIOptions( int nIdx = 0; // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/swriter/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/swriter/ui/printeroptions.ui"); // create "writer" section (new tab page in dialog) SvtModuleOptions aModOpt; @@ -220,7 +219,7 @@ SwPrintUIOptions::SwPrintUIOptions( m_aUIProperties[ nIdx++ ].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create sub section for Contents - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), OUString()); // create a bool option for background bool bDefaultVal = rDefaultPrintData.IsPrintPageBackground(); @@ -260,7 +259,7 @@ SwPrintUIOptions::SwPrintUIOptions( bDefaultVal); // create sub section for Color - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), OUString()); // create a bool option for printing text with black font color bDefaultVal = rDefaultPrintData.IsPrintBlackFont(); @@ -272,7 +271,7 @@ SwPrintUIOptions::SwPrintUIOptions( if (!bWeb) { // create subgroup for misc options - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", rtl::OUString(aLocalizedStrings.GetString(9)), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", OUString(aLocalizedStrings.GetString(9)), OUString()); // create a bool option for printing automatically inserted blank pages bDefaultVal = rDefaultPrintData.IsPrintEmptyPages(); @@ -285,7 +284,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for paper tray bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; - aPaperTrayOpt.maGroupHint = rtl::OUString( "OptionsPageOptGroup" ); + aPaperTrayOpt.maGroupHint = OUString( "OptionsPageOptGroup" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox", "PrintPaperFromSetup", @@ -294,46 +293,46 @@ SwPrintUIOptions::SwPrintUIOptions( // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); + aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aLocalizedStrings.GetString(26)), - rtl::OUString(), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)), + OUString(), aPrintRangeOpt); // create a choice for the content to create - rtl::OUString aPrintRangeName( "PrintContent" ); - uno::Sequence< rtl::OUString > aChoices( 3 ); + OUString aPrintRangeName( "PrintContent" ); + uno::Sequence< OUString > aChoices( 3 ); uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); - uno::Sequence< rtl::OUString > aHelpIds( 3 ); - uno::Sequence< rtl::OUString > aWidgetIds( 3 ); + uno::Sequence< OUString > aHelpIds( 3 ); + uno::Sequence< OUString > aWidgetIds( 3 ); aChoices[0] = aLocalizedStrings.GetString( 27 ); aChoicesDisabled[0] = sal_False; - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aLocalizedStrings.GetString( 28 ); aChoicesDisabled[1] = sal_False; - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printpages"; aChoices[2] = aLocalizedStrings.GetString( 29 ); aChoicesDisabled[2] = sal_Bool(! bHasSelection); - aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselection"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, aChoices, 0 /* always default to 'All pages' */, aChoicesDisabled); // show an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); - m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange", - rtl::OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */, + OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */, aPageRangeOpt); // print content selection vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; - aContentsOpt.maGroupHint = rtl::OUString( "JobPage" ); - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", rtl::OUString(aLocalizedStrings.GetString(12)), - rtl::OUString(), aContentsOpt); + aContentsOpt.maGroupHint = OUString( "JobPage" ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)), + OUString(), aContentsOpt); // create a list box for notes content const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts(); aChoices.realloc( 4 ); @@ -342,14 +341,14 @@ SwPrintUIOptions::SwPrintUIOptions( aChoices[2] = aLocalizedStrings.GetString( 15 ); aChoices[3] = aLocalizedStrings.GetString( 16 ); aHelpIds.realloc( 2 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); - vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( "PrintProspect" ), 0, sal_False ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); + vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", aLocalizedStrings.GetString( 17 ), aHelpIds, - rtl::OUString( "PrintAnnotationMode" ), + OUString( "PrintAnnotationMode" ), aChoices, nPrintPostIts, uno::Sequence< sal_Bool >(), @@ -357,18 +356,18 @@ SwPrintUIOptions::SwPrintUIOptions( // create subsection for Page settings vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt; - aPageSetOpt.maGroupHint = rtl::OUString( "LayoutPage" ); + aPageSetOpt.maGroupHint = OUString( "LayoutPage" ); if (!bWeb) { - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", rtl::OUString(aLocalizedStrings.GetString(18)), - rtl::OUString(), aPageSetOpt); - uno::Sequence< rtl::OUString > aRLChoices( 3 ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", OUString(aLocalizedStrings.GetString(18)), + OUString(), aPageSetOpt); + uno::Sequence< OUString > aRLChoices( 3 ); aRLChoices[0] = aLocalizedStrings.GetString( 19 ); aRLChoices[1] = aLocalizedStrings.GetString( 20 ); aRLChoices[2] = aLocalizedStrings.GetString( 21 ); - uno::Sequence< rtl::OUString > aRLHelp( 1 ); - aRLHelp[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); + uno::Sequence< OUString > aRLHelp( 1 ); + aRLHelp[0] = OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); // create a choice option for all/left/right pages // 0 : all pages (left & right) // 1 : left pages @@ -390,7 +389,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for brochure bDefaultVal = rDefaultPrintData.IsPrintProspect(); - rtl::OUString aBrochurePropertyName( "PrintProspect" ); + OUString aBrochurePropertyName( "PrintProspect" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox", aBrochurePropertyName, @@ -400,21 +399,21 @@ SwPrintUIOptions::SwPrintUIOptions( if (bCTL) { // create a bool option for brochure RTL dependent on brochure - uno::Sequence< rtl::OUString > aBRTLChoices( 2 ); + uno::Sequence< OUString > aBRTLChoices( 2 ); aBRTLChoices[0] = aLocalizedStrings.GetString( 24 ); aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); - uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 ); - aBRTLHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); - aBrochureRTLOpt.maGroupHint = rtl::OUString( "LayoutPage" ); + uno::Sequence< OUString > aBRTLHelpIds( 1 ); + aBRTLHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); + aBrochureRTLOpt.maGroupHint = OUString( "LayoutPage" ); // RTL brochure choices // 0 : left-to-right // 1 : right-to-left const sal_Int16 nBRTLChoice = rDefaultPrintData.IsPrintProspectRTL() ? 1 : 0; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection", - rtl::OUString(), + OUString(), aBRTLHelpIds, - rtl::OUString( "PrintProspectRTL" ), + OUString( "PrintProspectRTL" ), aBRTLChoices, nBRTLChoice, uno::Sequence< sal_Bool >(), @@ -501,7 +500,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea bool bChanged = processProperties( i_rNewProp ); uno::Reference< awt::XDevice > xRenderDevice; - uno::Any aVal( getValue( rtl::OUString( "RenderDevice" ) ) ); + uno::Any aVal( getValue( OUString( "RenderDevice" ) ) ); aVal >>= xRenderDevice; OutputDevice* pOut = 0; diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index a9ba9214a146..e22ec0f07cb1 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -241,7 +241,7 @@ void SwViewImp::MakeDrawView() pDrawView = new SwDrawView( *this, pIDDMA->GetDrawModel(), pOutDevForDrawView); } - GetDrawView()->SetActiveLayer(rtl::OUString("Heaven")); + GetDrawView()->SetActiveLayer(OUString("Heaven")); const SwViewOption* pSwViewOption = GetShell()->GetViewOptions(); Init(pSwViewOption); |