mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop prefix from ::css

Browse Source 
as css is already ::com::sun::star

Change-Id: I86b43843e4b74f990b6e05dee37184a002072d12
This commit is contained in:
Thomas Arnhold
2013-04-02 09:01:37 +02:00
parent 83810a61ba
commit a808497dbb
27 changed files with 614 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
View File

@@ -105,19 +105,19 @@ public:
inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {} inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
inline inline
::css::uno::WeakReference< ::css::accessibility::XAccessible > const & css::uno::WeakReference< css::accessibility::XAccessible > const &
getParagraph() const { return m_xParagraph; } getParagraph() const { return m_xParagraph; }
inline ::sal_Int32 getHeight() const { return m_nHeight; } inline ::sal_Int32 getHeight() const { return m_nHeight; }
inline void setParagraph( inline void setParagraph(
::css::uno::Reference< ::css::accessibility::XAccessible > const & css::uno::Reference< css::accessibility::XAccessible > const &
rParagraph) { m_xParagraph = rParagraph; } rParagraph) { m_xParagraph = rParagraph; }
inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; } inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
private: private:
::css::uno::WeakReference< ::css::accessibility::XAccessible > css::uno::WeakReference< css::accessibility::XAccessible >
m_xParagraph; m_xParagraph;
::sal_Int32 m_nHeight; ::sal_Int32 m_nHeight;
}; };
@@ -125,13 +125,13 @@ private:
typedef ::std::vector< ParagraphInfo > Paragraphs; typedef ::std::vector< ParagraphInfo > Paragraphs;
typedef ::cppu::WeakAggComponentImplHelper7< typedef ::cppu::WeakAggComponentImplHelper7<
::css::accessibility::XAccessible, css::accessibility::XAccessible,
::css::accessibility::XAccessibleContext, css::accessibility::XAccessibleContext,
::css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleComponent,
::css::accessibility::XAccessibleEditableText, css::accessibility::XAccessibleEditableText,
::css::accessibility::XAccessibleMultiLineText, css::accessibility::XAccessibleMultiLineText,
::css::accessibility::XAccessibleTextAttributes, css::accessibility::XAccessibleTextAttributes,
::css::accessibility::XAccessibleEventBroadcaster > ParagraphBase; css::accessibility::XAccessibleEventBroadcaster > ParagraphBase;
// The Paragraph's number is the absolute position within the text engine (from // 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 // 0 to N - 1), whereas the Paragraph's index is the position within the text
@@ -154,134 +154,134 @@ public:
void textChanged(); void textChanged();
// Thread-safe. // Thread-safe.
void notifyEvent(::sal_Int16 nEventId, ::css::uno::Any const & rOldValue, void notifyEvent(::sal_Int16 nEventId, css::uno::Any const & rOldValue,
::css::uno::Any const & rNewValue); css::uno::Any const & rNewValue);
protected: protected:
// OCommonAccessibleText // OCommonAccessibleText
virtual void implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary,
::sal_Int32 nIndex ); ::sal_Int32 nIndex );
virtual void implGetLineBoundary( ::css::i18n::Boundary& rBoundary, virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary,
::sal_Int32 nIndex ); ::sal_Int32 nIndex );
private: private:
virtual ::css::uno::Reference< ::css::accessibility::XAccessibleContext > virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext() throw (::css::uno::RuntimeException); SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() 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) getAccessibleChild(::sal_Int32 i)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent() throw (::css::uno::RuntimeException); getAccessibleParent() throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getAccessibleRole() virtual ::sal_Int16 SAL_CALL getAccessibleRole()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getAccessibleDescription() virtual OUString SAL_CALL getAccessibleDescription()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getAccessibleName() virtual OUString SAL_CALL getAccessibleName()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual virtual
::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet() throw (::css::uno::RuntimeException); SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException);
virtual virtual
::css::uno::Reference< ::css::accessibility::XAccessibleStateSet > SAL_CALL css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
getAccessibleStateSet() throw (::css::uno::RuntimeException); getAccessibleStateSet() throw (css::uno::RuntimeException);
virtual ::css::lang::Locale SAL_CALL getLocale() virtual css::lang::Locale SAL_CALL getLocale()
throw (::css::accessibility::IllegalAccessibleComponentStateException, throw (css::accessibility::IllegalAccessibleComponentStateException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL containsPoint(::css::awt::Point const & rPoint) virtual ::sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint)
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
getAccessibleAtPoint(::css::awt::Point const & rPoint) getAccessibleAtPoint(css::awt::Point const & rPoint)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::awt::Rectangle SAL_CALL getBounds() virtual css::awt::Rectangle SAL_CALL getBounds()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::awt::Point SAL_CALL getLocation() virtual css::awt::Point SAL_CALL getLocation()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::awt::Point SAL_CALL getLocationOnScreen() virtual css::awt::Point SAL_CALL getLocationOnScreen()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::awt::Size SAL_CALL getSize() virtual css::awt::Size SAL_CALL getSize()
throw (::css::uno::RuntimeException); 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() virtual css::uno::Any SAL_CALL getAccessibleKeyBinding()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::util::Color SAL_CALL getForeground() virtual css::util::Color SAL_CALL getForeground()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::util::Color SAL_CALL getBackground() virtual css::util::Color SAL_CALL getBackground()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getCaretPosition() virtual ::sal_Int32 SAL_CALL getCaretPosition()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) virtual ::sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); 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 ) getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::css::awt::Rectangle SAL_CALL virtual css::awt::Rectangle SAL_CALL
getCharacterBounds(::sal_Int32 nIndex) getCharacterBounds(::sal_Int32 nIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getCharacterCount() virtual ::sal_Int32 SAL_CALL getCharacterCount()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL virtual ::sal_Int32 SAL_CALL
getIndexAtPoint(::css::awt::Point const & rPoint) getIndexAtPoint(css::awt::Point const & rPoint)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getSelectedText() virtual OUString SAL_CALL getSelectedText()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getSelectionStart() virtual ::sal_Int32 SAL_CALL getSelectionStart()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getSelectionEnd() virtual ::sal_Int32 SAL_CALL getSelectionEnd()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex, virtual ::sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex,
::sal_Int32 nEndIndex) ::sal_Int32 nEndIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual OUString SAL_CALL getText() virtual OUString SAL_CALL getText()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex, virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex,
::sal_Int32 nEndIndex) ::sal_Int32 nEndIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); 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 getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL 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, virtual ::sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex,
::sal_Int32 nEndIndex) ::sal_Int32 nEndIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex, virtual ::sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex,
::sal_Int32 nEndIndex) ::sal_Int32 nEndIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) virtual ::sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex, virtual ::sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex,
::sal_Int32 nEndIndex) ::sal_Int32 nEndIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL insertText(OUString const & rText, virtual ::sal_Bool SAL_CALL insertText(OUString const & rText,
::sal_Int32 nIndex) ::sal_Int32 nIndex)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL replaceText( virtual ::sal_Bool SAL_CALL replaceText(
::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
OUString const & rReplacement) OUString const & rReplacement)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL setAttributes( virtual ::sal_Bool SAL_CALL setAttributes(
::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
::css::uno::Sequence< ::css::beans::PropertyValue > const & css::uno::Sequence< css::beans::PropertyValue > const &
rAttributeSet) rAttributeSet)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL setText(OUString const & rText) 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 virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
getDefaultAttributes(const ::css::uno::Sequence< OUString >& RequestedAttributes) getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< OUString >& RequestedAttributes) getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException, throw (::com::sun::star::lang::IndexOutOfBoundsException,
@@ -351,25 +351,25 @@ private:
throw (::com::sun::star::uno::RuntimeException); throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addAccessibleEventListener( virtual void SAL_CALL addAccessibleEventListener(
::css::uno::Reference< css::uno::Reference<
::css::accessibility::XAccessibleEventListener > const & rListener) css::accessibility::XAccessibleEventListener > const & rListener)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL removeAccessibleEventListener( virtual void SAL_CALL removeAccessibleEventListener(
::css::uno::Reference< css::uno::Reference<
::css::accessibility::XAccessibleEventListener > const & rListener) css::accessibility::XAccessibleEventListener > const & rListener)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL disposing(); virtual void SAL_CALL disposing();
virtual OUString implGetText(); virtual OUString implGetText();
virtual ::css::lang::Locale implGetLocale(); virtual css::lang::Locale implGetLocale();
virtual void implGetSelection(::sal_Int32 & rStartIndex, virtual void implGetSelection(::sal_Int32 & rStartIndex,
::sal_Int32 & rEndIndex); ::sal_Int32 & rEndIndex);
// Throws ::css::lang::DisposedException: // Throws css::lang::DisposedException:
void checkDisposed(); void checkDisposed();
::rtl::Reference< Document > m_xDocument; ::rtl::Reference< Document > m_xDocument;
@@ -384,7 +384,7 @@ private:
typedef ::boost::unordered_map< OUString, typedef ::boost::unordered_map< OUString,
::css::beans::PropertyValue, css::beans::PropertyValue,
OUStringHash, OUStringHash,
::std::equal_to< OUString > > tPropValMap; ::std::equal_to< OUString > > tPropValMap;
@@ -394,11 +394,11 @@ public:
Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
::TextView & rView, bool bCompoundControlChild); ::TextView & rView, bool bCompoundControlChild);
inline ::css::uno::Reference< ::css::accessibility::XAccessible > inline css::uno::Reference< css::accessibility::XAccessible >
getAccessible() { return m_xAccessible; } getAccessible() { return m_xAccessible; }
// Must be called only after init has been called. // 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. // Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
::css::awt::Rectangle css::awt::Rectangle
retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute); retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute);
// Must be called only after init has been called. // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
::css::awt::Rectangle css::awt::Rectangle
retrieveCharacterBounds(ParagraphImpl const * pParagraph, retrieveCharacterBounds(ParagraphImpl const * pParagraph,
::sal_Int32 nIndex); ::sal_Int32 nIndex);
@@ -460,36 +460,36 @@ public:
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
::sal_Int32 retrieveCharacterIndex(ParagraphImpl const * pParagraph, ::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. // Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveCharacterAttributes( css::uno::Sequence< css::beans::PropertyValue > retrieveCharacterAttributes(
ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, 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. // Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveDefaultAttributes( css::uno::Sequence< css::beans::PropertyValue > retrieveDefaultAttributes(
ParagraphImpl const * pParagraph, ParagraphImpl const * pParagraph,
const ::css::uno::Sequence< OUString >& RequestedAttributes); const css::uno::Sequence< OUString >& RequestedAttributes);
// Must be called only after init has been called. // Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveRunAttributes( css::uno::Sequence< css::beans::PropertyValue > retrieveRunAttributes(
ParagraphImpl const * pParagraph, ::sal_Int32 Index, 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. // Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
void changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin, void changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin,
::sal_Int32 nEnd, bool bCut, bool bPaste, ::sal_Int32 nEnd, bool bCut, bool bPaste,
OUString const & rText); OUString const & rText);
@@ -514,7 +514,7 @@ public:
// within Paragraph's constructor (i.e., when the Paragraph's ref count is // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
void copyParagraphText(ParagraphImpl const * pParagraph, void copyParagraphText(ParagraphImpl const * pParagraph,
::sal_Int32 nBegin, ::sal_Int32 nEnd); ::sal_Int32 nBegin, ::sal_Int32 nEnd);
@@ -523,10 +523,10 @@ public:
// within Paragraph's constructor (i.e., when the Paragraph's ref count is // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
void changeParagraphAttributes( void changeParagraphAttributes(
ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd,
::css::uno::Sequence< ::css::beans::PropertyValue > const & css::uno::Sequence< css::beans::PropertyValue > const &
rAttributeSet); rAttributeSet);
// Must be called only after init has been called. // 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 // within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a // still zero), pass a "ParagraphImpl const &" instead of a
// "::rtl::Reference< ParagraphImpl > const &". // "::rtl::Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException. // Throws css::lang::IndexOutOfBoundsException.
void changeParagraphSelection(ParagraphImpl * pParagraph, void changeParagraphSelection(ParagraphImpl * pParagraph,
::sal_Int32 nBegin, ::sal_Int32 nEnd); ::sal_Int32 nBegin, ::sal_Int32 nEnd);
::css::i18n::Boundary css::i18n::Boundary
retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL); ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL);
::css::i18n::Boundary css::i18n::Boundary
retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
::sal_Int32 nIndex ); ::sal_Int32 nIndex );
sal_Int32 retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph ); sal_Int32 retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph );
::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > css::uno::Reference< css::accessibility::XAccessibleRelationSet >
retrieveParagraphRelationSet( ParagraphImpl const * pParagraph ); retrieveParagraphRelationSet( ParagraphImpl const * pParagraph );
protected: protected:
@@ -557,19 +557,19 @@ protected:
private: private:
virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() 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) SAL_CALL getAccessibleChild(::sal_Int32 i)
throw (::css::lang::IndexOutOfBoundsException, throw (css::lang::IndexOutOfBoundsException,
::css::uno::RuntimeException); css::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getAccessibleRole() virtual ::sal_Int16 SAL_CALL getAccessibleRole()
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::css::uno::Reference< ::css::accessibility::XAccessible > virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint) SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
// ??? Will be called with both the external (Solar) and internal mutex // ??? Will be called with both the external (Solar) and internal mutex
// locked: // locked:
@@ -595,8 +595,8 @@ private:
// Must be called with both the external (Solar) and internal mutex // Must be called with both the external (Solar) and internal mutex
// locked, and after init has been called. // locked, and after init has been called.
// Throws ::css::uno::RuntimeException. // Throws css::uno::RuntimeException.
::css::uno::Reference< ::css::accessibility::XAccessible > css::uno::Reference< css::accessibility::XAccessible >
getAccessibleChild(Paragraphs::iterator const & rIt); getAccessibleChild(Paragraphs::iterator const & rIt);
// Must be called with both the external (Solar) and internal mutex // Must be called with both the external (Solar) and internal mutex
@@ -627,28 +627,28 @@ private:
void disposeParagraphs(); 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( void retrieveDefaultAttributesImpl(
ParagraphImpl const * pParagraph, ParagraphImpl const * pParagraph,
const ::css::uno::Sequence< OUString >& RequestedAttributes, const css::uno::Sequence< OUString >& RequestedAttributes,
tPropValMap& rDefAttrSeq); tPropValMap& rDefAttrSeq);
void retrieveRunAttributesImpl( void retrieveRunAttributesImpl(
ParagraphImpl const * pParagraph, ::sal_Int32 Index, ParagraphImpl const * pParagraph, ::sal_Int32 Index,
const ::css::uno::Sequence< OUString >& RequestedAttributes, const css::uno::Sequence< OUString >& RequestedAttributes,
tPropValMap& rRunAttrSeq); tPropValMap& rRunAttrSeq);
static ::css::uno::Sequence< ::css::beans::PropertyValue > static css::uno::Sequence< css::beans::PropertyValue >
convertHashMapToSequence(tPropValMap& rAttrSeq); convertHashMapToSequence(tPropValMap& rAttrSeq);
::css::uno::Reference< ::css::accessibility::XAccessible > m_xAccessible; css::uno::Reference< css::accessibility::XAccessible > m_xAccessible;
::TextEngine & m_rEngine; ::TextEngine & m_rEngine;
::TextView & m_rView; ::TextView & m_rView;

