diff options
Diffstat (limited to 'sc/source/ui/unoobj/textuno.cxx')
-rw-r--r-- | sc/source/ui/unoobj/textuno.cxx | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 5d61fd03794b..4af1cc4be2a5 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -116,7 +116,6 @@ const EditTextObject* ScHeaderFooterContentObj::GetRightEditObject() const // XHeaderFooterContent uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxLeftText, uno::UNO_QUERY); @@ -124,7 +123,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxCenterText, uno::UNO_QUERY); @@ -132,7 +130,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxRightText, uno::UNO_QUERY); @@ -142,7 +139,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -296,7 +293,6 @@ const SvxUnoText& ScHeaderFooterTextObj::GetUnoText() // XText uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScHeaderFooterTextCursor( this ); @@ -304,7 +300,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -324,7 +319,7 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScHeaderFooterTextObj::getString() { SolarMutexGuard aGuard; OUString aRet; @@ -368,7 +363,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; @@ -380,7 +375,6 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(un void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -391,7 +385,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XT void SAL_CALL ScHeaderFooterTextObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -403,7 +396,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( const uno::Reference<text::XTextRange >& xRange, const uno::Reference<text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() && xRange.is() ) @@ -474,7 +466,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( void SAL_CALL ScHeaderFooterTextObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() ) @@ -492,7 +483,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( mxUnoText->removeTextContent( xContent ); } -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -500,7 +491,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno: return mxUnoText->getText(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -508,7 +499,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() thro return mxUnoText->getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -519,7 +510,6 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw( // XTextFieldsSupplier uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::getTextFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // all fields @@ -527,7 +517,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge } uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters() - throw(uno::RuntimeException, std::exception) { // sowas gibts nicht im Calc (?) return nullptr; @@ -538,7 +527,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFi void SAL_CALL ScHeaderFooterTextObj::moveTextRange( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nParagraphs ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -549,7 +537,6 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange( // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -559,7 +546,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEn // XElementAccess -uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -567,7 +554,7 @@ uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeExc return mxUnoText->getElementType(); } -sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -596,13 +583,13 @@ ScCellTextCursor::~ScCellTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() { SolarMutexGuard aGuard; return &rTextObj; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() { SolarMutexGuard aGuard; @@ -619,7 +606,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -639,7 +626,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScCellTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -678,13 +665,13 @@ ScHeaderFooterTextCursor::~ScHeaderFooterTextCursor() throw() {}; // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() { SolarMutexGuard aGuard; return rTextObj.get(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() { SolarMutexGuard aGuard; @@ -701,7 +688,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -721,7 +708,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -772,13 +759,13 @@ ScDrawTextCursor::~ScDrawTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() { SolarMutexGuard aGuard; return xParentText; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() { SolarMutexGuard aGuard; @@ -795,7 +782,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -815,7 +802,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScDrawTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), |