loplugin:constantfunction: various

Change-Id: I6eddda9f4b31c7ce413c328b6a857a81bd222eed

22 files changed, 43 insertions, 141 deletions

diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 94c11307def7..7b4559cd6784 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -133,17 +133,12 @@ public:
         implTestMaskBasics( mpDevice1bpp, mpMask );
     }
 
-    void testMaskClip()
-    {
-    }
-
     // Change the following lines only, if you add, remove or rename
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
     CPPUNIT_TEST_SUITE(MaskTest);
     CPPUNIT_TEST(testMaskBasics);
-    CPPUNIT_TEST(testMaskClip);
     CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index c24376664b6b..d1aa2f2a796f 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -126,7 +126,9 @@ const SfxFilter* impl_lookupExportFilterForUrl( const rtl::OUString& rUrl, const
     return pBestMatch;
 }
 
-const SfxFilter* impl_getExportFilterFromUrl( const rtl::OUString& rUrl, const rtl::OUString& rFactory ) try
+const SfxFilter* impl_getExportFilterFromUrl( const rtl::OUString& rUrl, const rtl::OUString& rFactory )
+{
+try
 {
     const Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() );
     const Reference< document::XTypeDetection > xTypeDetector(
@@ -154,6 +156,7 @@ catch ( const Exception& )
 {
     return 0;
 }
+}
 
 OUString impl_GuessFilter( const OUString& rUrlOut, const OUString& rDocService )
 {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index ec2dea626a5f..11580877ea20 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -703,12 +703,6 @@ void ExtensionBox_Impl::RecalcAll()
 }
 
 
-bool ExtensionBox_Impl::HandleTabKey( bool )
-{
-    return false;
-}
-
-
 bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
 {
     if ( m_vEntries.empty() )
@@ -886,7 +880,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
         sal_uInt16 nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
-            bHandled = HandleTabKey( aKeyCode.IsShift() );
+             ;
         else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )
             bHandled = HandleCursorKey( nKeyCode );
     }
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 77ea3255c251..662bf4c641fa 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -153,19 +153,8 @@ BibFrameCtrl_Impl::~BibFrameCtrl_Impl()
 {
 }
 
-void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno::RuntimeException, std::exception )
+void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( uno::RuntimeException, std::exception )
 {
-    if ( pController && aEvent.Frame == pController->getFrame())
-    {
-        if(aEvent.Action == FrameAction_FRAME_ACTIVATED)
-        {
-            pController->activate();
-        }
-        else if(aEvent.Action == FrameAction_FRAME_DEACTIVATING)
-        {
-            pController->deactivate();
-        }
-    }
 }
 
 void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
@@ -910,12 +899,4 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
     }
 }
 
-void BibFrameController_Impl::activate()
-{
-}
-void BibFrameController_Impl::deactivate()
-{
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 0319560a960c..81c4c56597e9 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -78,9 +78,6 @@ public:
                                 virtual ~BibFrameController_Impl();
 
 
-    void                        activate();
-    void                        deactivate();
-
     void                        ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs);
     void                        RemoveFilter();
 
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index be720a080d1e..58925c5b0966 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -44,12 +44,6 @@ namespace bib
     }
 
 
