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

fdo#46808: Missing adaptions to XFolderPicker2

Browse Source 
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
This commit is contained in:
Stephan Bergmann 2012-11-27 10:39:28 +01:00
parent 41f08d4269
commit cc360f0a48
27 changed files with 49 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbaccess/source/ui/dlg/ConnectionPage.cxx
View File

@ -41,7 +41,6 @@
#include "dsselect.hxx"
#include <svl/filenotation.hxx>
#include "dbustrings.hrc"
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>

1
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
View File

@ -41,7 +41,6 @@
#include "dsselect.hxx"
#include <svl/filenotation.hxx>
#include "dbustrings.hrc"
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>

1
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
View File

@ -39,7 +39,6 @@
#include "dbadmin.hxx"
#include <comphelper/types.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include "dbustrings.hrc"

1
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
View File

@ -40,7 +40,6 @@
#include "dbadmin.hxx"
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <svl/filenotation.hxx>
#include <unotools/localfilehelper.hxx>

1
fpicker/source/aqua/FPentry.mm
View File

@ -33,7 +33,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace ::cppu;
using ::com::sun::star::ui::dialogs::XFilePicker;
using ::com::sun::star::ui::dialogs::XFolderPicker;
static Reference< XInterface > SAL_CALL createFileInstance(

11
fpicker/source/aqua/SalAquaFolderPicker.hxx
View File

@ -20,12 +20,12 @@
#ifndef _SALAQUAFOLDERPICKER_HXX_
#define _SALAQUAFOLDERPICKER_HXX_
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include "SalAquaPicker.hxx"
@ -41,11 +41,10 @@
class SalAquaFolderPicker :
public SalAquaPicker,
public cppu::WeakImplHelper4<
::com::sun::star::ui::dialogs::XFolderPicker,
public cppu::WeakImplHelper3<
::com::sun::star::ui::dialogs::XFolderPicker2,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XEventListener,
::com::sun::star::util::XCancellable >
::com::sun::star::lang::XEventListener >
{
public:

4
fpicker/source/aqua/SalAquaFolderPicker.mm
View File

@ -121,7 +121,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
break;
default:
throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFolderPicker* >( this ));
throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< cppu::OWeakObject * >( this ));
break;
}
@ -173,7 +173,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
OSL_TRACE("# of items: %d", nFiles);
if (nFiles < 1) {
throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no directory selected")), static_cast< XFolderPicker* >( this ));
throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no directory selected")), static_cast< cppu::OWeakObject * >( this ));
}
rtl::OUString aDirectory;

11
fpicker/source/office/OfficeFolderPicker.cxx
View File

@ -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 )
{

30
fpicker/source/office/OfficeFolderPicker.hxx
View File

@ -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::ImplHelper3 < ::com::sun::star::ui::dialogs::XFolderPicker
, ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
, ::com::sun::star::lang::XServiceInfo
> SvtFolderPicker_Base;
typedef
cppu::ImplInheritanceHelper3<
svt::OCommonPicker, com::sun::star::ui::dialogs::XFolderPicker2,
com::sun::star::ui::dialogs::XAsynchronousExecutableDialog,
com::sun::star::lang::XServiceInfo >
SvtFolderPicker_Base;
class SvtFolderPicker: public SvtFolderPicker_Base
,public ::svt::OCommonPicker
{
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
//------------------------------------------------------------------------------------

3
fpicker/source/win32/filepicker/FPentry.cxx
View File

@ -46,7 +46,6 @@ using namespace ::com::sun::star::registry ;
using namespace ::cppu ;
using ::com::sun::star::ui::dialogs::XFilePicker;
using ::com::sun::star::ui::dialogs::XFilePicker2;
using ::com::sun::star::ui::dialogs::XFolderPicker;
//------------------------------------------------
//
@ -82,7 +81,7 @@ static Reference< XInterface > SAL_CALL createInstance(
static Reference< XInterface > SAL_CALL
createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
{
return Reference< XInterface >( static_cast< XFolderPicker* >( new CFolderPicker( rServiceManager ) ) );
return Reference< XInterface >( static_cast< cppu::OWeakObject * >( new CFolderPicker( rServiceManager ) ) );
}

1
fpicker/source/win32/folderpicker/FolderPicker.hxx
View File

@ -25,7 +25,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <memory>

2
fpicker/source/win32/folderpicker/WinFOPImpl.cxx
View File

@ -79,7 +79,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
if ( ::osl::FileBase::E_None != rc )
throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )),
static_cast< XFolderPicker* >( m_pFolderPicker ),
static_cast< cppu::OWeakObject * >( m_pFolderPicker ),
1 );
// we ensure that there is a trailing '/' at the end of