550
accessibility/source/extended/textwindowaccessibility.cxx
View File

File diff suppressed because it is too large Load Diff

2
desktop/source/migration/services/jvmfwk.cxx
View File

@@ -202,7 +202,7 @@ public:
private: private:
OUString m_sUserDir; OUString m_sUserDir;
css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; css::uno::Reference< css::configuration::backend::XLayer> m_xLayer;
void migrateJavarc(); void migrateJavarc();
typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;

2
javaunohelper/source/vm.cxx
View File

@@ -117,7 +117,7 @@ namespace javaunohelper {
} }
css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( 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 ) ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access )
{ {
css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) );

2
sc/source/ui/vba/vbarange.hxx
View File

@@ -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) ; 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); void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL AutoOutline( ) 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 ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL Ungroup( ) 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); virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);

4
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
View File

@@ -97,8 +97,8 @@ public:
*/ */
void NotifyListeners ( void NotifyListeners (
const ::rtl::OUString& rsEventType, const ::rtl::OUString& rsEventType,
const ::css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, 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::XResource>& rxResourceObject);
/** Call all listeners and inform them that the /** Call all listeners and inform them that the
ConfigurationController is being disposed. When this method returns ConfigurationController is being disposed. When this method returns

2
sd/source/ui/framework/module/ToolBarModule.hxx
View File

@@ -40,7 +40,7 @@ namespace sd { namespace framework {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper1 <
::css::drawing::framework::XConfigurationChangeListener css::drawing::framework::XConfigurationChangeListener
> ToolBarModuleInterfaceBase; > ToolBarModuleInterfaceBase;
} }

2
sd/source/ui/framework/module/ViewTabBarModule.hxx
View File

@@ -32,7 +32,7 @@
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper1 <
::css::drawing::framework::XConfigurationChangeListener css::drawing::framework::XConfigurationChangeListener
> ViewTabBarModuleInterfaceBase; > ViewTabBarModuleInterfaceBase;
} // end of anonymous namespace. } // end of anonymous namespace.

4
sd/source/ui/inc/framework/ConfigurationController.hxx
View File

@@ -42,8 +42,8 @@
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper2 < typedef ::cppu::WeakComponentImplHelper2 <
::css::drawing::framework::XConfigurationController, css::drawing::framework::XConfigurationController,
::css::lang::XInitialization css::lang::XInitialization
> ConfigurationControllerInterfaceBase; > ConfigurationControllerInterfaceBase;
} // end of anonymous namespace. } // end of anonymous namespace.

2
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
View File

@@ -80,7 +80,7 @@ public:
(when the sd modules is unloaded) is done by a) calling dispose() (when the sd modules is unloaded) is done by a) calling dispose()
when the XComponent is supported and by b) releasing the reference. 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: protected:
friend class ::SdModule; friend class ::SdModule;

8
sd/source/ui/presenter/SlideRenderer.hxx
View File

@@ -61,16 +61,16 @@ public:
// XSlideRenderer // XSlideRenderer
virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( 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, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor) sal_Int16 nSuperSampleFactor)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas ( 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, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor, sal_Int16 nSuperSampleFactor,
const ::css::uno::Reference<css::rendering::XCanvas>& rxCanvas) const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual css::awt::Size SAL_CALL calculatePreviewSize ( virtual css::awt::Size SAL_CALL calculatePreviewSize (
@@ -82,7 +82,7 @@ private:
PreviewRenderer maPreviewRenderer; PreviewRenderer maPreviewRenderer;
BitmapEx CreatePreview ( BitmapEx CreatePreview (
const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
const css::awt::Size& rMaximumPreviewPixelSize, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor) sal_Int16 nSuperSampleFactor)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);

2
sdext/source/presenter/PresenterConfigurationAccess.hxx
View File

@@ -126,7 +126,7 @@ public:
const ::std::vector<css::uno::Any>&) > ItemProcessor; const ::std::vector<css::uno::Any>&) > ItemProcessor;
typedef ::boost::function<void( typedef ::boost::function<void(
const ::rtl::OUString&, 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. /** Execute a functor for all elements of the given container.
@param rxContainer @param rxContainer

2
sdext/source/presenter/PresenterFrameworkObserver.hxx
View File

@@ -58,7 +58,7 @@ public:
private: private:
::rtl::OUString msEventType; ::rtl::OUString msEventType;
::css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController;
Predicate maPredicate; Predicate maPredicate;
Action maAction; Action maAction;

4
sdext/source/presenter/PresenterSprite.cxx
View File

@@ -54,7 +54,7 @@ PresenterSprite::~PresenterSprite (void)
} }
void PresenterSprite::SetFactory ( void PresenterSprite::SetFactory (
const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory) const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory)
{ {
if (mxSpriteFactory != 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(); ProvideSprite();
if (mxSprite.is()) if (mxSprite.is())

8
sdext/source/presenter/PresenterSprite.hxx
View File

@@ -45,9 +45,9 @@ public:
It is also used to call updateScreen() at (wrapped by the Update() method). It is also used to call updateScreen() at (wrapped by the Update() method).
*/ */
void SetFactory ( 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 Show (void);
void Hide (void); void Hide (void);
@@ -58,8 +58,8 @@ public:
void Update (void); void Update (void);
private: private:
::css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory;
::css::uno::Reference<css::rendering::XCustomSprite> mxSprite; css::uno::Reference<css::rendering::XCustomSprite> mxSprite;
css::geometry::RealSize2D maSize; css::geometry::RealSize2D maSize;
css::geometry::RealPoint2D maLocation; css::geometry::RealPoint2D maLocation;
bool mbIsVisible; bool mbIsVisible;

2
sdext/source/presenter/PresenterTextView.cxx
View File

@@ -64,7 +64,7 @@ namespace sdext { namespace presenter {
PresenterTextView::PresenterTextView ( PresenterTextView::PresenterTextView (
const Reference<XComponentContext>& rxContext, const Reference<XComponentContext>& rxContext,
const Reference<rendering::XCanvas>& rxCanvas, 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), : mxCanvas(rxCanvas),
mbDoOuput(true), mbDoOuput(true),
mxBreakIterator(), mxBreakIterator(),

4
sdext/source/presenter/PresenterTextView.hxx
View File

@@ -222,7 +222,7 @@ public:
PresenterTextView ( PresenterTextView (
const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, 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 SetText (const css::uno::Reference<css::text::XText>& rxText);
void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster);
@@ -267,7 +267,7 @@ private:
SharedPresenterTextCaret mpCaret; SharedPresenterTextCaret mpCaret;
double mnLeftOffset; double mnLeftOffset;
double mnTopOffset; double mnTopOffset;
const ::boost::function<void(const ::css::awt::Rectangle&)> maInvalidator; const ::boost::function<void(const css::awt::Rectangle&)> maInvalidator;
bool mbIsFormatPending; bool mbIsFormatPending;
sal_Int32 mnCharacterCount; sal_Int32 mnCharacterCount;
::boost::function<void(void)> maTextChangeBroadcaster; ::boost::function<void(void)> maTextChangeBroadcaster;

2
sdext/source/presenter/PresenterToolBar.hxx
View File

@@ -211,7 +211,7 @@ private:
const bool bMouseDown=false); const bool bMouseDown=false);
void ProcessEntry ( void ProcessEntry (
const ::css::uno::Reference<css::beans::XPropertySet>& rProperties, const css::uno::Reference<css::beans::XPropertySet>& rProperties,
Context& rContext); Context& rContext);
/** This method throws a DisposedException when the object has already been /** This method throws a DisposedException when the object has already been

2
sdext/source/presenter/PresenterWindowManager.hxx
View File

@@ -68,7 +68,7 @@ class PresenterWindowManager
{ {
public: public:
PresenterWindowManager ( 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<PresenterPaneContainer>& rpPaneContainer,
const ::rtl::Reference<PresenterController>& rpPresenterController); const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterWindowManager (void); virtual ~PresenterWindowManager (void);

4
sfx2/source/notify/eventsupplier.cxx
View File

@@ -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 ) void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const css::document::DocumentEvent& _Event )
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
implts_notifyJobExecution(css::document::EventObject(_Event.Source, _Event.EventName)); implts_notifyJobExecution(css::document::EventObject(_Event.Source, _Event.EventName));
implts_checkAndExecuteEventBindings(_Event); implts_checkAndExecuteEventBindings(_Event);

4
svtools/source/edit/svmedit.cxx
View File

@@ -34,10 +34,10 @@ MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId )
} }
// virtual // virtual
::css::uno::Reference< ::css::awt::XWindowPeer > css::uno::Reference< css::awt::XWindowPeer >
MultiLineEdit::GetComponentInterface(sal_Bool bCreate) MultiLineEdit::GetComponentInterface(sal_Bool bCreate)
{ {
::css::uno::Reference< ::css::awt::XWindowPeer > xPeer( css::uno::Reference< css::awt::XWindowPeer > xPeer(
VclMultiLineEdit::GetComponentInterface(false)); VclMultiLineEdit::GetComponentInterface(false));
if (!xPeer.is() && bCreate) if (!xPeer.is() && bCreate)
{ {

2
svtools/source/edit/textwindowpeer.cxx
View File

@@ -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( return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext(
this, m_rEngine, m_rView, m_bCompoundControlChild this, m_rEngine, m_rView, m_bCompoundControlChild

118
toolkit/source/awt/vclxtoolkit.cxx
View File

@@ -506,7 +506,7 @@ void SAL_CALL VCLXToolkit::disposing()
::Application::RemoveKeyListener(m_aKeyListenerLink); ::Application::RemoveKeyListener(m_aKeyListenerLink);
m_bKeyListener = false; m_bKeyListener = false;
} }
::css::lang::EventObject aEvent( css::lang::EventObject aEvent(
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
m_aTopWindowListeners.disposeAndClear(aEvent); m_aTopWindowListeners.disposeAndClear(aEvent);
m_aKeyHandlers.disposeAndClear(aEvent); m_aKeyHandlers.disposeAndClear(aEvent);
@@ -1380,38 +1380,38 @@ sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) thr
// virtual // virtual
::sal_Int32 SAL_CALL VCLXToolkit::getTopWindowCount() ::sal_Int32 SAL_CALL VCLXToolkit::getTopWindowCount()
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
return static_cast< ::sal_Int32 >(::Application::GetTopWindowCount()); return static_cast< ::sal_Int32 >(::Application::GetTopWindowCount());
// XXX numeric overflow // XXX numeric overflow
} }
// virtual // virtual
::css::uno::Reference< ::css::awt::XTopWindow > SAL_CALL css::uno::Reference< css::awt::XTopWindow > SAL_CALL
VCLXToolkit::getTopWindow(::sal_Int32 nIndex) VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex)); ::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex));
// XXX numeric overflow // XXX numeric overflow
return ::css::uno::Reference< ::css::awt::XTopWindow >( return css::uno::Reference< css::awt::XTopWindow >(
p == 0 ? 0 : static_cast< ::css::awt::XWindow * >(p->GetWindowPeer()), p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
::css::uno::UNO_QUERY); css::uno::UNO_QUERY);
} }
// virtual // virtual
::css::uno::Reference< ::css::awt::XTopWindow > SAL_CALL css::uno::Reference< css::awt::XTopWindow > SAL_CALL
VCLXToolkit::getActiveTopWindow() throw (::css::uno::RuntimeException) VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException)
{ {
::Window * p = ::Application::GetActiveTopWindow(); ::Window * p = ::Application::GetActiveTopWindow();
return ::css::uno::Reference< ::css::awt::XTopWindow >( return css::uno::Reference< css::awt::XTopWindow >(
p == 0 ? 0 : static_cast< ::css::awt::XWindow * >(p->GetWindowPeer()), p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
::css::uno::UNO_QUERY); css::uno::UNO_QUERY);
} }
// virtual // virtual
void SAL_CALL VCLXToolkit::addTopWindowListener( void SAL_CALL VCLXToolkit::addTopWindowListener(
::css::uno::Reference< ::css::awt::XTopWindowListener > const & rListener) css::uno::Reference< css::awt::XTopWindowListener > const & rListener)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
OSL_ENSURE(rListener.is(), "Null rListener"); OSL_ENSURE(rListener.is(), "Null rListener");
::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1419,7 +1419,7 @@ void SAL_CALL VCLXToolkit::addTopWindowListener(
{ {
aGuard.clear(); aGuard.clear();
rListener->disposing( rListener->disposing(
::css::lang::EventObject( css::lang::EventObject(
static_cast< ::cppu::OWeakObject * >(this))); static_cast< ::cppu::OWeakObject * >(this)));
} }
else if (m_aTopWindowListeners.addInterface(rListener) == 1 else if (m_aTopWindowListeners.addInterface(rListener) == 1
@@ -1432,8 +1432,8 @@ void SAL_CALL VCLXToolkit::addTopWindowListener(
// virtual // virtual
void SAL_CALL VCLXToolkit::removeTopWindowListener( void SAL_CALL VCLXToolkit::removeTopWindowListener(
::css::uno::Reference< ::css::awt::XTopWindowListener > const & rListener) css::uno::Reference< css::awt::XTopWindowListener > const & rListener)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard(rBHelper.rMutex); ::osl::MutexGuard aGuard(rBHelper.rMutex);
if (!(rBHelper.bDisposed || rBHelper.bInDispose) if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1447,8 +1447,8 @@ void SAL_CALL VCLXToolkit::removeTopWindowListener(
// virtual // virtual
void SAL_CALL VCLXToolkit::addKeyHandler( void SAL_CALL VCLXToolkit::addKeyHandler(
::css::uno::Reference< ::css::awt::XKeyHandler > const & rHandler) css::uno::Reference< css::awt::XKeyHandler > const & rHandler)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
OSL_ENSURE(rHandler.is(), "Null rHandler"); OSL_ENSURE(rHandler.is(), "Null rHandler");
::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1456,7 +1456,7 @@ void SAL_CALL VCLXToolkit::addKeyHandler(
{ {
aGuard.clear(); aGuard.clear();
rHandler->disposing( rHandler->disposing(
::css::lang::EventObject( css::lang::EventObject(
static_cast< ::cppu::OWeakObject * >(this))); static_cast< ::cppu::OWeakObject * >(this)));
} }
else if (m_aKeyHandlers.addInterface(rHandler) == 1 && !m_bKeyListener) else if (m_aKeyHandlers.addInterface(rHandler) == 1 && !m_bKeyListener)
@@ -1468,8 +1468,8 @@ void SAL_CALL VCLXToolkit::addKeyHandler(
// virtual // virtual
void SAL_CALL VCLXToolkit::removeKeyHandler( void SAL_CALL VCLXToolkit::removeKeyHandler(
::css::uno::Reference< ::css::awt::XKeyHandler > const & rHandler) css::uno::Reference< css::awt::XKeyHandler > const & rHandler)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard(rBHelper.rMutex); ::osl::MutexGuard aGuard(rBHelper.rMutex);
if (!(rBHelper.bDisposed || rBHelper.bInDispose) if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1482,8 +1482,8 @@ void SAL_CALL VCLXToolkit::removeKeyHandler(
// virtual // virtual
void SAL_CALL VCLXToolkit::addFocusListener( void SAL_CALL VCLXToolkit::addFocusListener(
::css::uno::Reference< ::css::awt::XFocusListener > const & rListener) css::uno::Reference< css::awt::XFocusListener > const & rListener)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
OSL_ENSURE(rListener.is(), "Null rListener"); OSL_ENSURE(rListener.is(), "Null rListener");
::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1491,7 +1491,7 @@ void SAL_CALL VCLXToolkit::addFocusListener(
{ {
aGuard.clear(); aGuard.clear();
rListener->disposing( rListener->disposing(
::css::lang::EventObject( css::lang::EventObject(
static_cast< ::cppu::OWeakObject * >(this))); static_cast< ::cppu::OWeakObject * >(this)));
} }
else if (m_aFocusListeners.addInterface(rListener) == 1 else if (m_aFocusListeners.addInterface(rListener) == 1
@@ -1504,8 +1504,8 @@ void SAL_CALL VCLXToolkit::addFocusListener(
// virtual // virtual
void SAL_CALL VCLXToolkit::removeFocusListener( void SAL_CALL VCLXToolkit::removeFocusListener(
::css::uno::Reference< ::css::awt::XFocusListener > const & rListener) css::uno::Reference< css::awt::XFocusListener > const & rListener)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard(rBHelper.rMutex); ::osl::MutexGuard aGuard(rBHelper.rMutex);
if (!(rBHelper.bDisposed || rBHelper.bInDispose) if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1540,23 +1540,23 @@ IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent const *, pEvent)
{ {
case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_SHOW:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowOpened); pEvent, &css::awt::XTopWindowListener::windowOpened);
break; break;
case VCLEVENT_WINDOW_HIDE: case VCLEVENT_WINDOW_HIDE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowClosed); pEvent, &css::awt::XTopWindowListener::windowClosed);
break; break;
case VCLEVENT_WINDOW_ACTIVATE: case VCLEVENT_WINDOW_ACTIVATE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowActivated); pEvent, &css::awt::XTopWindowListener::windowActivated);
break; break;
case VCLEVENT_WINDOW_DEACTIVATE: case VCLEVENT_WINDOW_DEACTIVATE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowDeactivated); pEvent, &css::awt::XTopWindowListener::windowDeactivated);
break; break;
case VCLEVENT_WINDOW_CLOSE: case VCLEVENT_WINDOW_CLOSE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowClosing); pEvent, &css::awt::XTopWindowListener::windowClosing);
break; break;
case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_GETFOCUS:
callFocusListeners(pEvent, true); callFocusListeners(pEvent, true);
@@ -1566,11 +1566,11 @@ IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent const *, pEvent)
break; break;
case VCLEVENT_WINDOW_MINIMIZE: case VCLEVENT_WINDOW_MINIMIZE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowMinimized); pEvent, &css::awt::XTopWindowListener::windowMinimized);
break; break;
case VCLEVENT_WINDOW_NORMALIZE: case VCLEVENT_WINDOW_NORMALIZE:
callTopWindowListeners( callTopWindowListeners(
pEvent, &::css::awt::XTopWindowListener::windowNormalized); pEvent, &css::awt::XTopWindowListener::windowNormalized);
break; break;
} }
return 0; return 0;
@@ -1590,28 +1590,28 @@ IMPL_LINK(VCLXToolkit, keyListenerHandler, ::VclSimpleEvent const *, pEvent)
void VCLXToolkit::callTopWindowListeners( void VCLXToolkit::callTopWindowListeners(
::VclSimpleEvent const * pEvent, ::VclSimpleEvent const * pEvent,
void (SAL_CALL ::css::awt::XTopWindowListener::* pFn)( void (SAL_CALL css::awt::XTopWindowListener::* pFn)(
::css::lang::EventObject const &)) css::lang::EventObject const &))
{ {
::Window * pWindow ::Window * pWindow
= static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
if (pWindow->IsTopWindow()) 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()); aListeners(m_aTopWindowListeners.getElements());
if (aListeners.hasElements()) if (aListeners.hasElements())
{ {
::css::lang::EventObject aAwtEvent( css::lang::EventObject aAwtEvent(
static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer())); static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()));
for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i) for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i)
{ {
::css::uno::Reference< ::css::awt::XTopWindowListener > css::uno::Reference< css::awt::XTopWindowListener >
xListener(aListeners[i], ::css::uno::UNO_QUERY); xListener(aListeners[i], css::uno::UNO_QUERY);
try try
{ {
(xListener.get()->*pFn)(aAwtEvent); (xListener.get()->*pFn)(aAwtEvent);
} }
catch (const ::css::uno::RuntimeException & rEx) catch (const css::uno::RuntimeException & rEx)
{ {
OSL_TRACE( OSL_TRACE(
"VCLXToolkit::callTopWindowListeners: caught %s\n", "VCLXToolkit::callTopWindowListeners: caught %s\n",
@@ -1626,7 +1626,7 @@ void VCLXToolkit::callTopWindowListeners(
long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
bool bPressed) bool bPressed)
{ {
::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >
aHandlers(m_aKeyHandlers.getElements()); aHandlers(m_aKeyHandlers.getElements());
if (aHandlers.hasElements()) 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 // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event
::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >( ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >(
static_cast< ::VclWindowEvent const * >(pEvent)->GetData()); static_cast< ::VclWindowEvent const * >(pEvent)->GetData());
::css::awt::KeyEvent aAwtEvent( css::awt::KeyEvent aAwtEvent(
static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer()), static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()),
(pKeyEvent->GetKeyCode().IsShift() (pKeyEvent->GetKeyCode().IsShift()
? ::css::awt::KeyModifier::SHIFT : 0) ? css::awt::KeyModifier::SHIFT : 0)
| (pKeyEvent->GetKeyCode().IsMod1() | (pKeyEvent->GetKeyCode().IsMod1()
? ::css::awt::KeyModifier::MOD1 : 0) ? css::awt::KeyModifier::MOD1 : 0)
| (pKeyEvent->GetKeyCode().IsMod2() | (pKeyEvent->GetKeyCode().IsMod2()
? ::css::awt::KeyModifier::MOD2 : 0) ? css::awt::KeyModifier::MOD2 : 0)
| (pKeyEvent->GetKeyCode().IsMod3() | (pKeyEvent->GetKeyCode().IsMod3()
? ::css::awt::KeyModifier::MOD3 : 0), ? css::awt::KeyModifier::MOD3 : 0),
pKeyEvent->GetKeyCode().GetCode(), pKeyEvent->GetCharCode(), pKeyEvent->GetKeyCode().GetCode(), pKeyEvent->GetCharCode(),
sal::static_int_cast< sal_Int16 >( sal::static_int_cast< sal_Int16 >(
pKeyEvent->GetKeyCode().GetFunction())); pKeyEvent->GetKeyCode().GetFunction()));
for (::sal_Int32 i = 0; i < aHandlers.getLength(); ++i) for (::sal_Int32 i = 0; i < aHandlers.getLength(); ++i)
{ {
::css::uno::Reference< ::css::awt::XKeyHandler > xHandler( css::uno::Reference< css::awt::XKeyHandler > xHandler(
aHandlers[i], ::css::uno::UNO_QUERY); aHandlers[i], css::uno::UNO_QUERY);
try try
{ {
if ((bPressed ? xHandler->keyPressed(aAwtEvent) if ((bPressed ? xHandler->keyPressed(aAwtEvent)
: xHandler->keyReleased(aAwtEvent))) : xHandler->keyReleased(aAwtEvent)))
return 1; return 1;
} }
catch (const ::css::uno::RuntimeException & rEx) catch (const css::uno::RuntimeException & rEx)
{ {
OSL_TRACE( OSL_TRACE(
"VCLXToolkit::callKeyHandlers: caught %s\n", "VCLXToolkit::callKeyHandlers: caught %s\n",
@@ -1678,14 +1678,14 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
= static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
if (pWindow->IsTopWindow()) 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()); aListeners(m_aFocusListeners.getElements());
if (aListeners.hasElements()) if (aListeners.hasElements())
{ {
// Ignore the interior of compound controls when determining the // Ignore the interior of compound controls when determining the
// window that gets the focus next (see implementation in // window that gets the focus next (see implementation in
// vclxwindow.cxx for mapping between VCL and UNO AWT event): // 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(); ::Window * pFocus = ::Application::GetFocusWindow();
for (::Window * p = pFocus; p != 0; p = p->GetParent()) for (::Window * p = pFocus; p != 0; p = p->GetParent())
if (!p->IsCompoundControl()) if (!p->IsCompoundControl())
@@ -1695,19 +1695,19 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
} }
if (pFocus != 0) if (pFocus != 0)
xNext = pFocus->GetComponentInterface(true); xNext = pFocus->GetComponentInterface(true);
::css::awt::FocusEvent aAwtEvent( css::awt::FocusEvent aAwtEvent(
static_cast< ::css::awt::XWindow * >(pWindow->GetWindowPeer()), static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()),
pWindow->GetGetFocusFlags(), xNext, false); pWindow->GetGetFocusFlags(), xNext, false);
for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i) for (::sal_Int32 i = 0; i < aListeners.getLength(); ++i)
{ {
::css::uno::Reference< ::css::awt::XFocusListener > xListener( css::uno::Reference< css::awt::XFocusListener > xListener(
aListeners[i], ::css::uno::UNO_QUERY); aListeners[i], css::uno::UNO_QUERY);
try try
{ {
bGained ? xListener->focusGained(aAwtEvent) bGained ? xListener->focusGained(aAwtEvent)
: xListener->focusLost(aAwtEvent); : xListener->focusLost(aAwtEvent);
} }
catch (const ::css::uno::RuntimeException & rEx) catch (const css::uno::RuntimeException & rEx)
{ {
OSL_TRACE( OSL_TRACE(
"VCLXToolkit::callFocusListeners: caught %s\n", "VCLXToolkit::callFocusListeners: caught %s\n",

4
ucb/source/sorter/sortdynres.hxx
View File

@@ -146,7 +146,7 @@ public:
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual void SAL_CALL virtual void SAL_CALL
impl_notify( const ::css::ucb::ListEvent& Changes ) impl_notify( const css::ucb::ListEvent& Changes )
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
}; };
@@ -179,7 +179,7 @@ public:
// XDynamicResultSetListener // XDynamicResultSetListener
//----------------------------------------------------------------- //-----------------------------------------------------------------
virtual void SAL_CALL virtual void SAL_CALL
notify( const ::css::ucb::ListEvent& Changes ) notify( const css::ucb::ListEvent& Changes )
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
//----------------------------------------------------------------- //-----------------------------------------------------------------

134
unotools/source/ucbhelper/xtempfile.cxx
View File

@@ -23,8 +23,8 @@
#include <osl/file.hxx> #include <osl/file.hxx>
#include <unotools/configmgr.hxx> #include <unotools/configmgr.hxx>
OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context) OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentContext > const & context)
: ::cppu::PropertySetMixin< ::css::io::XTempFile >( : ::cppu::PropertySetMixin< css::io::XTempFile >(
context context
, static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS ) , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
, com::sun::star::uno::Sequence< rtl::OUString >() ) , com::sun::star::uno::Sequence< rtl::OUString >() )
@@ -49,12 +49,12 @@ OTempFileService::~OTempFileService ()
// XInterface // XInterface
::css::uno::Any SAL_CALL OTempFileService::queryInterface( ::css::uno::Type const & aType ) css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType )
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
::css::uno::Any aResult( OTempFileBase::queryInterface( aType ) ); css::uno::Any aResult( OTempFileBase::queryInterface( aType ) );
if (!aResult.hasValue()) if (!aResult.hasValue())
aResult = cppu::PropertySetMixin< ::css::io::XTempFile >::queryInterface( aType ) ; aResult = cppu::PropertySetMixin< css::io::XTempFile >::queryInterface( aType ) ;
return aResult; return aResult;
}; };
void SAL_CALL OTempFileService::acquire( ) void SAL_CALL OTempFileService::acquire( )
@@ -70,8 +70,8 @@ throw ()
// XTypeProvider // XTypeProvider
::css::uno::Sequence< ::css::uno::Type > SAL_CALL OTempFileService::getTypes( ) css::uno::Sequence< css::uno::Type > SAL_CALL OTempFileService::getTypes( )
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
static ::cppu::OTypeCollection* pTypeCollection = NULL; static ::cppu::OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL ) if ( pTypeCollection == NULL )
@@ -81,15 +81,15 @@ throw ( ::css::uno::RuntimeException )
if ( pTypeCollection == NULL ) if ( pTypeCollection == NULL )
{ {
static ::cppu::OTypeCollection aTypeCollection( static ::cppu::OTypeCollection aTypeCollection(
::getCppuType( ( const ::css::uno::Reference< ::css::beans::XPropertySet >*)NULL ) ::getCppuType( ( const css::uno::Reference< css::beans::XPropertySet >*)NULL )
,OTempFileBase::getTypes() ); ,OTempFileBase::getTypes() );
pTypeCollection = &aTypeCollection; pTypeCollection = &aTypeCollection;
} }
} }
return pTypeCollection->getTypes(); return pTypeCollection->getTypes();
}; };
::css::uno::Sequence< sal_Int8 > SAL_CALL OTempFileService::getImplementationId( ) css::uno::Sequence< sal_Int8 > SAL_CALL OTempFileService::getImplementationId( )
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
return OTempFileBase::getImplementationId(); return OTempFileBase::getImplementationId();
} }
@@ -97,53 +97,53 @@ throw ( ::css::uno::RuntimeException )
// XTempFile // XTempFile
sal_Bool SAL_CALL OTempFileService::getRemoveFile() sal_Bool SAL_CALL OTempFileService::getRemoveFile()
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( !mpTempFile ) if ( !mpTempFile )
{ {
// the stream is already disconnected // the stream is already disconnected
throw ::css::uno::RuntimeException(); throw css::uno::RuntimeException();
} }
return mbRemoveFile; return mbRemoveFile;
}; };
void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile ) void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile )
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( !mpTempFile ) if ( !mpTempFile )
{ {
// the stream is already disconnected // the stream is already disconnected
throw ::css::uno::RuntimeException(); throw css::uno::RuntimeException();
} }
mbRemoveFile = _removefile; mbRemoveFile = _removefile;
mpTempFile->EnableKillingFile( mbRemoveFile ); mpTempFile->EnableKillingFile( mbRemoveFile );
}; };
::rtl::OUString SAL_CALL OTempFileService::getUri() ::rtl::OUString SAL_CALL OTempFileService::getUri()
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( !mpTempFile ) if ( !mpTempFile )
{ {
throw ::css::uno::RuntimeException(); throw css::uno::RuntimeException();
} }
return ::rtl::OUString( mpTempFile->GetURL() ); return ::rtl::OUString( mpTempFile->GetURL() );
}; };
::rtl::OUString SAL_CALL OTempFileService::getResourceName() ::rtl::OUString SAL_CALL OTempFileService::getResourceName()
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( !mpTempFile ) if ( !mpTempFile )
{ {
throw ::css::uno::RuntimeException(); throw css::uno::RuntimeException();
} }
return ::rtl::OUString( mpTempFile->GetFileName() ); return ::rtl::OUString( mpTempFile->GetFileName() );
@@ -153,16 +153,16 @@ throw ( ::css::uno::RuntimeException )
// XInputStream // XInputStream
sal_Int32 SAL_CALL OTempFileService::readBytes( ::css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) 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 ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( mbInClosed ) 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(); checkConnected();
if (nBytesToRead < 0) 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); aData.realloc(nBytesToRead);
@@ -186,18 +186,18 @@ throw (::css::io::NotConnectedException, ::css::io::BufferSizeExceededException,
return nRead; return nRead;
} }
sal_Int32 SAL_CALL OTempFileService::readSomeBytes( ::css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) 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 ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( mbInClosed ) 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(); checkConnected();
checkError(); checkError();
if (nMaxBytesToRead < 0) 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()) if (mpStream->IsEof())
{ {
@@ -208,11 +208,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException
return readBytes(aData, nMaxBytesToRead); return readBytes(aData, nMaxBytesToRead);
} }
void SAL_CALL OTempFileService::skipBytes( sal_Int32 nBytesToSkip ) 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 ); ::osl::MutexGuard aGuard( maMutex );
if ( mbInClosed ) 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(); checkConnected();
checkError(); checkError();
@@ -220,11 +220,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException
checkError(); checkError();
} }
sal_Int32 SAL_CALL OTempFileService::available( ) 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 ); ::osl::MutexGuard aGuard( maMutex );
if ( mbInClosed ) 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(); checkConnected();
@@ -241,11 +241,11 @@ throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::Ru
return nAvailable; return nAvailable;
} }
void SAL_CALL OTempFileService::closeInput( ) 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 ); ::osl::MutexGuard aGuard( maMutex );
if ( mbInClosed ) 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; mbInClosed = sal_True;
@@ -264,36 +264,36 @@ throw ( ::css::io::NotConnectedException, ::css::io::IOException, ::css::uno::Ru
// XOutputStream // XOutputStream
void SAL_CALL OTempFileService::writeBytes( const ::css::uno::Sequence< sal_Int8 >& aData ) 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 ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
if ( mbOutClosed ) 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(); checkConnected();
sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength()); sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength());
checkError(); checkError();
if ( nWritten != (sal_uInt32)aData.getLength()) 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( ) 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 ); ::osl::MutexGuard aGuard( maMutex );
if ( mbOutClosed ) 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(); checkConnected();
mpStream->Flush(); mpStream->Flush();
checkError(); checkError();
} }
void SAL_CALL OTempFileService::closeOutput( ) 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 ); ::osl::MutexGuard aGuard( maMutex );
if ( mbOutClosed ) 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; mbOutClosed = sal_True;
@@ -325,7 +325,7 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException
void OTempFileService::checkError () const void OTempFileService::checkError () const
{ {
if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) 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 () void OTempFileService::checkConnected ()
{ {
@@ -349,24 +349,24 @@ void OTempFileService::checkConnected ()
} }
if (!mpStream) 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 // XSeekable
void SAL_CALL OTempFileService::seek( sal_Int64 nLocation ) 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 ); ::osl::MutexGuard aGuard( maMutex );
checkConnected(); checkConnected();
if ( nLocation < 0 || nLocation > getLength() ) if ( nLocation < 0 || nLocation > getLength() )
throw ::css::lang::IllegalArgumentException(); throw css::lang::IllegalArgumentException();
mpStream->Seek((sal_uInt32) nLocation ); mpStream->Seek((sal_uInt32) nLocation );
checkError(); checkError();
} }
sal_Int64 SAL_CALL OTempFileService::getPosition( ) sal_Int64 SAL_CALL OTempFileService::getPosition( )
throw ( ::css::io::IOException, ::css::uno::RuntimeException ) throw ( css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
checkConnected(); checkConnected();
@@ -376,7 +376,7 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException )
return (sal_Int64)nPos; return (sal_Int64)nPos;
} }
sal_Int64 SAL_CALL OTempFileService::getLength( ) sal_Int64 SAL_CALL OTempFileService::getLength( )
throw ( ::css::io::IOException, ::css::uno::RuntimeException ) throw ( css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
checkConnected(); checkConnected();
@@ -396,22 +396,22 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException )
// XStream // XStream
::css::uno::Reference< ::css::io::XInputStream > SAL_CALL OTempFileService::getInputStream() css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream()
throw ( ::css::uno::RuntimeException ) 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() css::uno::Reference< css::io::XOutputStream > SAL_CALL OTempFileService::getOutputStream()
throw ( ::css::uno::RuntimeException ) 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 // XTruncate
void SAL_CALL OTempFileService::truncate() void SAL_CALL OTempFileService::truncate()
throw ( ::css::io::IOException, ::css::uno::RuntimeException ) throw ( css::io::IOException, css::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
checkConnected(); checkConnected();
@@ -424,20 +424,20 @@ throw ( ::css::io::IOException, ::css::uno::RuntimeException )
// XServiceInfo // XServiceInfo
::rtl::OUString SAL_CALL OTempFileService::getImplementationName() ::rtl::OUString SAL_CALL OTempFileService::getImplementationName()
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
return getImplementationName_Static(); return getImplementationName_Static();
} }
sal_Bool SAL_CALL OTempFileService::supportsService( ::rtl::OUString const & rServiceName ) 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]; return rServiceName == aServices[0];
} }
::css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames() css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames()
throw ( ::css::uno::RuntimeException ) throw ( css::uno::RuntimeException )
{ {
return getSupportedServiceNames_Static(); return getSupportedServiceNames_Static();
} }
@@ -448,20 +448,20 @@ throw ( ::css::uno::RuntimeException )
{ {
return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" ); 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"; aNames[0] = "com.sun.star.io.TempFile";
return aNames; return aNames;
} }
::css::uno::Reference < ::css::uno::XInterface >SAL_CALL XTempFile_createInstance( css::uno::Reference < css::uno::XInterface >SAL_CALL XTempFile_createInstance(
css::uno::Reference< ::css::uno::XComponentContext > const & context) css::uno::Reference< css::uno::XComponentContext > const & context)
SAL_THROW( ( css::uno::Exception ) ) SAL_THROW( ( css::uno::Exception ) )
{ {
return static_cast< ::cppu::OWeakObject * >( new OTempFileService(context) ); 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() ); 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*/ ) SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = 0;
::css::uno::Reference< ::css::lang::XMultiServiceFactory > xSMgr( css::uno::Reference< css::lang::XMultiServiceFactory > xSMgr(
reinterpret_cast< ::css::lang::XMultiServiceFactory * >( pServiceManager ) ); reinterpret_cast< css::lang::XMultiServiceFactory * >( pServiceManager ) );
::css::uno::Reference< ::css::lang::XSingleComponentFactory > xFactory; css::uno::Reference< css::lang::XSingleComponentFactory > xFactory;
if (OTempFileService::getImplementationName_Static().compareToAscii( pImplName ) == 0) if (OTempFileService::getImplementationName_Static().compareToAscii( pImplName ) == 0)
xFactory = OTempFileService::createServiceFactory_Static(); xFactory = OTempFileService::createServiceFactory_Static();

48
ure/source/uretest/cppmain.cc
View File

@@ -55,15 +55,15 @@
namespace { namespace {
class Service: public ::cppu::WeakImplHelper1< ::css::lang::XMain > { class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
public: public:
explicit Service( explicit Service(
::css::uno::Reference< ::css::uno::XComponentContext > const & context): css::uno::Reference< css::uno::XComponentContext > const & context):
context_(context) {} context_(context) {}
virtual ::sal_Int32 SAL_CALL run( virtual ::sal_Int32 SAL_CALL run(
::css::uno::Sequence< ::rtl::OUString > const &) css::uno::Sequence< ::rtl::OUString > const &)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
private: private:
Service(Service &); // not defined Service(Service &); // not defined
@@ -72,14 +72,14 @@ private:
virtual ~Service() {} virtual ~Service() {}
void test( void test(
::css::uno::Reference< test::types::XTest > const & test, css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name); ::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 &) ::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
osl_getThreadIdentifier(0); // check for sal osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper (new salhelper::SimpleReferenceObject)->release(); // check for salhelper
@@ -129,19 +129,19 @@ private:
}; };
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) { for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
::rtl::OUString name(::rtl::OUString::createFromAscii(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 { try {
instance = context_->getServiceManager()->createInstanceWithContext( instance = context_->getServiceManager()->createInstanceWithContext(
name, context_); name, context_);
} catch (::css::uno::RuntimeException &) { } catch (css::uno::RuntimeException &) {
throw; throw;
} catch (::css::uno::Exception &) { } catch (css::uno::Exception &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
::rtl::OUString("error creating instance"), ::rtl::OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
} }
if (!instance.is()) { if (!instance.is()) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
"no instance: " + name, "no instance: " + name,
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
} }
@@ -153,9 +153,9 @@ private:
::rtl::OUStringBuffer b; ::rtl::OUStringBuffer b;
b.append("/singletons/"); b.append("/singletons/");
b.append(singletons[i]); b.append(singletons[i]);
::css::uno::Reference< ::css::uno::XInterface > instance( css::uno::Reference< css::uno::XInterface > instance(
context_->getValueByName(b.makeStringAndClear()), context_->getValueByName(b.makeStringAndClear()),
::css::uno::UNO_QUERY_THROW); css::uno::UNO_QUERY_THROW);
} }
test( test(
::test::types::CppTest::create(context_), ::test::types::CppTest::create(context_),
@@ -167,7 +167,7 @@ private:
} }
void Service::test( void Service::test(
::css::uno::Reference< test::types::XTest > const & test, css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name) ::rtl::OUString const & name)
{ {
bool ok = false; bool ok = false;
@@ -177,7 +177,7 @@ void Service::test(
ok = true; ok = true;
} }
if (!ok) { if (!ok) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
(name (name
+ ::rtl::OUString(".throwException failed")), + ::rtl::OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
@@ -186,16 +186,16 @@ void Service::test(
namespace CppMain { namespace CppMain {
::css::uno::Reference< ::css::uno::XInterface > create( css::uno::Reference< css::uno::XInterface > create(
::css::uno::Reference< ::css::uno::XComponentContext > const & context) css::uno::Reference< css::uno::XComponentContext > const & context)
SAL_THROW((::css::uno::Exception)) SAL_THROW((css::uno::Exception))
{ {
try { try {
return static_cast< ::cppu::OWeakObject * >(new Service(context)); return static_cast< ::cppu::OWeakObject * >(new Service(context));
} catch (::std::bad_alloc &) { } catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
::rtl::OUString("std::bad_alloc"), ::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"); return OUString("test.cpp.cppmain.Component");
} }
::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
return ::css::uno::Sequence< ::rtl::OUString >(); return css::uno::Sequence< ::rtl::OUString >();
} }
} }

16
ure/source/uretest/cppserver.cc
View File

@@ -46,7 +46,7 @@ public:
Service() {} Service() {}
virtual ::test::types::Data SAL_CALL getData() virtual ::test::types::Data SAL_CALL getData()
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
return ::test::types::Data(OUString("Hello"), 42); return ::test::types::Data(OUString("Hello"), 42);
} }
@@ -60,16 +60,16 @@ private:
namespace CppServer { namespace CppServer {
::css::uno::Reference< ::css::uno::XInterface > create( css::uno::Reference< css::uno::XInterface > create(
::css::uno::Reference< ::css::uno::XComponentContext > const &) css::uno::Reference< css::uno::XComponentContext > const &)
SAL_THROW((::css::uno::Exception)) SAL_THROW((css::uno::Exception))
{ {
try { try {
return static_cast< ::cppu::OWeakObject * >(new Service); return static_cast< ::cppu::OWeakObject * >(new Service);
} catch (::std::bad_alloc &) { } catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
OUString("std::bad_alloc"), 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"); return OUString("test.cpp.cppserver.Component");
} }
::css::uno::Sequence< OUString > getSupportedServiceNames() { css::uno::Sequence< OUString > getSupportedServiceNames() {
return ::css::uno::Sequence< OUString >(); return css::uno::Sequence< OUString >();
} }
} }