-    void OComponentListener::_disposing( const EventObject& /*_rSource*/ ) throw( RuntimeException)
-    {
-        // nothing to do here, override if you're interested in
-    }
-
-
     void OComponentListener::setAdapter( OComponentAdapterBase* pAdapter )
     {
         {
@@ -124,14 +118,10 @@ namespace bib
     // XEventListener
 
 
-    void SAL_CALL OComponentAdapterBase::disposing( const EventObject& _rSource ) throw( RuntimeException, std::exception )
+    void SAL_CALL OComponentAdapterBase::disposing( const EventObject& ) throw( RuntimeException, std::exception )
     {
         if ( m_pListener )
         {
-             // tell the listener
-            if ( !locked() )
-                m_pListener->_disposing( _rSource );
-
             // disconnect the listener
             if ( m_pListener )  // may have been reset whilest calling into _disposing
                 m_pListener->setAdapter( NULL );
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index 701f2129b9d3..29b921f34841 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -51,9 +51,6 @@ namespace bib
 
         virtual ~OComponentListener();
 
-        // XEventListener equivalents
-        void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException );
-
     protected:
         void setAdapter( OComponentAdapterBase* _pAdapter );
     };
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 9b442e2792ee..f9d755ac4fcc 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -914,7 +914,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
 }
 
 
-sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
+sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
     throw ( RuntimeException, std::exception )
 {
     checkAlive();
@@ -923,7 +923,21 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
     bool bRet = false;
 
     if ( getDialog() )
-        bRet = getDialog()->setShowState( bShowState );
+    {
+    // #97633 for the system filedialog it's
+    // useful to make the preview switchable
+    // because the preview occupies
+    // half of the size of the file listbox
+    // which is not the case here,
+    // so we (TRA/FS) decided not to make
+    // the preview window switchable because
+    // else we would have to change the layout
+    // of the file dialog dynamically
+    // support for set/getShowState is opionally
+    // see com::sun::star::ui::dialogs::XFilePreview
+
+        bRet = false;
+    }
 
     return bRet;
 }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 370b2e7d2ad4..b6703074616a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1109,7 +1109,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     if ( pThis->_aOKHdl.IsSet() )
         nRet = pThis->_aOKHdl.Call( pThis );
     else
-        nRet = pThis->OK();
+        nRet = 1;
 
     if ( nRet )
     {
@@ -1377,7 +1377,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
     if ( _aOKHdl.IsSet() )
         nRet = _aOKHdl.Call( this );
     else
-        nRet = OK();
+        nRet = 1;
 
     if ( nRet )
         EndDialog( sal_True );
@@ -1622,13 +1622,6 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
 
 
 
-long SvtFileDialog::OK()
-{
-    return sal_True;
-}
-
-
-
 class SvtDefModalDialogParent_Impl
 {
 private:
@@ -2672,24 +2665,6 @@ void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )
 }
 
 
-bool SvtFileDialog::setShowState( bool /*bShowState*/ )
-{
-    // #97633 for the system filedialog it's
-    // useful to make the preview switchable
-    // because the preview occupies
-    // half of the size of the file listbox
-    // which is not the case here,
-    // so we (TRA/FS) decided not to make
-    // the preview window switchable because
-    // else we would have to change the layout
-    // of the file dialog dynamically
-    // support for set/getShowState is opionally
-    // see com::sun::star::ui::dialogs::XFilePreview
-
-    return false;
-}
-
-
 OUString SvtFileDialog::getCurrentFileText( ) const
 {
     OUString sReturn;
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c71534da4a28..1bb88689b353 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -195,7 +195,6 @@ public:
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits );
                                 virtual ~SvtFileDialog();
 
-    long                        OK();
     virtual short               Execute() SAL_OVERRIDE;
     virtual void                StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
 
@@ -239,7 +238,6 @@ public:
     sal_Int32                   getAvailableWidth();
     sal_Int32                   getAvailableHeight();
     void                        setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage );
-    bool                        setShowState( bool bShowState );
     bool                        getShowState();
     bool                        isAutoExtensionEnabled();
 
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 79d63dd7027a..6f33b4d3696e 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -151,7 +151,6 @@ public:
     bool compare(AstExpression *pExpr);
 
     OString toString();
-    void dump() {}
 private:
     // Fill out the lineno, filename and definition scope details
     void    fillDefinitionDetails();
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx
index 5a1b1eb5e211..0e2a7393de0d 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -75,10 +75,6 @@ public:
     {
         return mnEnd - mnCurrent;
     }
-    void SAL_CALL closeInput(  )
-        throw(com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
-    {
-    }
 
     // XSeekable chained...
     sal_Int64 SAL_CALL seek( sal_Int64 location )
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 4d60a6c41ce7..143207efbd5f 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1092,10 +1092,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
     return osl_File_E_None;
 }
 