6
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
View File

@ -27,7 +27,7 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <cppuhelper/implbase1.hxx>
@ -95,9 +95,9 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ )
// try to get an Interface to a XFilePicker Service
//-------------------------------------------------
Reference< XFolderPicker > xFolderPicker;
Reference< XFolderPicker2 > xFolderPicker;
xFolderPicker = Reference< XFolderPicker >(
xFolderPicker = Reference< XFolderPicker2 >(
g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM ( FOLDER_PICKER_SERVICE_NAME ) ) ), UNO_QUERY );
if ( xFolderPicker.is() == sal_False )

1
framework/source/services/backingwindow.hxx
View File

@ -41,7 +41,6 @@
#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"

4
odk/examples/DevelopersGuide/GUI/SystemDialog.java
View File

@ -39,7 +39,7 @@ import com.sun.star.ui.dialogs.XExecutableDialog;
import com.sun.star.ui.dialogs.XFilePicker;
import com.sun.star.ui.dialogs.XFilePickerControlAccess;
import com.sun.star.ui.dialogs.XFilterManager;
import com.sun.star.ui.dialogs.XFolderPicker;
import com.sun.star.ui.dialogs.XFolderPicker2;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
@ -157,7 +157,7 @@ public class SystemDialog {
try {
// instantiate the folder picker and retrieve the necessary interfaces...
Object oFolderPicker = m_xMCF.createInstanceWithContext("com.sun.star.ui.dialogs.FolderPicker", m_xContext);
XFolderPicker xFolderPicker = (XFolderPicker) UnoRuntime.queryInterface(XFolderPicker.class, oFolderPicker);
XFolderPicker2 xFolderPicker = UnoRuntime.queryInterface(XFolderPicker2.class, oFolderPicker);
XExecutableDialog xExecutable = (XExecutableDialog) UnoRuntime.queryInterface(XExecutableDialog.class, oFolderPicker);
xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, oFolderPicker);
xFolderPicker.setDisplayDirectory(_sDisplayDirectory);

4
odk/examples/java/Inspector/Inspector.java
View File

@ -50,7 +50,7 @@ import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.ui.dialogs.XExecutableDialog;
import com.sun.star.ui.dialogs.XFolderPicker;
import com.sun.star.ui.dialogs.XFolderPicker2;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.util.CloseVetoException;
@ -154,7 +154,7 @@ public class Inspector{
try {
String sInstallationFolder = "";
Object oFolderPicker = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.ui.dialogs.FolderPicker", m_xComponentContext);
XFolderPicker xFolderPicker = UnoRuntime.queryInterface(XFolderPicker.class, oFolderPicker);
XFolderPicker2 xFolderPicker = UnoRuntime.queryInterface(XFolderPicker2.class, oFolderPicker);
XExecutableDialog xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, oFolderPicker);
XComponent xComponent = UnoRuntime.queryInterface(XComponent.class, oFolderPicker);
String sPath = getSDKPath();

2
qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv
View File

@ -9,4 +9,4 @@
"FolderPicker";"com::sun::star::ui::dialogs::XFolderPicker";"setDescription()"
"FolderPicker";"com::sun::star::ui::dialogs::XExecutableDialog";"setTitle()"
"FolderPicker";"com::sun::star::ui::dialogs::XExecutableDialog";"execute()"
"FolderPicker";"com::sun::star::util::XCancellable#optional";"cancel()"
"FolderPicker";"com::sun::star::util::XCancellable";"cancel()"

1 FolderPicker com::sun::star::lang::XServiceInfo getImplementationName()
9 FolderPicker com::sun::star::ui::dialogs::XFolderPicker setDescription()
10 FolderPicker com::sun::star::ui::dialogs::XExecutableDialog setTitle()
11 FolderPicker com::sun::star::ui::dialogs::XExecutableDialog execute()
12 FolderPicker com::sun::star::util::XCancellable#optional com::sun::star::util::XCancellable cancel()

1
sdext/source/minimizer/fileopendialog.cxx
View File

@ -34,7 +34,6 @@
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>

1
sfx2/source/dialog/filedlghelper.cxx
View File

@ -32,7 +32,6 @@
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>

6
vcl/inc/salinst.hxx
View File

@ -23,7 +23,7 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/ui/dialogs/XFilePicker2.hpp"
#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
#include "com/sun/star/ui/dialogs/XFolderPicker2.hpp"
#include "tools/solar.h"
#include "vcl/displayconnectiondispatch.hxx"
@ -168,10 +168,10 @@ public:
createFilePicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& )
{ return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >(); }
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
createFolderPicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& )
{ return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >(); }
{ return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >(); }
// callbacks for printer updates
virtual void updatePrinterUpdate() {}

