dbaccess/source/ui/dlg/ConnectionPage.cxx | 1
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 1
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1
fpicker/source/aqua/FPentry.mm | 1
fpicker/source/aqua/SalAquaFolderPicker.hxx | 11 +--
fpicker/source/aqua/SalAquaFolderPicker.mm | 4 -
fpicker/source/office/OfficeFolderPicker.cxx | 11 +--
fpicker/source/office/OfficeFolderPicker.hxx | 32
+++-------
fpicker/source/win32/filepicker/FPentry.cxx | 3
fpicker/source/win32/folderpicker/FolderPicker.hxx | 1
fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 2
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 6 -
framework/source/services/backingwindow.hxx | 1
odk/examples/DevelopersGuide/GUI/SystemDialog.java | 4 -
odk/examples/java/Inspector/Inspector.java | 4 -
qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv | 2
sdext/source/minimizer/fileopendialog.cxx | 1
sfx2/source/dialog/filedlghelper.cxx | 1
vcl/inc/salinst.hxx | 6 -
vcl/inc/unx/gtk/gtkinst.hxx | 2
vcl/inc/vcl/svapp.hxx | 4 -
vcl/source/app/svapp.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 4 -
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 7 --
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 5 -
wizards/com/sun/star/wizards/common/SystemDialog.java | 4 -
27 files changed, 49 insertions(+), 73 deletions(-)
New commits:
commit cc360f0a483e7c68ece7a30424f204d660d74b1c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 27 10:39:28 2012 +0100
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
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 50e26bf..1b717c8 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -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>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 019a5b9..9f966ee 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -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>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 0168f22..07e0bfb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -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"
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 88a24f5..ff38363 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -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>
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index d514868..7f9a3e1 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -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(
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx
b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index f66d88d..3a32919 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -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:
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm
b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 6496e12..8d06b7f 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -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;
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx
b/fpicker/source/office/OfficeFolderPicker.cxx
index c1a3912..f04de64 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 0330972..44ac092 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
//------------------------------------------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx
b/fpicker/source/win32/filepicker/FPentry.cxx
index f09938d..5c26204 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -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 ) ) );
}
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx
b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 1f1e4c8..3854de3 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -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>
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 1576eb1..6f49d07 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -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
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index de84213..ba60c97 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -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 )
diff --git a/framework/source/services/backingwindow.hxx
b/framework/source/services/backingwindow.hxx
index 3b4d4bb..fdacdbf 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -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"
diff --git a/odk/examples/DevelopersGuide/GUI/SystemDialog.java
b/odk/examples/DevelopersGuide/GUI/SystemDialog.java
index 541d516..861d075 100644
--- a/odk/examples/DevelopersGuide/GUI/SystemDialog.java
+++ b/odk/examples/DevelopersGuide/GUI/SystemDialog.java
@@ -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);
diff --git a/odk/examples/java/Inspector/Inspector.java
b/odk/examples/java/Inspector/Inspector.java
index a2f8575..a9ceb1c 100644
--- a/odk/examples/java/Inspector/Inspector.java
+++ b/odk/examples/java/Inspector/Inspector.java
@@ -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();
diff --git a/qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv
b/qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv
index 633748b..5a2c2fb 100644
--- a/qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv
+++ b/qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv
@@ -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()"
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index 4870a7b..4f03d40 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -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>
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 5b21493..cb3d784 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -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>
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 81d0b66..afa9e27 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -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() {}
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 1785591..4ad13a6 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -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 >& );
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index c5ef397..d95e44b 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -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 );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 45147d1..6a799cd 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -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();
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 02a0e29..931f197 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -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 ) );
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index e70d5ab..ca07462 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -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:
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 11a1603..64f37b6 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -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>
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java
b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 58ab35c..bb4bdbf 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