-inline off_t max_off_t()
-{
-    return std::numeric_limits< off_t >::max();
-}
+const off_t MAX_OFF_T = std::numeric_limits< off_t >::max();
 
 oslFileError
 SAL_CALL osl_mapFile (
@@ -1116,7 +1113,7 @@ SAL_CALL osl_mapFile (
         return osl_File_E_OVERFLOW;
     size_t const nLength = sal::static_int_cast< size_t >(uLength);
 
-    sal_uInt64 const limit_off_t = max_off_t();
+    sal_uInt64 const limit_off_t = MAX_OFF_T;
     if (uOffset > limit_off_t)
         return osl_File_E_OVERFLOW;
 
@@ -1321,7 +1318,7 @@ SAL_CALL osl_readFileAt (
     if (0 == (pImpl->m_state & FileHandle_Impl::STATE_SEEKABLE))
         return osl_File_E_SPIPE;
 
-    sal_uInt64 const limit_off_t = max_off_t();
+    sal_uInt64 const limit_off_t = MAX_OFF_T;
     if (uOffset > limit_off_t)
         return osl_File_E_OVERFLOW;
     off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
@@ -1353,7 +1350,7 @@ SAL_CALL osl_writeFileAt (
     if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
         return osl_File_E_BADF;
 
-    sal_uInt64 const limit_off_t = max_off_t();
+    sal_uInt64 const limit_off_t = MAX_OFF_T;
     if (limit_off_t < uOffset)
         return osl_File_E_OVERFLOW;
     off_t const nOffset = sal::static_int_cast< off_t >(uOffset);
@@ -1402,7 +1399,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
     if ((0 == pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && (-1 == pImpl->m_fd)))
         return osl_File_E_INVAL;
 
-    sal_Int64 const limit_off_t = max_off_t();
+    sal_Int64 const limit_off_t = MAX_OFF_T;
     if (uOffset > limit_off_t)
         return osl_File_E_OVERFLOW;
     off_t nPos = 0, nOffset = sal::static_int_cast< off_t >(uOffset);
@@ -1461,7 +1458,7 @@ SAL_CALL osl_setFileSize( oslFileHandle Handle, sal_uInt64 uSize )
     if (0 == (pImpl->m_state & FileHandle_Impl::STATE_WRITEABLE))
         return osl_File_E_BADF;
 
-    sal_uInt64 const limit_off_t = max_off_t();
+    sal_uInt64 const limit_off_t = MAX_OFF_T;
     if (uSize > limit_off_t)
         return osl_File_E_OVERFLOW;
 
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index c81fad3f1125..1972e31ce687 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -86,12 +86,6 @@ void SequentialTimeContainer::skipEffect(
         OSL_FAIL( "unknown notifier!" );
 }
 
-void SequentialTimeContainer::rewindEffect(
-    AnimationNodeSharedPtr const& /*pChildNode*/ )
-{
-    // xxx todo: ...
-}
-
 bool SequentialTimeContainer::resolveChild(
     AnimationNodeSharedPtr const& pChildNode )
 {
@@ -109,20 +103,11 @@ bool SequentialTimeContainer::resolveChild(
                          boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ),
                          pChildNode ),
             "SequentialTimeContainer::skipEffect, resolveChild");
-        // event that will reresolve the resolved/activated child:
-        mpCurrentRewindEvent = makeEvent(
-            boost::bind( &SequentialTimeContainer::rewindEffect,
-                         boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ),
-                         pChildNode ),
-            "SequentialTimeContainer::rewindEffect, resolveChild");
 
         // deactivate child node when skip event occurs:
         getContext().mrUserEventQueue.registerSkipEffectEvent(
             mpCurrentSkipEvent,
             mnFinishedChildren+1<maChildren.size());
-        // rewind to previous child:
-        getContext().mrUserEventQueue.registerRewindEffectEvent(
-            mpCurrentRewindEvent );
     }
     return bResolved;
 }
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 9bf050315fbe..490f084ef678 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -51,7 +51,6 @@ private:
     virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE;
 
     void skipEffect( AnimationNodeSharedPtr const& pChildNode );
-    void rewindEffect( AnimationNodeSharedPtr const& pChildNode );
 
 private:
     bool resolveChild( AnimationNodeSharedPtr const& pChildNode );
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 98d06d1d65b3..29c37c050d34 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -1242,11 +1242,6 @@ bool EventMultiplexer::notifyHyperlinkClicked(
                     boost::cref(hyperLink)) );
 }
 