2
vcl/inc/unx/gtk/gtkinst.hxx
View File

@ -126,7 +126,7 @@ public:
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
createFilePicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& );
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >
virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
createFolderPicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& );

4
vcl/inc/vcl/svapp.hxx
View File

@ -63,7 +63,7 @@ namespace uno {
namespace ui {
namespace dialogs {
class XFilePicker2;
class XFolderPicker;
class XFolderPicker2;
}
}
namespace awt {
@ -404,7 +404,7 @@ public:
/** Create a platform specific folder picker, if one is available,
otherwise return an empty reference
*/
static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >
static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
createFolderPicker( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rServiceManager );

2
vcl/source/app/svapp.cxx
View File

@ -1808,7 +1808,7 @@ Application::createFilePicker( const Reference< uno::XComponentContext >& xSM )
return pSVData->mpDefInst->createFilePicker( xSM );
}
Reference< ui::dialogs::XFolderPicker >
Reference< ui::dialogs::XFolderPicker2 >
Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM )
{
ImplSVData* pSVData = ImplGetSVData();

4
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
View File

@ -176,10 +176,10 @@ void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException )
// TODO m_pImpl->cancel();
}
uno::Reference< ui::dialogs::XFolderPicker >
uno::Reference< ui::dialogs::XFolderPicker2 >
GtkInstance::createFolderPicker( const uno::Reference< uno::XComponentContext > &xMSF )
{
return uno::Reference< ui::dialogs::XFolderPicker >(
return uno::Reference< ui::dialogs::XFolderPicker2 >(
new SalGtkFolderPicker( xMSF ) );
}

7
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
View File

@ -23,15 +23,14 @@
#include <list>
#include <memory>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase1.hxx>
#include "gtk/fpicker/SalGtkPicker.hxx"
class SalGtkFolderPicker :
public SalGtkPicker,
public cppu::WeakImplHelper2<
::com::sun::star::ui::dialogs::XFolderPicker,
::com::sun::star::util::XCancellable >
public cppu::WeakImplHelper1<
::com::sun::star::ui::dialogs::XFolderPicker2 >
{
public:

5
vcl/unx/gtk/fpicker/SalGtkPicker.hxx
View File

@ -22,11 +22,6 @@
#include <osl/mutex.hxx>
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/awt/XTopWindowListener.hpp>
#include <com/sun/star/awt/XExtendedToolkit.hpp>

4
wizards/com/sun/star/wizards/common/SystemDialog.java
View File

@ -36,7 +36,7 @@ public class SystemDialog
Object systemDialog;
XFilePicker xFilePicker;
XFolderPicker xFolderPicker;
XFolderPicker2 xFolderPicker;
XFilterManager xFilterManager;
XInitialization xInitialize;
XExecutableDialog xExecutable;
@ -59,7 +59,7 @@ public class SystemDialog
this.xMSF = xMSF;
systemDialog = xMSF.createInstance(ServiceName);
xFilePicker = UnoRuntime.queryInterface(XFilePicker.class, systemDialog);
xFolderPicker = UnoRuntime.queryInterface(XFolderPicker.class, systemDialog);
xFolderPicker = UnoRuntime.queryInterface(XFolderPicker2.class, systemDialog);
xFilterManager = UnoRuntime.queryInterface(XFilterManager.class, systemDialog);
xInitialize = UnoRuntime.queryInterface(XInitialization.class, systemDialog);
xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, systemDialog);