summaryrefslogtreecommitdiff
path: root/fpicker/source/office
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-27 10:39:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-27 10:39:28 +0100
commitcc360f0a483e7c68ece7a30424f204d660d74b1c (patch)
tree0e81c30bf1805cebdd7d3b8097085bf44f0a8528 /fpicker/source/office
parent41f08d42696fdb1f38baaafdde63088febdfd06d (diff)
fdo#46808: Missing adaptions to XFolderPicker2
c988da288ec473a28f61ebb53aa3ff82bab11ef4 "fdo#46808, Adapt ui::dialogs::FolderPicker UNO service to new style" had left some FolderPicker implementations at XFolderPicker, so creating them caused DeploymentExceptions. Change-Id: I3463161f9bb87a69a2777c331eb5b93d487790b0
Diffstat (limited to 'fpicker/source/office')
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx11
-rw-r--r--fpicker/source/office/OfficeFolderPicker.hxx32
2 files changed, 18 insertions, 25 deletions
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index c1a3912e1950..f04de647613a 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
SvtFolderPicker::SvtFolderPicker( const Reference < XMultiServiceFactory >& _rxFactory )
- :OCommonPicker( _rxFactory )
+ :SvtFolderPicker_Base( _rxFactory )
{
}
@@ -44,10 +44,6 @@ SvtFolderPicker::~SvtFolderPicker()
{
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvtFolderPicker, OCommonPicker, SvtFolderPicker_Base )
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFolderPicker, OCommonPicker, SvtFolderPicker_Base )
-
void SAL_CALL SvtFolderPicker::setTitle( const ::rtl::OUString& _rTitle ) throw (RuntimeException)
{
OCommonPicker::setTitle( _rTitle );
@@ -151,6 +147,11 @@ void SAL_CALL SvtFolderPicker::setDescription( const ::rtl::OUString& aDescripti
m_aDescription = aDescription;
}
+void SvtFolderPicker::cancel() throw (RuntimeException)
+{
+ OCommonPicker::cancel();
+}
+
/* XServiceInfo */
::rtl::OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException )
{
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 0330972a2c92..44ac0921f271 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SVT_FOLDERPICKER_HXX
#include <cppuhelper/implbase3.hxx>
-#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -30,15 +30,14 @@
class Dialog;
-// class SvtFolderPicker ---------------------------------------------------
+typedef
+ cppu::ImplInheritanceHelper3<
+ svt::OCommonPicker, com::sun::star::ui::dialogs::XFolderPicker2,
+ com::sun::star::ui::dialogs::XAsynchronousExecutableDialog,
+ com::sun::star::lang::XServiceInfo >
+ SvtFolderPicker_Base;
-typedef ::cppu::ImplHelper3 < ::com::sun::star::ui::dialogs::XFolderPicker
- , ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
- , ::com::sun::star::lang::XServiceInfo
- > SvtFolderPicker_Base;
-
-class SvtFolderPicker :public SvtFolderPicker_Base
- ,public ::svt::OCommonPicker
+class SvtFolderPicker: public SvtFolderPicker_Base
{
private:
::rtl::OUString m_aDescription;
@@ -54,17 +53,7 @@ public:
virtual ~SvtFolderPicker();
//------------------------------------------------------------------------------------
- // disambiguate XInterface
- //------------------------------------------------------------------------------------
- DECLARE_XINTERFACE( )
-
- //------------------------------------------------------------------------------------
- // disambiguate XTypeProvider
- //------------------------------------------------------------------------------------
- DECLARE_XTYPEPROVIDER( )
-
- //------------------------------------------------------------------------------------
- // XFolderPicker functions
+ // XFolderPicker2 functions
//------------------------------------------------------------------------------------
virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -72,6 +61,9 @@ public:
virtual ::rtl::OUString SAL_CALL getDirectory() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setDescription( const ::rtl::OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL cancel()
+ throw (com::sun::star::uno::RuntimeException);
+
//------------------------------------------------------------------------------------
// XExecutableDialog functions
//------------------------------------------------------------------------------------