diff options
27 files changed, 614 insertions, 614 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 6d8db6866f80..b707c8c179ad 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -105,19 +105,19 @@ public: inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {} inline - ::css::uno::WeakReference< ::css::accessibility::XAccessible > const & + css::uno::WeakReference< css::accessibility::XAccessible > const & getParagraph() const { return m_xParagraph; } inline ::sal_Int32 getHeight() const { return m_nHeight; } inline void setParagraph( - ::css::uno::Reference< ::css::accessibility::XAccessible > const & + css::uno::Reference< css::accessibility::XAccessible > const & rParagraph) { m_xParagraph = rParagraph; } inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; } private: - ::css::uno::WeakReference< ::css::accessibility::XAccessible > + css::uno::WeakReference< css::accessibility::XAccessible > m_xParagraph; ::sal_Int32 m_nHeight; }; @@ -125,13 +125,13 @@ private: typedef ::std::vector< ParagraphInfo > Paragraphs; typedef ::cppu::WeakAggComponentImplHelper7< - ::css::accessibility::XAccessible, - ::css::accessibility::XAccessibleContext, - ::css::accessibility::XAccessibleComponent, - ::css::accessibility::XAccessibleEditableText, - ::css::accessibility::XAccessibleMultiLineText, - ::css::accessibility::XAccessibleTextAttributes, - ::css::accessibility::XAccessibleEventBroadcaster > ParagraphBase; + css::accessibility::XAccessible, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEditableText, + css::accessibility::XAccessibleMultiLineText, + css::accessibility::XAccessibleTextAttributes, + css::accessibility::XAccessibleEventBroadcaster > ParagraphBase; // The Paragraph's number is the absolute position within the text engine (from // 0 to N - 1), whereas the Paragraph's index is the position within the text @@ -154,134 +154,134 @@ public: void textChanged(); // Thread-safe. - void notifyEvent(::sal_Int16 nEventId, ::css::uno::Any const & rOldValue, - ::css::uno::Any const & rNewValue); + void notifyEvent(::sal_Int16 nEventId, css::uno::Any const & rOldValue, + css::uno::Any const & rNewValue); protected: // OCommonAccessibleText - virtual void implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, + virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::css::i18n::Boundary& rBoundary, + virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ); private: - virtual ::css::uno::Reference< ::css::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw (::css::uno::RuntimeException); + virtual css::uno::Reference< css::accessibility::XAccessibleContext > + SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); - virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(::sal_Int32 i) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); - virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (::css::uno::RuntimeException); + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleParent() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual OUString SAL_CALL getAccessibleDescription() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual OUString SAL_CALL getAccessibleName() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual - ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > - SAL_CALL getAccessibleRelationSet() throw (::css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessibleRelationSet > + SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException); virtual - ::css::uno::Reference< ::css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (css::uno::RuntimeException); - virtual ::css::lang::Locale SAL_CALL getLocale() - throw (::css::accessibility::IllegalAccessibleComponentStateException, - ::css::uno::RuntimeException); + virtual css::lang::Locale SAL_CALL getLocale() + throw (css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL containsPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException); - virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException); + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException); - virtual ::css::awt::Rectangle SAL_CALL getBounds() - throw (::css::uno::RuntimeException); + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException); - virtual ::css::awt::Point SAL_CALL getLocation() - throw (::css::uno::RuntimeException); + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException); - virtual ::css::awt::Point SAL_CALL getLocationOnScreen() - throw (::css::uno::RuntimeException); + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException); - virtual ::css::awt::Size SAL_CALL getSize() - throw (::css::uno::RuntimeException); + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::css::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException); - virtual ::css::uno::Any SAL_CALL getAccessibleKeyBinding() - throw (::css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getAccessibleKeyBinding() + throw (css::uno::RuntimeException); - virtual ::css::util::Color SAL_CALL getForeground() - throw (::css::uno::RuntimeException); + virtual css::util::Color SAL_CALL getForeground() + throw (css::uno::RuntimeException); - virtual ::css::util::Color SAL_CALL getBackground() - throw (::css::uno::RuntimeException); + virtual css::util::Color SAL_CALL getBackground() + throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCaretPosition() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); - virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); - virtual ::css::awt::Rectangle SAL_CALL + virtual css::awt::Rectangle SAL_CALL getCharacterBounds(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCharacterCount() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL - getIndexAtPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException); + getIndexAtPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException); virtual OUString SAL_CALL getSelectedText() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getSelectionStart() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getSelectionEnd() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual OUString SAL_CALL getText() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::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); @@ -289,52 +289,52 @@ private: virtual ::sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL insertText(OUString const & rText, ::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL replaceText( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, OUString const & rReplacement) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL setAttributes( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, - ::css::uno::Sequence< ::css::beans::PropertyValue > const & + css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL setText(OUString const & rText) - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); - virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL - getDefaultAttributes(const ::css::uno::Sequence< OUString >& RequestedAttributes) - throw (::css::uno::RuntimeException); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) + throw (css::uno::RuntimeException); - virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL - getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< OUString >& RequestedAttributes) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, @@ -351,25 +351,25 @@ private: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addAccessibleEventListener( - ::css::uno::Reference< - ::css::accessibility::XAccessibleEventListener > const & rListener) - throw (::css::uno::RuntimeException); + css::uno::Reference< + css::accessibility::XAccessibleEventListener > const & rListener) + throw (css::uno::RuntimeException); virtual void SAL_CALL removeAccessibleEventListener( - ::css::uno::Reference< - ::css::accessibility::XAccessibleEventListener > const & rListener) - throw (::css::uno::RuntimeException); + css::uno::Reference< + css::accessibility::XAccessibleEventListener > const & rListener) + throw (css::uno::RuntimeException); virtual void SAL_CALL disposing(); virtual OUString implGetText(); - virtual ::css::lang::Locale implGetLocale(); + virtual css::lang::Locale implGetLocale(); virtual void implGetSelection(::sal_Int32 & rStartIndex, ::sal_Int32 & rEndIndex); - // Throws ::css::lang::DisposedException: + // Throws css::lang::DisposedException: void checkDisposed(); ::rtl::Reference< Document > m_xDocument; @@ -384,7 +384,7 @@ private: typedef ::boost::unordered_map< OUString, - ::css::beans::PropertyValue, + css::beans::PropertyValue, OUStringHash, ::std::equal_to< OUString > > tPropValMap; @@ -394,11 +394,11 @@ public: Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, ::TextView & rView, bool bCompoundControlChild); - inline ::css::uno::Reference< ::css::accessibility::XAccessible > + inline css::uno::Reference< css::accessibility::XAccessible > getAccessible() { return m_xAccessible; } // Must be called only after init has been called. - ::css::lang::Locale retrieveLocale(); + css::lang::Locale retrieveLocale(); // Must be called only after init has been called. // To make it possible for this method to be (indirectly) called from @@ -419,7 +419,7 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - ::css::awt::Rectangle + css::awt::Rectangle retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute); // Must be called only after init has been called. @@ -449,8 +449,8 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. - ::css::awt::Rectangle + // Throws css::lang::IndexOutOfBoundsException. + css::awt::Rectangle retrieveCharacterBounds(ParagraphImpl const * pParagraph, ::sal_Int32 nIndex); @@ -460,36 +460,36 @@ public: // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". ::sal_Int32 retrieveCharacterIndex(ParagraphImpl const * pParagraph, - ::css::awt::Point const & rPoint); + css::awt::Point const & rPoint); // Must be called only after init has been called. // To make it possible for this method to be (indirectly) called from // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. - ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveCharacterAttributes( + // Throws css::lang::IndexOutOfBoundsException. + css::uno::Sequence< css::beans::PropertyValue > retrieveCharacterAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, - const ::css::uno::Sequence< OUString >& aRequestedAttributes); + const css::uno::Sequence< OUString >& aRequestedAttributes); // Must be called only after init has been called. // To make it possible for this method to be (indirectly) called from // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveDefaultAttributes( + css::uno::Sequence< css::beans::PropertyValue > retrieveDefaultAttributes( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< OUString >& RequestedAttributes); + const css::uno::Sequence< OUString >& RequestedAttributes); // Must be called only after init has been called. // To make it possible for this method to be (indirectly) called from // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. - ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveRunAttributes( + // Throws css::lang::IndexOutOfBoundsException. + css::uno::Sequence< css::beans::PropertyValue > retrieveRunAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< OUString >& RequestedAttributes); + const css::uno::Sequence< OUString >& RequestedAttributes); // Must be called only after init has been called. // To make it possible for this method to be (indirectly) called from @@ -504,7 +504,7 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. + // Throws css::lang::IndexOutOfBoundsException. void changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, bool bCut, bool bPaste, OUString const & rText); @@ -514,7 +514,7 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. + // Throws css::lang::IndexOutOfBoundsException. void copyParagraphText(ParagraphImpl const * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd); @@ -523,10 +523,10 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. + // Throws css::lang::IndexOutOfBoundsException. void changeParagraphAttributes( ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, - ::css::uno::Sequence< ::css::beans::PropertyValue > const & + css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet); // Must be called only after init has been called. @@ -534,21 +534,21 @@ public: // within Paragraph's constructor (i.e., when the Paragraph's ref count is // still zero), pass a "ParagraphImpl const &" instead of a // "::rtl::Reference< ParagraphImpl > const &". - // Throws ::css::lang::IndexOutOfBoundsException. + // Throws css::lang::IndexOutOfBoundsException. void changeParagraphSelection(ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd); - ::css::i18n::Boundary + css::i18n::Boundary retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL); - ::css::i18n::Boundary + css::i18n::Boundary retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex ); sal_Int32 retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph ); - ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > + css::uno::Reference< css::accessibility::XAccessibleRelationSet > retrieveParagraphRelationSet( ParagraphImpl const * pParagraph ); protected: @@ -557,19 +557,19 @@ protected: private: virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); - virtual ::css::uno::Reference< ::css::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(::sal_Int32 i) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::css::uno::RuntimeException); + throw (css::uno::RuntimeException); - virtual ::css::uno::Reference< ::css::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException); + virtual css::uno::Reference< css::accessibility::XAccessible > + SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException); // ??? Will be called with both the external (Solar) and internal mutex // locked: @@ -595,8 +595,8 @@ private: // Must be called with both the external (Solar) and internal mutex // locked, and after init has been called. - // Throws ::css::uno::RuntimeException. - ::css::uno::Reference< ::css::accessibility::XAccessible > + // Throws css::uno::RuntimeException. + css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild(Paragraphs::iterator const & rIt); // Must be called with both the external (Solar) and internal mutex @@ -627,28 +627,28 @@ private: void disposeParagraphs(); - static ::css::uno::Any mapFontColor(::Color const & rColor); + static css::uno::Any mapFontColor(::Color const & rColor); - static ::Color mapFontColor(::css::uno::Any const & rColor); + static ::Color mapFontColor(css::uno::Any const & rColor); - static ::css::uno::Any mapFontWeight(::FontWeight nWeight); + static css::uno::Any mapFontWeight(::FontWeight nWeight); - static ::FontWeight mapFontWeight(::css::uno::Any const & rWeight); + static ::FontWeight mapFontWeight(css::uno::Any const & rWeight); void retrieveDefaultAttributesImpl( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< OUString >& RequestedAttributes, + const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rDefAttrSeq); void retrieveRunAttributesImpl( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< OUString >& RequestedAttributes, + const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rRunAttrSeq); - static ::css::uno::Sequence< ::css::beans::PropertyValue > + static css::uno::Sequence< css::beans::PropertyValue > convertHashMapToSequence(tPropValMap& rAttrSeq); - ::css::uno::Reference< ::css::accessibility::XAccessible > m_xAccessible; + css::uno::Reference< css::accessibility::XAccessible > m_xAccessible; ::TextEngine & m_rEngine; ::TextView & m_rView; diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 6c4fc08e791c..d332ede47186 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -97,29 +97,29 @@ ParagraphImpl::numberChanged(bool bIncremented) void ParagraphImpl::textChanged() { OUString aParagraphText = implGetText(); - ::css::uno::Any aOldValue, aNewValue; + css::uno::Any aOldValue, aNewValue; if ( implInitTextChangedEvent( m_aParagraphText, aParagraphText, aOldValue, aNewValue ) ) { m_aParagraphText = aParagraphText; - notifyEvent(::css::accessibility::AccessibleEventId:: + notifyEvent(css::accessibility::AccessibleEventId:: TEXT_CHANGED, aOldValue, aNewValue); } } void ParagraphImpl::notifyEvent(::sal_Int16 nEventId, - ::css::uno::Any const & rOldValue, - ::css::uno::Any const & rNewValue) + css::uno::Any const & rOldValue, + css::uno::Any const & rNewValue) { if (m_nClientId) - comphelper::AccessibleEventNotifier::addEvent( m_nClientId, ::css::accessibility::AccessibleEventObject( + comphelper::AccessibleEventNotifier::addEvent( m_nClientId, css::accessibility::AccessibleEventObject( static_cast< ::cppu::OWeakObject * >(this), nEventId, rNewValue, rOldValue) ); } // virtual -::css::uno::Reference< ::css::accessibility::XAccessibleContext > SAL_CALL -ParagraphImpl::getAccessibleContext() throw (::css::uno::RuntimeException) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL +ParagraphImpl::getAccessibleContext() throw (css::uno::RuntimeException) { checkDisposed(); return this; @@ -127,29 +127,29 @@ ParagraphImpl::getAccessibleContext() throw (::css::uno::RuntimeException) // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleChildCount() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return 0; } // virtual -::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL ParagraphImpl::getAccessibleChild(::sal_Int32) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " ParagraphImpl::getAccessibleChild", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); } // virtual -::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL ParagraphImpl::getAccessibleParent() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->getAccessible(); @@ -157,7 +157,7 @@ ParagraphImpl::getAccessibleParent() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleIndexInParent() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveParagraphIndex(this); @@ -165,15 +165,15 @@ ParagraphImpl::getAccessibleParent() // virtual ::sal_Int16 SAL_CALL ParagraphImpl::getAccessibleRole() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); - return ::css::accessibility::AccessibleRole::PARAGRAPH; + return css::accessibility::AccessibleRole::PARAGRAPH; } // virtual OUString SAL_CALL ParagraphImpl::getAccessibleDescription() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OUString(); @@ -181,25 +181,25 @@ OUString SAL_CALL ParagraphImpl::getAccessibleDescription() // virtual OUString SAL_CALL ParagraphImpl::getAccessibleName() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OUString(); } // virtual -::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > +css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL ParagraphImpl::getAccessibleRelationSet() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveParagraphRelationSet( this ); } // virtual -::css::uno::Reference< ::css::accessibility::XAccessibleStateSet > +css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL ParagraphImpl::getAccessibleStateSet() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); @@ -210,74 +210,74 @@ SAL_CALL ParagraphImpl::getAccessibleStateSet() } // virtual -::css::lang::Locale SAL_CALL ParagraphImpl::getLocale() - throw (::css::accessibility::IllegalAccessibleComponentStateException, - ::css::uno::RuntimeException) +css::lang::Locale SAL_CALL ParagraphImpl::getLocale() + throw (css::accessibility::IllegalAccessibleComponentStateException, + css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveLocale(); } // virtual -::sal_Bool SAL_CALL ParagraphImpl::containsPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException) +::sal_Bool SAL_CALL ParagraphImpl::containsPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, + css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, false)); return rPoint.X >= 0 && rPoint.X < aRect.Width && rPoint.Y >= 0 && rPoint.Y < aRect.Height; } // virtual -::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL -ParagraphImpl::getAccessibleAtPoint(::css::awt::Point const &) - throw (::css::uno::RuntimeException) +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL +ParagraphImpl::getAccessibleAtPoint(css::awt::Point const &) + throw (css::uno::RuntimeException) { checkDisposed(); return 0; } // virtual -::css::awt::Rectangle SAL_CALL ParagraphImpl::getBounds() - throw (::css::uno::RuntimeException) +css::awt::Rectangle SAL_CALL ParagraphImpl::getBounds() + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveParagraphBounds(this, false); } // virtual -::css::awt::Point SAL_CALL ParagraphImpl::getLocation() - throw (::css::uno::RuntimeException) +css::awt::Point SAL_CALL ParagraphImpl::getLocation() + throw (css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, + css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, false)); - return ::css::awt::Point(aRect.X, aRect.Y); + return css::awt::Point(aRect.X, aRect.Y); } // virtual -::css::awt::Point SAL_CALL ParagraphImpl::getLocationOnScreen() - throw (::css::uno::RuntimeException) +css::awt::Point SAL_CALL ParagraphImpl::getLocationOnScreen() + throw (css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, + css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, true)); - return ::css::awt::Point(aRect.X, aRect.Y); + return css::awt::Point(aRect.X, aRect.Y); } // virtual -::css::awt::Size SAL_CALL ParagraphImpl::getSize() - throw (::css::uno::RuntimeException) +css::awt::Size SAL_CALL ParagraphImpl::getSize() + throw (css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, + css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, false)); - return ::css::awt::Size(aRect.Width, aRect.Height); + return css::awt::Size(aRect.Width, aRect.Height); } // virtual -void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) +void SAL_CALL ParagraphImpl::grabFocus() throw (css::uno::RuntimeException) { checkDisposed(); Window* pWindow = m_xDocument->GetWindow(); @@ -289,7 +289,7 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) { m_xDocument->changeParagraphSelection(this, 0, 0); } - catch (const ::css::lang::IndexOutOfBoundsException & rEx) + catch (const css::lang::IndexOutOfBoundsException & rEx) { OSL_TRACE( "textwindowaccessibility.cxx: ParagraphImpl::grabFocus:" @@ -300,30 +300,30 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) } // virtual -::css::uno::Any SAL_CALL ParagraphImpl::getAccessibleKeyBinding() - throw (::css::uno::RuntimeException) +css::uno::Any SAL_CALL ParagraphImpl::getAccessibleKeyBinding() + throw (css::uno::RuntimeException) { checkDisposed(); - return ::css::uno::Any(); + return css::uno::Any(); } // virtual -::css::util::Color SAL_CALL ParagraphImpl::getForeground() - throw (::css::uno::RuntimeException) +css::util::Color SAL_CALL ParagraphImpl::getForeground() + throw (css::uno::RuntimeException) { return 0; // TODO } // virtual -::css::util::Color SAL_CALL ParagraphImpl::getBackground() - throw (::css::uno::RuntimeException) +css::util::Color SAL_CALL ParagraphImpl::getBackground() + throw (css::uno::RuntimeException) { return 0; // TODO } // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getCaretPosition() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveParagraphCaretPosition(this); @@ -331,8 +331,8 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) // virtual ::sal_Bool SAL_CALL ParagraphImpl::setCaretPosition(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nIndex, nIndex); @@ -341,32 +341,32 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) // virtual ::sal_Unicode SAL_CALL ParagraphImpl::getCharacter(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getCharacter(nIndex); } // virtual -::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveCharacterAttributes( this, nIndex, aRequestedAttributes ); } // virtual -::css::awt::Rectangle SAL_CALL +css::awt::Rectangle SAL_CALL ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex)); - ::css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false)); + css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex)); + css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false)); aBounds.X -= aParaBounds.X; aBounds.Y -= aParaBounds.Y; return aBounds; @@ -374,7 +374,7 @@ ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getCharacterCount() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getCharacterCount(); @@ -382,12 +382,12 @@ ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL -ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException) +ParagraphImpl::getIndexAtPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException) { checkDisposed(); - ::css::awt::Point aPoint(rPoint); - ::css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false)); + css::awt::Point aPoint(rPoint); + css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false)); aPoint.X += aParaBounds.X; aPoint.Y += aParaBounds.Y; return m_xDocument->retrieveCharacterIndex(this, aPoint); @@ -395,7 +395,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) // virtual OUString SAL_CALL ParagraphImpl::getSelectedText() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); @@ -404,7 +404,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getSelectionStart() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getSelectionStart(); @@ -412,7 +412,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getSelectionEnd() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getSelectionEnd(); @@ -421,8 +421,8 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual ::sal_Bool SAL_CALL ParagraphImpl::setSelection(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nStartIndex, nEndIndex); @@ -431,7 +431,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual OUString SAL_CALL ParagraphImpl::getText() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getText(); @@ -440,8 +440,8 @@ OUString SAL_CALL ParagraphImpl::getText() // virtual OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex); @@ -471,8 +471,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::copyText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->copyParagraphText(this, nStartIndex, nEndIndex); @@ -482,8 +482,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::cutText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false, @@ -493,8 +493,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::pasteText(::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true, @@ -505,8 +505,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::deleteText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -517,8 +517,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::insertText(OUString const & rText, ::sal_Int32 nIndex) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, false, rText); @@ -529,8 +529,8 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Bool SAL_CALL ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, OUString const & rReplacement) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -541,9 +541,9 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::setAttributes( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, - ::css::uno::Sequence< ::css::beans::PropertyValue > const & rAttributeSet) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphAttributes(this, nStartIndex, nEndIndex, @@ -553,7 +553,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::setText(OUString const & rText) - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); m_xDocument->changeParagraphText(this, rText); @@ -561,19 +561,19 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, } // virtual -::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL -ParagraphImpl::getDefaultAttributes(const ::css::uno::Sequence< OUString >& RequestedAttributes) - throw (::css::uno::RuntimeException) +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL +ParagraphImpl::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes ); } // virtual -::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL -ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< OUString >& RequestedAttributes) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL +ParagraphImpl::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes ); @@ -581,8 +581,8 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex ) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); @@ -593,22 +593,22 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O } // virtual -::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) +css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { checkDisposed(); - ::css::i18n::Boundary aBoundary = + css::i18n::Boundary aBoundary = m_xDocument->retrieveParagraphBoundaryOfLine( this, nLineNo ); - return ::css::accessibility::TextSegment( getTextRange(aBoundary.startPos, aBoundary.endPos), + return css::accessibility::TextSegment( getTextRange(aBoundary.startPos, aBoundary.endPos), aBoundary.startPos, aBoundary.endPos); } // virtual -::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( ) - throw (::css::uno::RuntimeException) +css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( ) + throw (css::uno::RuntimeException) { checkDisposed(); @@ -617,18 +617,18 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O try { return ( nLineNo >= 0 ) ? getTextAtLineNumber( nLineNo ) : - ::css::accessibility::TextSegment(); - } catch (const ::css::lang::IndexOutOfBoundsException&) { - throw ::css::uno::RuntimeException( + css::accessibility::TextSegment(); + } catch (const css::lang::IndexOutOfBoundsException&) { + throw css::uno::RuntimeException( "textwindowaccessibility.cxx:" " ParagraphImpl::getTextAtLineWithCaret", - static_cast< ::css::uno::XWeak * >( this ) ); + static_cast< css::uno::XWeak * >( this ) ); } } // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret( ) - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { checkDisposed(); return m_xDocument->retrieveParagraphLineWithCursor(this); @@ -637,9 +637,9 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O // virtual void SAL_CALL ParagraphImpl::addAccessibleEventListener( - ::css::uno::Reference< - ::css::accessibility::XAccessibleEventListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< + css::accessibility::XAccessibleEventListener > const & rListener) + throw (css::uno::RuntimeException) { if (rListener.is()) { @@ -647,7 +647,7 @@ void SAL_CALL ParagraphImpl::addAccessibleEventListener( if (rBHelper.bDisposed || rBHelper.bInDispose) { aGuard.clear(); - rListener->disposing(::css::lang::EventObject( + rListener->disposing(css::lang::EventObject( static_cast< ::cppu::OWeakObject * >(this))); } else @@ -661,9 +661,9 @@ void SAL_CALL ParagraphImpl::addAccessibleEventListener( // virtual void SAL_CALL ParagraphImpl::removeAccessibleEventListener( - ::css::uno::Reference< - ::css::accessibility::XAccessibleEventListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< + css::accessibility::XAccessibleEventListener > const & rListener) + throw (css::uno::RuntimeException) { comphelper::AccessibleEventNotifier::TClientId nId = 0; { @@ -705,7 +705,7 @@ OUString ParagraphImpl::implGetText() } // virtual -::css::lang::Locale ParagraphImpl::implGetLocale() +css::lang::Locale ParagraphImpl::implGetLocale() { return m_xDocument->retrieveLocale(); } @@ -718,7 +718,7 @@ void ParagraphImpl::implGetSelection(::sal_Int32 & rStartIndex, } // virtual -void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, +void ParagraphImpl::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -737,7 +737,7 @@ void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, } // virtual -void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary, +void ParagraphImpl::implGetLineBoundary( css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -745,7 +745,7 @@ void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary, if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) { - ::css::i18n::Boundary aBoundary = + css::i18n::Boundary aBoundary = m_xDocument->retrieveParagraphLineBoundary( this, nIndex ); rBoundary.startPos = aBoundary.startPos; rBoundary.endPos = aBoundary.endPos; @@ -763,8 +763,8 @@ void ParagraphImpl::checkDisposed() ::osl::MutexGuard aGuard(rBHelper.rMutex); if (!(rBHelper.bDisposed || rBHelper.bInDispose)) return; - throw ::css::lang::DisposedException( - OUString(), static_cast< ::css::uno::XWeak * >(this)); + throw css::lang::DisposedException( + OUString(), static_cast< css::uno::XWeak * >(this)); } Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, @@ -786,7 +786,7 @@ Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, m_bCompoundControlChild(bCompoundControlChild) {} -::css::lang::Locale Document::retrieveLocale() +css::lang::Locale Document::retrieveLocale() { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); return m_rEngine.GetLocale(); @@ -815,33 +815,33 @@ Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, // to m_aVisibleEnd. In that case, it is neither VISIBLE nor SHOWING: ::sal_Int64 nState = (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::ENABLED) + << css::accessibility::AccessibleStateType::ENABLED) | (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::SENSITIVE) + << css::accessibility::AccessibleStateType::SENSITIVE) | (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::FOCUSABLE) + << css::accessibility::AccessibleStateType::FOCUSABLE) | (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::MULTI_LINE); + << css::accessibility::AccessibleStateType::MULTI_LINE); if (!m_rView.IsReadOnly()) nState |= (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::EDITABLE); + << css::accessibility::AccessibleStateType::EDITABLE); Paragraphs::iterator aPara(m_xParagraphs->begin() + pParagraph->getNumber()); if (aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd) { nState |= (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::VISIBLE) + << css::accessibility::AccessibleStateType::VISIBLE) | (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::SHOWING); + << css::accessibility::AccessibleStateType::SHOWING); if (aPara == m_aFocused) nState |= (static_cast< ::sal_Int64 >(1) - << ::css::accessibility::AccessibleStateType::FOCUSED); + << css::accessibility::AccessibleStateType::FOCUSED); } return nState; }; -::css::awt::Rectangle +css::awt::Rectangle Document::retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute) { @@ -874,7 +874,7 @@ Document::retrieveParagraphBounds(ParagraphImpl const * pParagraph, if (bAbsolute) aOrig = m_rView.GetWindow()->OutputToAbsoluteScreenPixel(aOrig); - return ::css::awt::Rectangle( + return css::awt::Rectangle( static_cast< ::sal_Int32 >(aOrig.X()), static_cast< ::sal_Int32 >(aOrig.Y()) + nPos - m_nViewOffset, m_rView.GetWindow()->GetOutputSizePixel().Width(), aPara->getHeight()); @@ -936,7 +936,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph, ? static_cast< ::sal_Int32 >(aEndPaM.GetIndex()) : -1; } -::css::awt::Rectangle +css::awt::Rectangle Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, ::sal_Int32 nIndex) { @@ -946,11 +946,11 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, sal_Int32 nLength = m_rEngine.GetText(nNumber).Len(); // XXX numeric overflow if (nIndex < 0 || nIndex > nLength) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::retrieveCharacterAttributes", - static_cast< ::css::uno::XWeak * >(this)); - ::css::awt::Rectangle aBounds( 0, 0, 0, 0 ); + static_cast< css::uno::XWeak * >(this)); + css::awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( nIndex == nLength ) { aBounds = AWTRectangle( @@ -977,7 +977,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, : static_cast< ::sal_Int32 >(m_rEngine.GetMaxTextWidth() - aLeft.Left()); // XXX numeric overflow (4x) - aBounds = ::css::awt::Rectangle(static_cast< ::sal_Int32 >(aLeft.Left()), + aBounds = css::awt::Rectangle(static_cast< ::sal_Int32 >(aLeft.Left()), static_cast< ::sal_Int32 >(aLeft.Top() - m_nViewOffset), nWidth, static_cast< ::sal_Int32 >(aLeft.Bottom() @@ -988,7 +988,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, } ::sal_Int32 Document::retrieveCharacterIndex(ParagraphImpl const * pParagraph, - ::css::awt::Point const & rPoint) + css::awt::Point const & rPoint) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); ::osl::MutexGuard aInternalGuard(GetMutex()); @@ -1002,20 +1002,20 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, // XXX numeric overflow } -::css::uno::Sequence< ::css::beans::PropertyValue > +css::uno::Sequence< css::beans::PropertyValue > Document::retrieveCharacterAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, - const ::css::uno::Sequence< OUString >& aRequestedAttributes) + const css::uno::Sequence< OUString >& aRequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); ::osl::MutexGuard aInternalGuard(GetMutex()); ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber()); // XXX numeric overflow if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len()) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::retrieveCharacterAttributes", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); // retrieve default attributes tPropValMap aCharAttrSeq; @@ -1038,7 +1038,7 @@ Document::retrieveCharacterAttributes( void Document::retrieveDefaultAttributesImpl( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< OUString >& RequestedAttributes, + const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rDefAttrSeq) { // default attributes are not supported by text engine @@ -1047,10 +1047,10 @@ void Document::retrieveDefaultAttributesImpl( (void) rDefAttrSeq; } -::css::uno::Sequence< ::css::beans::PropertyValue > +css::uno::Sequence< css::beans::PropertyValue > Document::retrieveDefaultAttributes( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< OUString >& RequestedAttributes) + const css::uno::Sequence< OUString >& RequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() ); ::osl::MutexGuard aInternalGuard( GetMutex() ); @@ -1061,11 +1061,11 @@ Document::retrieveDefaultAttributes( } // static -::css::uno::Sequence< ::css::beans::PropertyValue > +css::uno::Sequence< css::beans::PropertyValue > Document::convertHashMapToSequence(tPropValMap& rAttrSeq) { - ::css::uno::Sequence< ::css::beans::PropertyValue > aValues( rAttrSeq.size() ); - ::css::beans::PropertyValue* pValues = aValues.getArray(); + css::uno::Sequence< css::beans::PropertyValue > aValues( rAttrSeq.size() ); + css::beans::PropertyValue* pValues = aValues.getArray(); ::sal_Int32 i = 0; for ( tPropValMap::const_iterator aIter = rAttrSeq.begin(); aIter != rAttrSeq.end(); @@ -1079,7 +1079,7 @@ Document::convertHashMapToSequence(tPropValMap& rAttrSeq) void Document::retrieveRunAttributesImpl( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< OUString >& RequestedAttributes, + const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rRunAttrSeq) { ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); @@ -1095,20 +1095,20 @@ void Document::retrieveRunAttributesImpl( tPropValMap aRunAttrSeq; if ( pColor ) { - ::css::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = "CharColor"; aPropVal.Handle = -1; aPropVal.Value = mapFontColor( pColor->GetColor() ); - aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE; + aPropVal.State = css::beans::PropertyState_DIRECT_VALUE; aRunAttrSeq[ aPropVal.Name ] = aPropVal; } if ( pWeight ) { - ::css::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = "CharWeight"; aPropVal.Handle = -1; aPropVal.Value = mapFontWeight( pWeight->getFontWeight() ); - aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE; + aPropVal.State = css::beans::PropertyState_DIRECT_VALUE; aRunAttrSeq[ aPropVal.Name ] = aPropVal; } if ( RequestedAttributes.getLength() == 0 ) @@ -1130,20 +1130,20 @@ void Document::retrieveRunAttributesImpl( } } -::css::uno::Sequence< ::css::beans::PropertyValue > +css::uno::Sequence< css::beans::PropertyValue > Document::retrieveRunAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< OUString >& RequestedAttributes) + const css::uno::Sequence< OUString >& RequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() ); ::osl::MutexGuard aInternalGuard( GetMutex() ); ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); // XXX numeric overflow if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() ) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::retrieveRunAttributes", - static_cast< ::css::uno::XWeak * >( this ) ); + static_cast< css::uno::XWeak * >( this ) ); tPropValMap aRunAttrSeq; retrieveRunAttributesImpl( pParagraph, Index, RequestedAttributes, aRunAttrSeq ); @@ -1175,10 +1175,10 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph, // XXX numeric overflow if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::changeParagraphText", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin), static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText); // XXX numeric overflow (2x) @@ -1195,10 +1195,10 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph, // XXX numeric overflow if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::copyParagraphText", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); m_rView.SetSelection( ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)), ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd)))); @@ -1209,7 +1209,7 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph, void Document::changeParagraphAttributes( ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, - ::css::uno::Sequence< ::css::beans::PropertyValue > const & rAttributeSet) + css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); { @@ -1218,10 +1218,10 @@ void Document::changeParagraphAttributes( // XXX numeric overflow if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::changeParagraphAttributes", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); // FIXME The new attributes are added to any attributes already set, // they do not replace the old attributes as required by @@ -1252,10 +1252,10 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph, // XXX numeric overflow if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::changeParagraphSelection", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); m_rView.SetSelection( ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)), ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd)))); @@ -1263,11 +1263,11 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph, } } -::css::i18n::Boundary +css::i18n::Boundary Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, ::sal_Int32 *pLineNo ) { - ::css::i18n::Boundary aBoundary; + css::i18n::Boundary aBoundary; aBoundary.startPos = nIndex; aBoundary.endPos = nIndex; @@ -1276,10 +1276,10 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, ::osl::MutexGuard aInternalGuard( GetMutex() ); ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() ) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::retrieveParagraphLineBoundary", - static_cast< ::css::uno::XWeak * >( this ) ); + static_cast< css::uno::XWeak * >( this ) ); ::sal_Int32 nLineStart = 0; ::sal_Int32 nLineEnd = 0; ::sal_uInt16 nLineCount = m_rEngine.GetLineCount( nNumber ); @@ -1303,11 +1303,11 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, return aBoundary; } -::css::i18n::Boundary +css::i18n::Boundary Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, ::sal_Int32 nLineNo ) { - ::css::i18n::Boundary aBoundary; + css::i18n::Boundary aBoundary; aBoundary.startPos = 0; aBoundary.endPos = 0; @@ -1316,10 +1316,10 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, ::osl::MutexGuard aInternalGuard( GetMutex() ); ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) ) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::retrieveParagraphBoundaryOfLine", - static_cast< ::css::uno::XWeak * >( this ) ); + static_cast< css::uno::XWeak * >( this ) ); ::sal_Int32 nLineStart = 0; ::sal_Int32 nLineEnd = 0; for ( ::sal_uInt16 nLine = 0; nLine <= nLineNo; ++nLine ) @@ -1350,29 +1350,29 @@ sal_Int32 Document::retrieveParagraphLineWithCursor( ParagraphImpl const * pPara } -::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > +css::uno::Reference< css::accessibility::XAccessibleRelationSet > Document::retrieveParagraphRelationSet( ParagraphImpl const * pParagraph ) { ::osl::MutexGuard aInternalGuard( GetMutex() ); ::utl::AccessibleRelationSetHelper* pRelationSetHelper = new ::utl::AccessibleRelationSetHelper(); - ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; + css::uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; Paragraphs::iterator aPara( m_xParagraphs->begin() + pParagraph->getNumber() ); if ( aPara > m_aVisibleBegin && aPara < m_aVisibleEnd ) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aSequence(1); + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aSequence(1); aSequence[0] = getAccessibleChild( aPara - 1 ); - ::css::accessibility::AccessibleRelation aRelation( ::css::accessibility::AccessibleRelationType::CONTENT_FLOWS_FROM, aSequence ); + css::accessibility::AccessibleRelation aRelation( css::accessibility::AccessibleRelationType::CONTENT_FLOWS_FROM, aSequence ); pRelationSetHelper->AddRelation( aRelation ); } if ( aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd -1 ) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aSequence(1); + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aSequence(1); aSequence[0] = getAccessibleChild( aPara + 1 ); - ::css::accessibility::AccessibleRelation aRelation( ::css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ); + css::accessibility::AccessibleRelation aRelation( css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ); pRelationSetHelper->AddRelation( aRelation ); } @@ -1399,7 +1399,7 @@ void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // virtual ::sal_Int32 SAL_CALL Document::getAccessibleChildCount() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1407,33 +1407,33 @@ void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } // virtual -::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Document::getAccessibleChild(::sal_Int32 i) - throw (::css::lang::IndexOutOfBoundsException, - ::css::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException) { ::comphelper::OExternalLockGuard aGuard(this); init(); if (i < 0 || i >= m_aVisibleEnd - m_aVisibleBegin) - throw ::css::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( "textwindowaccessibility.cxx:" " Document::getAccessibleChild", - static_cast< ::css::uno::XWeak * >(this)); + static_cast< css::uno::XWeak * >(this)); return getAccessibleChild(m_aVisibleBegin + static_cast< Paragraphs::size_type >(i)); } // virtual ::sal_Int16 SAL_CALL Document::getAccessibleRole() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { - return ::css::accessibility::AccessibleRole::TEXT_FRAME; + return css::accessibility::AccessibleRole::TEXT_FRAME; } // virtual -::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL -Document::getAccessibleAtPoint(::css::awt::Point const & rPoint) - throw (::css::uno::RuntimeException) +css::uno::Reference< css::accessibility::XAccessible > SAL_CALL +Document::getAccessibleAtPoint(css::awt::Point const & rPoint) + throw (css::uno::RuntimeException) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1603,11 +1603,11 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) getParagraph(m_aFocused)); if (xParagraph.is()) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::Any(), - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType:: + css::uno::Any(), + css::uno::makeAny( + css::accessibility::AccessibleStateType:: FOCUSED)); } break; @@ -1624,12 +1624,12 @@ IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent) getParagraph(m_aFocused)); if (xParagraph.is()) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType:: + css::uno::makeAny( + css::accessibility::AccessibleStateType:: FOCUSED), - ::css::uno::Any()); + css::uno::Any()); } break; } @@ -1673,14 +1673,14 @@ void Document::init() Document::getParagraph(Paragraphs::iterator const & rIt) { return static_cast< ParagraphImpl * >( - ::css::uno::Reference< ::css::accessibility::XAccessible >( + css::uno::Reference< css::accessibility::XAccessible >( rIt->getParagraph()).get()); } -::css::uno::Reference< ::css::accessibility::XAccessible > +css::uno::Reference< css::accessibility::XAccessible > Document::getAccessibleChild(Paragraphs::iterator const & rIt) { - ::css::uno::Reference< ::css::accessibility::XAccessible > xParagraph( + css::uno::Reference< css::accessibility::XAccessible > xParagraph( rIt->getParagraph()); if (!xParagraph.is()) { @@ -1739,10 +1739,10 @@ void Document::notifyVisibleRangeChanges( if (aIt != rInserted && (aIt < m_aVisibleBegin || aIt >= m_aVisibleEnd)) NotifyAccessibleEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: CHILD, - ::css::uno::makeAny(getAccessibleChild(aIt)), - ::css::uno::Any()); + css::uno::makeAny(getAccessibleChild(aIt)), + css::uno::Any()); } for (Paragraphs::iterator aIt(m_aVisibleBegin); aIt != m_aVisibleEnd; ++aIt) @@ -1750,10 +1750,10 @@ void Document::notifyVisibleRangeChanges( if (aIt == rInserted || aIt < rOldVisibleBegin || aIt >= rOldVisibleEnd) NotifyAccessibleEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: CHILD, - ::css::uno::Any(), - ::css::uno::makeAny(getAccessibleChild(aIt))); + css::uno::Any(), + css::uno::makeAny(getAccessibleChild(aIt))); } } @@ -1843,10 +1843,10 @@ void Document::handleParagraphNotifications() aIt != m_aVisibleEnd; ++aIt) { NotifyAccessibleEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: CHILD, - ::css::uno::makeAny(getAccessibleChild(aIt)), - ::css::uno::Any()); + css::uno::makeAny(getAccessibleChild(aIt)), + css::uno::Any()); } disposeParagraphs(); m_xParagraphs->clear(); @@ -1910,12 +1910,12 @@ void Document::handleParagraphNotifications() m_nSelectionLastPos = 0x7FFFFFFF; } - ::css::uno::Reference< ::css::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > xStrong; if (bWasVisible) xStrong = getAccessibleChild(aIt); - ::css::uno::WeakReference< - ::css::accessibility::XAccessible > xWeak( + css::uno::WeakReference< + css::accessibility::XAccessible > xWeak( aIt->getParagraph()); aIt = m_xParagraphs->erase(aIt); @@ -1933,13 +1933,13 @@ void Document::handleParagraphNotifications() if (bWasVisible) NotifyAccessibleEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: CHILD, - ::css::uno::makeAny(xStrong), - ::css::uno::Any()); + css::uno::makeAny(xStrong), + css::uno::Any()); - ::css::uno::Reference< ::css::lang::XComponent > xComponent( - xWeak.get(), ::css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xComponent( + xWeak.get(), css::uno::UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -2012,11 +2012,11 @@ void Document::handleSelectionChangeNotification() ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(m_aFocused)); if (xParagraph.is()) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType::FOCUSED), - ::css::uno::Any()); + css::uno::makeAny( + css::accessibility::AccessibleStateType::FOCUSED), + css::uno::Any()); } // Gain focus and update cursor position: @@ -2030,20 +2030,20 @@ void Document::handleSelectionChangeNotification() { if (aIt != m_aFocused) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: STATE_CHANGED, - ::css::uno::Any(), - ::css::uno::makeAny( - ::css::accessibility::AccessibleStateType::FOCUSED)); + css::uno::Any(), + css::uno::makeAny( + css::accessibility::AccessibleStateType::FOCUSED)); if (nNewLastPara != m_nSelectionLastPara || nNewLastPos != m_nSelectionLastPos) xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId:: + css::accessibility::AccessibleEventId:: CARET_CHANGED, - ::css::uno::makeAny< ::sal_Int32 >( + css::uno::makeAny< ::sal_Int32 >( nNewLastPara == m_nSelectionLastPara ? m_nSelectionLastPos : 0), - ::css::uno::makeAny(nNewLastPos)); + css::uno::makeAny(nNewLastPos)); } } m_aFocused = aIt; @@ -2148,11 +2148,11 @@ void Document::notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast ) if ( xParagraph.is() ) { xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId::SELECTION_CHANGED, - ::css::uno::Any(), ::css::uno::Any() ); + css::accessibility::AccessibleEventId::SELECTION_CHANGED, + css::uno::Any(), css::uno::Any() ); xParagraph->notifyEvent( - ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED, - ::css::uno::Any(), ::css::uno::Any() ); + css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED, + css::uno::Any(), css::uno::Any() ); } } } @@ -2173,23 +2173,23 @@ void Document::disposeParagraphs() for (Paragraphs::iterator aIt(m_xParagraphs->begin()); aIt != m_xParagraphs->end(); ++aIt) { - ::css::uno::Reference< ::css::lang::XComponent > xComponent( - aIt->getParagraph().get(), ::css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xComponent( + aIt->getParagraph().get(), css::uno::UNO_QUERY); if (xComponent.is()) xComponent->dispose(); } } // static -::css::uno::Any Document::mapFontColor(::Color const & rColor) +css::uno::Any Document::mapFontColor(::Color const & rColor) { - return ::css::uno::makeAny( + return css::uno::makeAny( static_cast< ::sal_Int32 >(COLORDATA_RGB(rColor.GetColor()))); // FIXME keep transparency? } // static -::Color Document::mapFontColor(::css::uno::Any const & rColor) +::Color Document::mapFontColor(css::uno::Any const & rColor) { ::sal_Int32 nColor = 0; rColor >>= nColor; @@ -2197,39 +2197,39 @@ void Document::disposeParagraphs() } // static -::css::uno::Any Document::mapFontWeight(::FontWeight nWeight) +css::uno::Any Document::mapFontWeight(::FontWeight nWeight) { - // Map from ::FontWeight to ::css:awt::FontWeight, depends on order of + // Map from ::FontWeight to css::awt::FontWeight, depends on order of // elements in ::FontWeight (vcl/vclenum.hxx): static float const aWeight[] - = { ::css::awt::FontWeight::DONTKNOW, // WEIGHT_DONTKNOW - ::css::awt::FontWeight::THIN, // WEIGHT_THIN - ::css::awt::FontWeight::ULTRALIGHT, // WEIGHT_ULTRALIGHT - ::css::awt::FontWeight::LIGHT, // WEIGHT_LIGHT - ::css::awt::FontWeight::SEMILIGHT, // WEIGHT_SEMILIGHT - ::css::awt::FontWeight::NORMAL, // WEIGHT_NORMAL - ::css::awt::FontWeight::NORMAL, // WEIGHT_MEDIUM - ::css::awt::FontWeight::SEMIBOLD, // WEIGHT_SEMIBOLD - ::css::awt::FontWeight::BOLD, // WEIGHT_BOLD - ::css::awt::FontWeight::ULTRABOLD, // WEIGHT_ULTRABOLD - ::css::awt::FontWeight::BLACK }; // WEIGHT_BLACK - return ::css::uno::makeAny(aWeight[nWeight]); + = { css::awt::FontWeight::DONTKNOW, // WEIGHT_DONTKNOW + css::awt::FontWeight::THIN, // WEIGHT_THIN + css::awt::FontWeight::ULTRALIGHT, // WEIGHT_ULTRALIGHT + css::awt::FontWeight::LIGHT, // WEIGHT_LIGHT + css::awt::FontWeight::SEMILIGHT, // WEIGHT_SEMILIGHT + css::awt::FontWeight::NORMAL, // WEIGHT_NORMAL + css::awt::FontWeight::NORMAL, // WEIGHT_MEDIUM + css::awt::FontWeight::SEMIBOLD, // WEIGHT_SEMIBOLD + css::awt::FontWeight::BOLD, // WEIGHT_BOLD + css::awt::FontWeight::ULTRABOLD, // WEIGHT_ULTRABOLD + css::awt::FontWeight::BLACK }; // WEIGHT_BLACK + return css::uno::makeAny(aWeight[nWeight]); } // static -::FontWeight Document::mapFontWeight(::css::uno::Any const & rWeight) +::FontWeight Document::mapFontWeight(css::uno::Any const & rWeight) { - float nWeight = ::css::awt::FontWeight::NORMAL; + float nWeight = css::awt::FontWeight::NORMAL; rWeight >>= nWeight; - return nWeight <= ::css::awt::FontWeight::DONTKNOW ? WEIGHT_DONTKNOW - : nWeight <= ::css::awt::FontWeight::THIN ? WEIGHT_THIN - : nWeight <= ::css::awt::FontWeight::ULTRALIGHT ? WEIGHT_ULTRALIGHT - : nWeight <= ::css::awt::FontWeight::LIGHT ? WEIGHT_LIGHT - : nWeight <= ::css::awt::FontWeight::SEMILIGHT ? WEIGHT_SEMILIGHT - : nWeight <= ::css::awt::FontWeight::NORMAL ? WEIGHT_NORMAL - : nWeight <= ::css::awt::FontWeight::SEMIBOLD ? WEIGHT_SEMIBOLD - : nWeight <= ::css::awt::FontWeight::BOLD ? WEIGHT_BOLD - : nWeight <= ::css::awt::FontWeight::ULTRABOLD ? WEIGHT_ULTRABOLD + return nWeight <= css::awt::FontWeight::DONTKNOW ? WEIGHT_DONTKNOW + : nWeight <= css::awt::FontWeight::THIN ? WEIGHT_THIN + : nWeight <= css::awt::FontWeight::ULTRALIGHT ? WEIGHT_ULTRALIGHT + : nWeight <= css::awt::FontWeight::LIGHT ? WEIGHT_LIGHT + : nWeight <= css::awt::FontWeight::SEMILIGHT ? WEIGHT_SEMILIGHT + : nWeight <= css::awt::FontWeight::NORMAL ? WEIGHT_NORMAL + : nWeight <= css::awt::FontWeight::SEMIBOLD ? WEIGHT_SEMIBOLD + : nWeight <= css::awt::FontWeight::BOLD ? WEIGHT_BOLD + : nWeight <= css::awt::FontWeight::ULTRABOLD ? WEIGHT_ULTRABOLD : WEIGHT_BLACK; } diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 9cb9460d88c0..0cab008bf575 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -202,7 +202,7 @@ public: private: OUString m_sUserDir; - css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; + css::uno::Reference< css::configuration::backend::XLayer> m_xLayer; void migrateJavarc(); typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index fdcad2711a4a..ba89bd921311 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -117,7 +117,7 @@ namespace javaunohelper { } css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( - css::uno::Reference< ::css::uno::XComponentContext > const & xContext, + css::uno::Reference< css::uno::XComponentContext > const & xContext, ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access ) { css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 364bd789a826..e8cd9a550bee 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -248,7 +248,7 @@ public: virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException) ; void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const ::css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 288ad97f392b..1858b69f860c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -97,8 +97,8 @@ public: */ void NotifyListeners ( const ::rtl::OUString& rsEventType, - const ::css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, - const ::css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject); + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, + const css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject); /** Call all listeners and inform them that the ConfigurationController is being disposed. When this method returns diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 8ba51892ae26..d0ab557c9e57 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -40,7 +40,7 @@ namespace sd { namespace framework { namespace { typedef ::cppu::WeakComponentImplHelper1 < - ::css::drawing::framework::XConfigurationChangeListener + css::drawing::framework::XConfigurationChangeListener > ToolBarModuleInterfaceBase; } diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index f06870ff29bf..26ecdca8c9d1 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -32,7 +32,7 @@ namespace { typedef ::cppu::WeakComponentImplHelper1 < - ::css::drawing::framework::XConfigurationChangeListener + css::drawing::framework::XConfigurationChangeListener > ViewTabBarModuleInterfaceBase; } // end of anonymous namespace. diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 1d07e178922b..ea40b2d20bfc 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -42,8 +42,8 @@ namespace { typedef ::cppu::WeakComponentImplHelper2 < - ::css::drawing::framework::XConfigurationController, - ::css::lang::XInitialization + css::drawing::framework::XConfigurationController, + css::lang::XInitialization > ConfigurationControllerInterfaceBase; } // end of anonymous namespace. diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index 239f57188494..4681f2e788bc 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -80,7 +80,7 @@ public: (when the sd modules is unloaded) is done by a) calling dispose() when the XComponent is supported and by b) releasing the reference. */ - void AddResource (const ::css::uno::Reference<css::uno::XInterface>& rxResource); + void AddResource (const css::uno::Reference<css::uno::XInterface>& rxResource); protected: friend class ::SdModule; diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 1638d0067f99..9625f4618fb8 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -61,16 +61,16 @@ public: // XSlideRenderer virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( - const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor) throw (css::uno::RuntimeException); virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas ( - const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor, - const ::css::uno::Reference<css::rendering::XCanvas>& rxCanvas) + const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) throw (css::uno::RuntimeException); virtual css::awt::Size SAL_CALL calculatePreviewSize ( @@ -82,7 +82,7 @@ private: PreviewRenderer maPreviewRenderer; BitmapEx CreatePreview ( - const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor) throw (css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index c8a9a9a6267e..ee2035a2dab4 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -126,7 +126,7 @@ public: const ::std::vector<css::uno::Any>&) > ItemProcessor; typedef ::boost::function<void( const ::rtl::OUString&, - const ::css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; + const css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; /** Execute a functor for all elements of the given container. @param rxContainer diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 659beddcb29f..57153bdcf188 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -58,7 +58,7 @@ public: private: ::rtl::OUString msEventType; - ::css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; Predicate maPredicate; Action maAction; diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 01f784117e70..f66bcddd35ed 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -54,7 +54,7 @@ PresenterSprite::~PresenterSprite (void) } void PresenterSprite::SetFactory ( - const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory) + const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory) { if (mxSpriteFactory != rxSpriteFactory) { @@ -65,7 +65,7 @@ void PresenterSprite::SetFactory ( } } -::css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) +css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) { ProvideSprite(); if (mxSprite.is()) diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index ca60f9711105..0db6b44e721e 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -45,9 +45,9 @@ public: It is also used to call updateScreen() at (wrapped by the Update() method). */ void SetFactory ( - const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); + const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); - ::css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); + css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); void Show (void); void Hide (void); @@ -58,8 +58,8 @@ public: void Update (void); private: - ::css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; - ::css::uno::Reference<css::rendering::XCustomSprite> mxSprite; + css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; + css::uno::Reference<css::rendering::XCustomSprite> mxSprite; css::geometry::RealSize2D maSize; css::geometry::RealPoint2D maLocation; bool mbIsVisible; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index f06169c93625..2be9a4b9b3b2 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -64,7 +64,7 @@ namespace sdext { namespace presenter { PresenterTextView::PresenterTextView ( const Reference<XComponentContext>& rxContext, const Reference<rendering::XCanvas>& rxCanvas, - const ::boost::function<void(const ::css::awt::Rectangle&)>& rInvalidator) + const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator) : mxCanvas(rxCanvas), mbDoOuput(true), mxBreakIterator(), diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index aeac34c76977..5eba5bfb1457 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -222,7 +222,7 @@ public: PresenterTextView ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const ::boost::function<void(const ::css::awt::Rectangle&)>& rInvalidator); + const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); void SetText (const css::uno::Reference<css::text::XText>& rxText); void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); @@ -267,7 +267,7 @@ private: SharedPresenterTextCaret mpCaret; double mnLeftOffset; double mnTopOffset; - const ::boost::function<void(const ::css::awt::Rectangle&)> maInvalidator; + const ::boost::function<void(const css::awt::Rectangle&)> maInvalidator; bool mbIsFormatPending; sal_Int32 mnCharacterCount; ::boost::function<void(void)> maTextChangeBroadcaster; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 1158b84a22e2..d289394067a9 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -211,7 +211,7 @@ private: const bool bMouseDown=false); void ProcessEntry ( - const ::css::uno::Reference<css::beans::XPropertySet>& rProperties, + const css::uno::Reference<css::beans::XPropertySet>& rProperties, Context& rContext); /** This method throws a DisposedException when the object has already been diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index efbf895c6b77..02c45fee05c0 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -68,7 +68,7 @@ class PresenterWindowManager { public: PresenterWindowManager ( - const ::css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterWindowManager (void); diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 81db58e525c6..c6a1baf33ee0 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -625,8 +625,8 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const css::document::EventObject } //----------------------------------------------------------------------------- -void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const ::css::document::DocumentEvent& _Event ) - throw (::css::uno::RuntimeException) +void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const css::document::DocumentEvent& _Event ) + throw (css::uno::RuntimeException) { implts_notifyJobExecution(css::document::EventObject(_Event.Source, _Event.EventName)); implts_checkAndExecuteEventBindings(_Event); diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 4c12b6c55c36..6a7c977c234c 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -34,10 +34,10 @@ MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId ) } // virtual -::css::uno::Reference< ::css::awt::XWindowPeer > +css::uno::Reference< css::awt::XWindowPeer > MultiLineEdit::GetComponentInterface(sal_Bool bCreate) { - ::css::uno::Reference< ::css::awt::XWindowPeer > xPeer( + css::uno::Reference< css::awt::XWindowPeer > xPeer( VclMultiLineEdit::GetComponentInterface(false)); if (!xPeer.is() && bCreate) { diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index 082897854eaa..bbe30dd9f894 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -36,7 +36,7 @@ namespace svt { } - ::css::uno::Reference< ::css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext() + css::uno::Reference< css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext() { return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext( this, m_rEngine, m_rView, m_bCompoundControlChild diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 9cb085378cdf..8e1e4ebb6a6a 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -506,7 +506,7 @@ void SAL_CALL VCLXToolkit::disposing() ::Application::RemoveKeyListener(m_aKeyListenerLink); m_bKeyListener = false; } - ::css::lang::EventObject aEvent( + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject * >(this)); m_aTopWindowListeners.disposeAndClear(aEvent); m_aKeyHandlers.disposeAndClear(aEvent); @@ -1380,38 +1380,38 @@ sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) thr // virtual ::sal_Int32 SAL_CALL VCLXToolkit::getTopWindowCount() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { return static_cast< ::sal_Int32 >(::Application::GetTopWindowCount()); // XXX numeric overflow } // virtual -::css::uno::Reference< ::css::awt::XTopWindow > SAL_CALL +css::uno::Reference< css::awt::XTopWindow > SAL_CALL VCLXToolkit::getTopWindow(::sal_Int32 nIndex) - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { ::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex)); // XXX numeric overflow - return ::css::uno::Reference< ::css::awt::XTopWindow >( - p == 0 ? 0 : static_cast< ::css::awt::XWindow * >(p->GetWindowPeer()), - ::css::uno::UNO_QUERY); + return css::uno::Reference< css::awt::XTopWindow >( + p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()), + css::uno::UNO_QUERY); } // virtual -::css::uno::Reference< ::css::awt::XTopWindow > SAL_CALL -VCLXToolkit::getActiveTopWindow() throw (::css::uno::RuntimeException) +css::uno::Reference< css::awt::XTopWindow > SAL_CALL +VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException) { ::Window * p = ::Application::GetActiveTopWindow(); - return ::css::uno::Reference< ::css::awt::XTopWindow >( - p == 0 ? 0 : static_cast< ::css::awt::XWindow * >(p->GetWindowPeer()), - ::css::uno::UNO_QUERY); + return css::uno::Reference< css::awt::XTopWindow >( + p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()), + css::uno::UNO_QUERY); } // virtual void SAL_CALL VCLXToolkit::addTopWindowListener( - ::css::uno::Reference< ::css::awt::XTopWindowListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XTopWindowListener > const & rListener) + throw (css::uno::RuntimeException) { OSL_ENSURE(rListener.is(), "Null rListener"); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); @@ -1419,7 +1419,7 @@ void SAL_CALL VCLXToolkit::addTopWindowListener( { aGuard.clear(); rListener->disposing( - ::css::lang::EventObject( + css::lang::EventObject( static_cast< ::cppu::OWeakObject * >(this))); } else if (m_aTopWindowListeners.addInterface(rListener) == 1 @@ -1432,8 +1432,8 @@ void SAL_CALL VCLXToolkit::addTopWindowListener( // virtual void SAL_CALL VCLXToolkit::removeTopWindowListener( - ::css::uno::Reference< ::css::awt::XTopWindowListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XTopWindowListener > const & rListener) + throw (css::uno::RuntimeException) { ::osl::MutexGuard aGuard(rBHelper.rMutex); if (!(rBHelper.bDisposed || rBHelper.bInDispose) @@ -1447,8 +1447,8 @@ void SAL_CALL VCLXToolkit::removeTopWindowListener( // virtual void SAL_CALL VCLXToolkit::addKeyHandler( - ::css::uno::Reference< ::css::awt::XKeyHandler > const & rHandler) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XKeyHandler > const & rHandler) + throw (css::uno::RuntimeException) { OSL_ENSURE(rHandler.is(), "Null rHandler"); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); @@ -1456,7 +1456,7 @@ void SAL_CALL VCLXToolkit::addKeyHandler( { aGuard.clear(); rHandler->disposing( - ::css::lang::EventObject( + css::lang::EventObject( static_cast< ::cppu::OWeakObject * >(this))); } else if (m_aKeyHandlers.addInterface(rHandler) == 1 && !m_bKeyListener) @@ -1468,8 +1468,8 @@ void SAL_CALL VCLXToolkit::addKeyHandler( // virtual void SAL_CALL VCLXToolkit::removeKeyHandler( - ::css::uno::Reference< ::css::awt::XKeyHandler > const & rHandler) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XKeyHandler > const & rHandler) + throw (css::uno::RuntimeException) { ::osl::MutexGuard aGuard(rBHelper.rMutex); if (!(rBHelper.bDisposed || rBHelper.bInDispose) @@ -1482,8 +1482,8 @@ void SAL_CALL VCLXToolkit::removeKeyHandler( // virtual void SAL_CALL VCLXToolkit::addFocusListener( - ::css::uno::Reference< ::css::awt::XFocusListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XFocusListener > const & rListener) + throw (css::uno::RuntimeException) { OSL_ENSURE(rListener.is(), "Null rListener"); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); @@ -1491,7 +1491,7 @@ void SAL_CALL VCLXToolkit::addFocusListener( { aGuard.clear(); rListener->disposing( - ::css::lang::EventObject( + css::lang::EventObject( static_cast< ::cppu::OWeakObject * >(this))); } else if (m_aFocusListeners.addInterface(rListener) == 1 @@ -1504,8 +1504,8 @@ void SAL_CALL VCLXToolkit::addFocusListener( // virtual void SAL_CALL VCLXToolkit::removeFocusListener( - ::css::uno::Reference< ::css::awt::XFocusListener > const & rListener) - throw (::css::uno::RuntimeException) + css::uno::Reference< css::awt::XFocusListener > const & rListener) + throw (css::uno::RuntimeException) { ::osl::MutexGuard aGuard(rBHelper.rMutex); if (!(rBHelper.bDisposed || rBHelper.bInDispose) @@ -1540,23 +1540,23 @@ IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent const *, pEvent) { case VCLEVENT_WINDOW_SHOW: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowOpened); + pEvent, &css::awt::XTopWindowListener::windowOpened); break; case VCLEVENT_WINDOW_HIDE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowClosed); + pEvent, &css::awt::XTopWindowListener::windowClosed); break; case VCLEVENT_WINDOW_ACTIVATE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowActivated); + pEvent, &css::awt::XTopWindowListener::windowActivated); break; case VCLEVENT_WINDOW_DEACTIVATE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowDeactivated); + pEvent, &css::awt::XTopWindowListener::windowDeactivated); break; case VCLEVENT_WINDOW_CLOSE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowClosing); + pEvent, &css::awt::XTopWindowListener::windowClosing); break; case VCLEVENT_WINDOW_GETFOCUS: callFocusListeners(pEvent, true); @@ -1566,11 +1566,11 @@ IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent const *, pEvent) break; case VCLEVENT_WINDOW_MINIMIZE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowMinimized); + pEvent, &css::awt::XTopWindowListener::windowMinimized); break; case VCLEVENT_WINDOW_NORMALIZE: callTopWindowListeners( - pEvent, &::css::awt::XTopWindowListener::windowNormalized); + pEvent, &css::awt::XTopWindowListener::windowNormalized); break; } return 0; @@ -1590,28 +1590,28 @@ IMPL_LINK(VCLXToolkit, keyListenerHandler, ::VclSimpleEvent const *, pEvent) void VCLXToolkit::callTopWindowListeners( ::VclSimpleEvent const * pEvent, - void (SAL_CALL ::css::awt::XTopWindowListener::* pFn)( - ::css::lang::EventObject const &)) + void (SAL_CALL css::awt::XTopWindowListener::* pFn)( + css::lang::EventObject const &)) { ::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); if (pWindow->IsTopWindow()) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aListeners(m_aTopWindowListeners.getElements()); if (aListeners.hasElements()) { - ::css::lang::EventObject aAwtEvent( - static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer())); + css::lang::EventObject aAwtEvent( + static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer())); for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i) { - ::css::uno::Reference< ::css::awt::XTopWindowListener > - xListener(aListeners[i], ::css::uno::UNO_QUERY); + css::uno::Reference< css::awt::XTopWindowListener > + xListener(aListeners[i], css::uno::UNO_QUERY); try { (xListener.get()->*pFn)(aAwtEvent); } - catch (const ::css::uno::RuntimeException & rEx) + catch (const css::uno::RuntimeException & rEx) { OSL_TRACE( "VCLXToolkit::callTopWindowListeners: caught %s\n", @@ -1626,7 +1626,7 @@ void VCLXToolkit::callTopWindowListeners( long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, bool bPressed) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aHandlers(m_aKeyHandlers.getElements()); if (aHandlers.hasElements()) @@ -1636,30 +1636,30 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >( static_cast< ::VclWindowEvent const * >(pEvent)->GetData()); - ::css::awt::KeyEvent aAwtEvent( - static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer()), + css::awt::KeyEvent aAwtEvent( + static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()), (pKeyEvent->GetKeyCode().IsShift() - ? ::css::awt::KeyModifier::SHIFT : 0) + ? css::awt::KeyModifier::SHIFT : 0) | (pKeyEvent->GetKeyCode().IsMod1() - ? ::css::awt::KeyModifier::MOD1 : 0) + ? css::awt::KeyModifier::MOD1 : 0) | (pKeyEvent->GetKeyCode().IsMod2() - ? ::css::awt::KeyModifier::MOD2 : 0) + ? css::awt::KeyModifier::MOD2 : 0) | (pKeyEvent->GetKeyCode().IsMod3() - ? ::css::awt::KeyModifier::MOD3 : 0), + ? css::awt::KeyModifier::MOD3 : 0), pKeyEvent->GetKeyCode().GetCode(), pKeyEvent->GetCharCode(), sal::static_int_cast< sal_Int16 >( pKeyEvent->GetKeyCode().GetFunction())); for (::sal_Int32 i = 0; i < aHandlers.getLength(); ++i) { - ::css::uno::Reference< ::css::awt::XKeyHandler > xHandler( - aHandlers[i], ::css::uno::UNO_QUERY); + css::uno::Reference< css::awt::XKeyHandler > xHandler( + aHandlers[i], css::uno::UNO_QUERY); try { if ((bPressed ? xHandler->keyPressed(aAwtEvent) : xHandler->keyReleased(aAwtEvent))) return 1; } - catch (const ::css::uno::RuntimeException & rEx) + catch (const css::uno::RuntimeException & rEx) { OSL_TRACE( "VCLXToolkit::callKeyHandlers: caught %s\n", @@ -1678,14 +1678,14 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); if (pWindow->IsTopWindow()) { - ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > aListeners(m_aFocusListeners.getElements()); if (aListeners.hasElements()) { // Ignore the interior of compound controls when determining the // window that gets the focus next (see implementation in // vclxwindow.cxx for mapping between VCL and UNO AWT event): - ::css::uno::Reference< css::uno::XInterface > xNext; + css::uno::Reference< css::uno::XInterface > xNext; ::Window * pFocus = ::Application::GetFocusWindow(); for (::Window * p = pFocus; p != 0; p = p->GetParent()) if (!p->IsCompoundControl()) @@ -1695,19 +1695,19 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, } if (pFocus != 0) xNext = pFocus->GetComponentInterface(true); - ::css::awt::FocusEvent aAwtEvent( - static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer()), + css::awt::FocusEvent aAwtEvent( + static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()), pWindow->GetGetFocusFlags(), xNext, false); for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i) { - ::css::uno::Reference< ::css::awt::XFocusListener > xListener( - aListeners[i], ::css::uno::UNO_QUERY); + css::uno::Reference< css::awt::XFocusListener > xListener( + aListeners[i], css::uno::UNO_QUERY); try { bGained ? xListener->focusGained(aAwtEvent) : xListener->focusLost(aAwtEvent); } - catch (const ::css::uno::RuntimeException & rEx) + catch (const css::uno::RuntimeException & rEx) { OSL_TRACE( "VCLXToolkit::callFocusListeners: caught %s\n", diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index 15add7c5bee5..b9ad1b784091 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -146,7 +146,7 @@ public: throw( css::uno::RuntimeException ); virtual void SAL_CALL - impl_notify( const ::css::ucb::ListEvent& Changes ) + impl_notify( const css::ucb::ListEvent& Changes ) throw( css::uno::RuntimeException ); }; @@ -179,7 +179,7 @@ public: // XDynamicResultSetListener //----------------------------------------------------------------- virtual void SAL_CALL - notify( const ::css::ucb::ListEvent& Changes ) + notify( const css::ucb::ListEvent& Changes ) throw( css::uno::RuntimeException ); //----------------------------------------------------------------- diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 94b1afa4ac79..b88949da771e 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -23,8 +23,8 @@ #include <osl/file.hxx> #include <unotools/configmgr.hxx> -OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context) -: ::cppu::PropertySetMixin< ::css::io::XTempFile >( +OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentContext > const & context) +: ::cppu::PropertySetMixin< css::io::XTempFile >( context , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS ) , com::sun::star::uno::Sequence< rtl::OUString >() ) @@ -49,12 +49,12 @@ OTempFileService::~OTempFileService () // XInterface -::css::uno::Any SAL_CALL OTempFileService::queryInterface( ::css::uno::Type const & aType ) -throw ( ::css::uno::RuntimeException ) +css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType ) +throw ( css::uno::RuntimeException ) { - ::css::uno::Any aResult( OTempFileBase::queryInterface( aType ) ); + css::uno::Any aResult( OTempFileBase::queryInterface( aType ) ); if (!aResult.hasValue()) - aResult = cppu::PropertySetMixin< ::css::io::XTempFile >::queryInterface( aType ) ; + aResult = cppu::PropertySetMixin< css::io::XTempFile >::queryInterface( aType ) ; return aResult; }; void SAL_CALL OTempFileService::acquire( ) @@ -70,8 +70,8 @@ throw () // XTypeProvider -::css::uno::Sequence< ::css::uno::Type > SAL_CALL OTempFileService::getTypes( ) -throw ( ::css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Type > SAL_CALL OTempFileService::getTypes( ) +throw ( css::uno::RuntimeException ) { static ::cppu::OTypeCollection* pTypeCollection = NULL; if ( pTypeCollection == NULL ) @@ -81,15 +81,15 @@ throw ( ::css::uno::RuntimeException ) if ( pTypeCollection == NULL ) { static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType( ( const ::css::uno::Reference< ::css::beans::XPropertySet >*)NULL ) + ::getCppuType( ( const css::uno::Reference< css::beans::XPropertySet >*)NULL ) ,OTempFileBase::getTypes() ); pTypeCollection = &aTypeCollection; } } return pTypeCollection->getTypes(); }; -::css::uno::Sequence< sal_Int8 > SAL_CALL OTempFileService::getImplementationId( ) -throw ( ::css::uno::RuntimeException ) +css::uno::Sequence< sal_Int8 > SAL_CALL OTempFileService::getImplementationId( ) +throw ( css::uno::RuntimeException ) { return OTempFileBase::getImplementationId(); } @@ -97,53 +97,53 @@ throw ( ::css::uno::RuntimeException ) // XTempFile sal_Bool SAL_CALL OTempFileService::getRemoveFile() -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( !mpTempFile ) { // the stream is already disconnected - throw ::css::uno::RuntimeException(); + throw css::uno::RuntimeException(); } return mbRemoveFile; }; void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile ) -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( !mpTempFile ) { // the stream is already disconnected - throw ::css::uno::RuntimeException(); + throw css::uno::RuntimeException(); } mbRemoveFile = _removefile; mpTempFile->EnableKillingFile( mbRemoveFile ); }; ::rtl::OUString SAL_CALL OTempFileService::getUri() -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( !mpTempFile ) { - throw ::css::uno::RuntimeException(); + throw css::uno::RuntimeException(); } return ::rtl::OUString( mpTempFile->GetURL() ); }; ::rtl::OUString SAL_CALL OTempFileService::getResourceName() -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( !mpTempFile ) { - throw ::css::uno::RuntimeException(); + throw css::uno::RuntimeException(); } return ::rtl::OUString( mpTempFile->GetFileName() ); @@ -153,16 +153,16 @@ throw ( ::css::uno::RuntimeException ) // XInputStream -sal_Int32 SAL_CALL OTempFileService::readBytes( ::css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) -throw (::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +sal_Int32 SAL_CALL OTempFileService::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) +throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); if (nBytesToRead < 0) - throw ::css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast< ::css::uno::XWeak * >(this)); + throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast< css::uno::XWeak * >(this)); aData.realloc(nBytesToRead); @@ -186,18 +186,18 @@ throw (::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, return nRead; } -sal_Int32 SAL_CALL OTempFileService::readSomeBytes( ::css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) -throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +sal_Int32 SAL_CALL OTempFileService::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) +throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); if (nMaxBytesToRead < 0) - throw ::css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast < ::css::uno::XWeak * >( this ) ); + throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast < css::uno::XWeak * >( this ) ); if (mpStream->IsEof()) { @@ -208,11 +208,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException return readBytes(aData, nMaxBytesToRead); } void SAL_CALL OTempFileService::skipBytes( sal_Int32 nBytesToSkip ) -throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); @@ -220,11 +220,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException checkError(); } sal_Int32 SAL_CALL OTempFileService::available( ) -throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); @@ -241,11 +241,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::Ru return nAvailable; } void SAL_CALL OTempFileService::closeInput( ) -throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbInClosed = sal_True; @@ -264,36 +264,36 @@ throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::Ru // XOutputStream -void SAL_CALL OTempFileService::writeBytes( const ::css::uno::Sequence< sal_Int8 >& aData ) -throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +void SAL_CALL OTempFileService::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) +throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength()); checkError(); if ( nWritten != (sal_uInt32)aData.getLength()) - throw ::css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < ::css::uno::XWeak * > ( this ) ); + throw css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < css::uno::XWeak * > ( this ) ); } void SAL_CALL OTempFileService::flush( ) -throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); mpStream->Flush(); checkError(); } void SAL_CALL OTempFileService::closeOutput( ) -throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbOutClosed = sal_True; @@ -325,7 +325,7 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException void OTempFileService::checkError () const { if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } void OTempFileService::checkConnected () { @@ -349,24 +349,24 @@ void OTempFileService::checkConnected () } if (!mpStream) - throw ::css::io::NotConnectedException ( ::rtl::OUString(), const_cast < ::css::uno::XWeak * > ( static_cast < const ::css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } // XSeekable void SAL_CALL OTempFileService::seek( sal_Int64 nLocation ) -throw ( ::css::lang::IllegalArgumentException, ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); checkConnected(); if ( nLocation < 0 || nLocation > getLength() ) - throw ::css::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); mpStream->Seek((sal_uInt32) nLocation ); checkError(); } sal_Int64 SAL_CALL OTempFileService::getPosition( ) -throw ( ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); checkConnected(); @@ -376,7 +376,7 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException ) return (sal_Int64)nPos; } sal_Int64 SAL_CALL OTempFileService::getLength( ) -throw ( ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); checkConnected(); @@ -396,22 +396,22 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException ) // XStream -::css::uno::Reference< ::css::io::XInputStream > SAL_CALL OTempFileService::getInputStream() -throw ( ::css::uno::RuntimeException ) +css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream() +throw ( css::uno::RuntimeException ) { - return ::css::uno::Reference< ::css::io::XInputStream >( *this, ::css::uno::UNO_QUERY ); + return css::uno::Reference< css::io::XInputStream >( *this, css::uno::UNO_QUERY ); } -::css::uno::Reference< ::css::io::XOutputStream > SAL_CALL OTempFileService::getOutputStream() -throw ( ::css::uno::RuntimeException ) +css::uno::Reference< css::io::XOutputStream > SAL_CALL OTempFileService::getOutputStream() +throw ( css::uno::RuntimeException ) { - return ::css::uno::Reference< ::css::io::XOutputStream >( *this, ::css::uno::UNO_QUERY ); + return css::uno::Reference< css::io::XOutputStream >( *this, css::uno::UNO_QUERY ); } // XTruncate void SAL_CALL OTempFileService::truncate() -throw ( ::css::io::IOException, ::css::uno::RuntimeException ) +throw ( css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); checkConnected(); @@ -424,20 +424,20 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException ) // XServiceInfo ::rtl::OUString SAL_CALL OTempFileService::getImplementationName() -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { return getImplementationName_Static(); } sal_Bool SAL_CALL OTempFileService::supportsService( ::rtl::OUString const & rServiceName ) -throw ( ::css::uno::RuntimeException ) +throw ( css::uno::RuntimeException ) { - ::css::uno::Sequence< ::rtl::OUString > aServices(getSupportedServiceNames_Static()); + css::uno::Sequence< ::rtl::OUString > aServices(getSupportedServiceNames_Static()); return rServiceName == aServices[0]; } -::css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames() -throw ( ::css::uno::RuntimeException ) +css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames() +throw ( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } @@ -448,20 +448,20 @@ throw ( ::css::uno::RuntimeException ) { return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" ); } -::css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static() +css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static() { - ::css::uno::Sequence < ::rtl::OUString > aNames ( 1 ); + css::uno::Sequence < ::rtl::OUString > aNames ( 1 ); aNames[0] = "com.sun.star.io.TempFile"; return aNames; } -::css::uno::Reference < ::css::uno::XInterface >SAL_CALL XTempFile_createInstance( - css::uno::Reference< ::css::uno::XComponentContext > const & context) +css::uno::Reference < css::uno::XInterface >SAL_CALL XTempFile_createInstance( + css::uno::Reference< css::uno::XComponentContext > const & context) SAL_THROW( ( css::uno::Exception ) ) { return static_cast< ::cppu::OWeakObject * >( new OTempFileService(context) ); } -::css::uno::Reference < ::css::lang::XSingleComponentFactory > OTempFileService::createServiceFactory_Static() +css::uno::Reference < css::lang::XSingleComponentFactory > OTempFileService::createServiceFactory_Static() { return ::cppu::createSingleComponentFactory( XTempFile_createInstance, getImplementationName_Static(), getSupportedServiceNames_Static() ); } @@ -478,9 +478,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL utl_component_getFactory( SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = 0; - ::css::uno::Reference< ::css::lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< ::css::lang::XMultiServiceFactory * >( pServiceManager ) ); - ::css::uno::Reference< ::css::lang::XSingleComponentFactory > xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > xSMgr( + reinterpret_cast< css::lang::XMultiServiceFactory * >( pServiceManager ) ); + css::uno::Reference< css::lang::XSingleComponentFactory > xFactory; if (OTempFileService::getImplementationName_Static().compareToAscii( pImplName ) == 0) xFactory = OTempFileService::createServiceFactory_Static(); diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 86ca2b5fdb95..b9acbef9c259 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -55,15 +55,15 @@ namespace { -class Service: public ::cppu::WeakImplHelper1< ::css::lang::XMain > { +class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > { public: explicit Service( - ::css::uno::Reference< ::css::uno::XComponentContext > const & context): + css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) {} virtual ::sal_Int32 SAL_CALL run( - ::css::uno::Sequence< ::rtl::OUString > const &) - throw (::css::uno::RuntimeException); + css::uno::Sequence< ::rtl::OUString > const &) + throw (css::uno::RuntimeException); private: Service(Service &); // not defined @@ -72,14 +72,14 @@ private: virtual ~Service() {} void test( - ::css::uno::Reference< test::types::XTest > const & test, + css::uno::Reference< test::types::XTest > const & test, ::rtl::OUString const & name); - ::css::uno::Reference< ::css::uno::XComponentContext > context_; + css::uno::Reference< css::uno::XComponentContext > context_; }; -::sal_Int32 Service::run(::css::uno::Sequence< ::rtl::OUString > const &) - throw (::css::uno::RuntimeException) +::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &) + throw (css::uno::RuntimeException) { osl_getThreadIdentifier(0); // check for sal (new salhelper::SimpleReferenceObject)->release(); // check for salhelper @@ -129,19 +129,19 @@ private: }; for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) { ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i])); - ::css::uno::Reference< ::css::uno::XInterface > instance; + css::uno::Reference< css::uno::XInterface > instance; try { instance = context_->getServiceManager()->createInstanceWithContext( name, context_); - } catch (::css::uno::RuntimeException &) { + } catch (css::uno::RuntimeException &) { throw; - } catch (::css::uno::Exception &) { - throw ::css::uno::RuntimeException( + } catch (css::uno::Exception &) { + throw css::uno::RuntimeException( ::rtl::OUString("error creating instance"), static_cast< ::cppu::OWeakObject * >(this)); } if (!instance.is()) { - throw ::css::uno::RuntimeException( + throw css::uno::RuntimeException( "no instance: " + name, static_cast< ::cppu::OWeakObject * >(this)); } @@ -153,9 +153,9 @@ private: ::rtl::OUStringBuffer b; b.append("/singletons/"); b.append(singletons[i]); - ::css::uno::Reference< ::css::uno::XInterface > instance( + css::uno::Reference< css::uno::XInterface > instance( context_->getValueByName(b.makeStringAndClear()), - ::css::uno::UNO_QUERY_THROW); + css::uno::UNO_QUERY_THROW); } test( ::test::types::CppTest::create(context_), @@ -167,7 +167,7 @@ private: } void Service::test( - ::css::uno::Reference< test::types::XTest > const & test, + css::uno::Reference< test::types::XTest > const & test, ::rtl::OUString const & name) { bool ok = false; @@ -177,7 +177,7 @@ void Service::test( ok = true; } if (!ok) { - throw ::css::uno::RuntimeException( + throw css::uno::RuntimeException( (name + ::rtl::OUString(".throwException failed")), static_cast< ::cppu::OWeakObject * >(this)); @@ -186,16 +186,16 @@ void Service::test( namespace CppMain { -::css::uno::Reference< ::css::uno::XInterface > create( - ::css::uno::Reference< ::css::uno::XComponentContext > const & context) - SAL_THROW((::css::uno::Exception)) +css::uno::Reference< css::uno::XInterface > create( + css::uno::Reference< css::uno::XComponentContext > const & context) + SAL_THROW((css::uno::Exception)) { try { return static_cast< ::cppu::OWeakObject * >(new Service(context)); } catch (::std::bad_alloc &) { - throw ::css::uno::RuntimeException( + throw css::uno::RuntimeException( ::rtl::OUString("std::bad_alloc"), - ::css::uno::Reference< ::css::uno::XInterface >()); + css::uno::Reference< css::uno::XInterface >()); } } @@ -203,8 +203,8 @@ OUString getImplementationName() { return OUString("test.cpp.cppmain.Component"); } -::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { - return ::css::uno::Sequence< ::rtl::OUString >(); +css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { + return css::uno::Sequence< ::rtl::OUString >(); } } diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 0b5e98b1cfe1..55e094a47652 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -46,7 +46,7 @@ public: Service() {} virtual ::test::types::Data SAL_CALL getData() - throw (::css::uno::RuntimeException) + throw (css::uno::RuntimeException) { return ::test::types::Data(OUString("Hello"), 42); } @@ -60,16 +60,16 @@ private: namespace CppServer { -::css::uno::Reference< ::css::uno::XInterface > create( - ::css::uno::Reference< ::css::uno::XComponentContext > const &) - SAL_THROW((::css::uno::Exception)) +css::uno::Reference< css::uno::XInterface > create( + css::uno::Reference< css::uno::XComponentContext > const &) + SAL_THROW((css::uno::Exception)) { try { return static_cast< ::cppu::OWeakObject * >(new Service); } catch (::std::bad_alloc &) { - throw ::css::uno::RuntimeException( + throw css::uno::RuntimeException( OUString("std::bad_alloc"), - ::css::uno::Reference< ::css::uno::XInterface >()); + css::uno::Reference< css::uno::XInterface >()); } } @@ -77,8 +77,8 @@ OUString getImplementationName() { return OUString("test.cpp.cppserver.Component"); } -::css::uno::Sequence< OUString > getSupportedServiceNames() { - return ::css::uno::Sequence< OUString >(); +css::uno::Sequence< OUString > getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } } |