From 4a223b6ae7f84844035f56c037599d0c348d2d99 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Nov 2012 16:15:49 +0100 Subject: Remove useless ODMAFolderPicker ...that effectively is just a wrapper around a SystemFolderPicker service implementation, as its m_bUseDMS is always false. Change-Id: I95eb4a36fde0b98020b5fbe57e242cd2ae47ab8b --- fpicker/Library_fps_odma.mk | 1 - fpicker/source/generic/fpicker.cxx | 5 - fpicker/source/odma/ODMAFolderPicker.cxx | 178 ------------------------------- fpicker/source/odma/ODMAFolderPicker.hxx | 103 ------------------ fpicker/source/odma/fps_odma.cxx | 7 -- 5 files changed, 294 deletions(-) delete mode 100644 fpicker/source/odma/ODMAFolderPicker.cxx delete mode 100644 fpicker/source/odma/ODMAFolderPicker.hxx (limited to 'fpicker') diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 63e9834fe068..3ca62c56619a 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -53,7 +53,6 @@ endif $(eval $(call gb_Library_add_exception_objects,fps_odma,\ fpicker/source/odma/fps_odma \ fpicker/source/odma/ODMAFilePicker \ - fpicker/source/odma/ODMAFolderPicker \ )) # vim: set noet sw=4 ts=4: diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 4c4dd9a57847..cf1ec475005b 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -137,11 +137,6 @@ static OUString FolderPicker_getSystemPickerServiceName() return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker")); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx"))) return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker")); -#endif -#ifdef WNT - if (SvtMiscOptions().TryODMADialog() && ::odma::DMSsAvailable()) { - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.ODMAFolderPicker")); - } #endif return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker")); } diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx deleted file mode 100644 index 05d42775fd0d..000000000000 --- a/fpicker/source/odma/ODMAFolderPicker.cxx +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * Copyright 2010 Novell, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "ODMAFolderPicker.hxx" - -#include -#include -#include -#include -#include -#include - -#ifndef ODMA_LIB_HXX -#include -#include -#endif - -// using ---------------------------------------------------------------- - -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; - -//------------------------------------------------------------------------------------ -// class ODMAFolderPicker -//------------------------------------------------------------------------------------ - -//------------------------------------------------------------------------------------ -ODMAFolderPicker::ODMAFolderPicker( const Reference < XMultiServiceFactory >& xFactory ) : - cppu::WeakComponentImplHelper2< - XFolderPicker, - XServiceInfo>( m_rbHelperMtx ), - m_bUseDMS( sal_False ) -{ - m_xInterface = xFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ) )); -} - -// XExecutableDialog functions - -void SAL_CALL ODMAFolderPicker::setTitle( const ::rtl::OUString& _rTitle ) throw (RuntimeException) -{ - if (m_bUseDMS) - return; - - Reference< XExecutableDialog > xExecutableDialog( m_xInterface, UNO_QUERY ); - xExecutableDialog->setTitle( _rTitle); -} - -sal_Int16 SAL_CALL ODMAFolderPicker::execute( ) - throw (RuntimeException) -{ - if (m_bUseDMS) - throw new RuntimeException( ); - - Reference< XExecutableDialog > xExecutableDialog( m_xInterface, UNO_QUERY ); - return xExecutableDialog->execute(); -} - -// XFolderPicker functions - -void SAL_CALL ODMAFolderPicker::setDisplayDirectory( const ::rtl::OUString& aDirectory ) - throw( IllegalArgumentException, RuntimeException ) -{ - if (m_bUseDMS) - return; - - Reference< XFolderPicker > xFolderPicker( m_xInterface, UNO_QUERY ); - xFolderPicker->setDisplayDirectory( aDirectory ); -} - -::rtl::OUString SAL_CALL ODMAFolderPicker::getDisplayDirectory( ) - throw( RuntimeException ) -{ - if (m_bUseDMS) - return rtl::OUString(); - - Reference< XFolderPicker > xFolderPicker( m_xInterface, UNO_QUERY ); - return xFolderPicker->getDisplayDirectory(); -} - -::rtl::OUString SAL_CALL ODMAFolderPicker::getDirectory( ) - throw( RuntimeException ) -{ - if (m_bUseDMS) - return rtl::OUString(); - - Reference< XFolderPicker > xFolderPicker( m_xInterface, UNO_QUERY ); - return xFolderPicker->getDirectory(); -} - -void SAL_CALL ODMAFolderPicker::setDescription( const ::rtl::OUString& aDescription ) - throw( RuntimeException ) -{ - if (m_bUseDMS) - return; - - Reference< XFolderPicker > xFolderPicker( m_xInterface, UNO_QUERY ); - xFolderPicker->setDescription( aDescription ); -} - -// XServiceInfo - -::rtl::OUString SAL_CALL ODMAFolderPicker::getImplementationName( ) - throw( RuntimeException ) -{ - return impl_getStaticImplementationName(); -} - -sal_Bool SAL_CALL ODMAFolderPicker::supportsService( const ::rtl::OUString& sServiceName ) - throw( RuntimeException ) -{ - Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); - for ( sal_Int32 i = 0; i < seqServiceNames.getLength(); i++ ) - { - if ( sServiceName == pArray[i] ) - { - return sal_True ; - } - } - return sal_False ; -} - -Sequence< ::rtl::OUString > SAL_CALL ODMAFolderPicker::getSupportedServiceNames() - throw( RuntimeException ) -{ - return impl_getStaticSupportedServiceNames(); -} - -Sequence< ::rtl::OUString > ODMAFolderPicker::impl_getStaticSupportedServiceNames( ) -{ - Sequence< ::rtl::OUString > seqServiceNames( 1 ); - ::rtl::OUString* pArray = seqServiceNames.getArray(); - pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ODMAFolderPicker" )); - return seqServiceNames ; -} - -::rtl::OUString ODMAFolderPicker::impl_getStaticImplementationName( ) -{ - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFolderPicker" )); -} - -Reference< XInterface > SAL_CALL ODMAFolderPicker::impl_createInstance( const Reference< XComponentContext >& rxContext ) - throw( Exception ) -{ - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new ODMAFolderPicker( xServiceManager ) ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/odma/ODMAFolderPicker.hxx b/fpicker/source/odma/ODMAFolderPicker.hxx deleted file mode 100644 index 880d5a534500..000000000000 --- a/fpicker/source/odma/ODMAFolderPicker.hxx +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * Copyright 2010 Novell, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_ODMA_FOLDERPICKER_HXX -#define INCLUDED_ODMA_FOLDERPICKER_HXX - -#include - -#include -#include -#include -#include -#include - -// class ODMAFolderPicker --------------------------------------------------- - -class ODMAFolderPicker : - public cppu::WeakComponentImplHelper2< - ::com::sun::star::ui::dialogs::XFolderPicker, - ::com::sun::star::lang::XServiceInfo > -{ -private: - sal_Bool m_bUseDMS; - -protected: - ::osl::Mutex m_rbHelperMtx; - - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xInterface; - -public: - ODMAFolderPicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); - - // XFolderPicker functions - - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - - virtual ::rtl::OUString SAL_CALL getDisplayDirectory( ) - throw( ::com::sun::star::uno::RuntimeException ); - - 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 ); - - // XExecutableDialog functions - - virtual void SAL_CALL setTitle( const ::rtl::OUString& _rTitle ) - throw (::com::sun::star::uno::RuntimeException); - - virtual sal_Int16 SAL_CALL execute( ) - throw (::com::sun::star::uno::RuntimeException); - - // XServiceInfo functions - - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw( ::com::sun::star::uno::RuntimeException ); - - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) - throw( ::com::sun::star::uno::RuntimeException ); - - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw( ::com::sun::star::uno::RuntimeException ); - - /* Helper for XServiceInfo */ - static com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames( ); - static ::rtl::OUString impl_getStaticImplementationName( ); - - /* Helper for registry */ - static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ) - throw( com::sun::star::uno::Exception ); -}; - -#endif // INCLUDED_ODMA_FOLDERPICKER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/odma/fps_odma.cxx b/fpicker/source/odma/fps_odma.cxx index 950e553e3d4e..49d0751f058e 100644 --- a/fpicker/source/odma/fps_odma.cxx +++ b/fpicker/source/odma/fps_odma.cxx @@ -22,7 +22,6 @@ #include "cppuhelper/implementationentry.hxx" #include "ODMAFilePicker.hxx" -#include "ODMAFolderPicker.hxx" static cppu::ImplementationEntry g_entries[] = { @@ -32,12 +31,6 @@ static cppu::ImplementationEntry g_entries[] = ODMAFilePicker::impl_getStaticSupportedServiceNames, cppu::createSingleComponentFactory, 0, 0 }, - { - ODMAFolderPicker::impl_createInstance, - ODMAFolderPicker::impl_getStaticImplementationName, - ODMAFolderPicker::impl_getStaticSupportedServiceNames, - cppu::createSingleComponentFactory, 0, 0 - }, { 0, 0, 0, 0, 0, 0 } }; -- cgit