-bool EventMultiplexer::notifySlideTransitionStarted()
-{
-    return true;
-}
-
 } // namespace internal
 } // namespace presentation
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 21c3213c3110..3fc76235e7f7 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1191,7 +1191,6 @@ void SlideShowImpl::displaySlide(
         }
     } // finally
 
-    maEventMultiplexer.notifySlideTransitionStarted();
     maListenerContainer.forEach<presentation::XSlideShowListener>(
         boost::mem_fn( &presentation::XSlideShowListener::slideTransitionStarted ) );
 
@@ -1227,7 +1226,6 @@ void SlideShowImpl::redisplayCurrentSlide (void)
                 true ),
             "SlideShowImpl::notifySlideTransitionEnded"));
 
-    maEventMultiplexer.notifySlideTransitionStarted();
     maListenerContainer.forEach<presentation::XSlideShowListener>(
         boost::mem_fn( &presentation::XSlideShowListener::slideTransitionStarted ) );
 }
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 4ee7113f4fcf..716e02394281 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -612,10 +612,6 @@ public:
     */
     bool notifyNextEffect();
 
-    /** Notify that a new slide is about to be displayed
-    */
-    bool notifySlideTransitionStarted();
-
     /** Notify that a new slide has started
 
         This method is to be used from the Presentation object
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index a656db854430..c4a400c6b427 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -63,7 +63,7 @@ class SmFontStyles
 public:
     SmFontStyles();
 
-    sal_uInt16          GetCount() const    { return 4; }
+    static sal_uInt16 GetCount() { return 4; }
     const OUString&  GetStyleName( const vcl::Font &rFont ) const;
     const OUString&  GetStyleName( sal_uInt16 nIdx ) const;
 };
@@ -133,7 +133,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
     {
         sal_uInt16 i;
         const SmFontStyles &rStyles = GetFontStyles();
-        for (i = 0;  i < rStyles.GetCount(); ++i)
+        for (i = 0;  i < SmFontStyles::GetCount(); ++i)
             if (rStyleName == rStyles.GetStyleName(i))
                 break;
 #if OSL_DEBUG_LEVEL > 1
@@ -1688,7 +1688,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText)
     {
         // use own StyleNames
         const SmFontStyles &rStyles = GetFontStyles();
-        for (sal_uInt16 i = 0;  i < rStyles.GetCount();  i++)
+        for (sal_uInt16 i = 0;  i < SmFontStyles::GetCount();  i++)
             pStyles->InsertEntry( rStyles.GetStyleName(i) );
 
 #if OSL_DEBUG_LEVEL > 1
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 04ede9303266..886bdd8b78ca 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -86,7 +86,7 @@ namespace fileaccess
 
             bool isHandled() const
             {
-                return true;
+                return m_bHandled;
             }
 
             void clearError()
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 8c66d5bc029a..849bbd97e092 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -266,19 +266,6 @@ uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException, std::e
     return uno::makeAny( xComponent );
 }
 
-void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException)
-{
-// #FIXME this *MUST* be wrong documents::close surely closes ALL documents
-// in the collection, use of getCurrentDocument here is totally wrong
-/*
-    uno::Reference< lang::XMultiComponentFactory > xSMgr(
-        mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-    uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-    OUString url = ".uno:CloseDoc";
-    dispatchRequests(xModel,url);
-*/
-}
-
 // #TODO# #FIXME# can any of the unused params below be used?
 uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
 {
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index 41d6591f1f49..e5150e10d0ad 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -115,7 +115,9 @@ DirectoryStream::~DirectoryStream()
     delete m_pImpl;
 }
 
-DirectoryStream *DirectoryStream::createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent) try
+DirectoryStream *DirectoryStream::createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
+{
+try
 {
     if (!xContent.is())
         return 0;
@@ -143,8 +145,11 @@ catch (...)
 {
     return 0;
 }
+}
 
-bool DirectoryStream::isDirectory(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent) try
+bool DirectoryStream::isDirectory(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
+{
+try
 {
     if (!xContent.is())
         return false;
@@ -156,6 +161,7 @@ catch (...)
 {
     return false;
 }
+}
 
 bool DirectoryStream::isStructured()
 {