diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-09 09:37:17 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-09 09:37:17 +0200 |
| commit | 01dec66abb156b86c8e547dd4bc3677a261c0a86 (patch) | |
| tree | cee1acd97954cf5b8575c29aa70a9b1cb08fd999 /sdext | |
| parent | f12056dce676eee306d34d06fb4bbbc452d9216c (diff) | |
| parent | 4ae601cfb49a0af9520a29bb7c5d0d92e34b54d2 (diff) | |
slidecopy: merge CWS wth MWS-m76
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/prj/build.lst | 2 | ||||
| -rwxr-xr-x | sdext/source/presenter/PresenterAccessibility.cxx | 1 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterPaneFactory.cxx | 3 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterPaneFactory.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index b274920a5281..c593a265f26e 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,4 +1,4 @@ -dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg vcl XPDF:xpdf LIBXSLT:libxslt NULL +dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt NULL dx sdext usr1 - all sdext_mkout NULL dx sdext\prj get - all sdext_prj NULL dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 614ab9e433a3..827754e1524b 100755 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <vcl/svapp.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index d9a90b9ef99b..f53878f8cc47 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -45,6 +45,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; @@ -170,7 +171,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) - throw (RuntimeException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 13296b763359..78ea3e4fc609 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -99,7 +99,7 @@ public: SAL_CALL createResource ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); virtual void SAL_CALL releaseResource ( |