fpicker/Library_fps.mk |1
fpicker/source/win32/folderpicker/Fopentry.cxx | 102 -
2 files changed, 103 deletions(-)
New commits:
commit f04e6b0e965e3a4301e705fb41a15c5560765b5b
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 15 10:28:33 2012 +0100
fdo#47246: fpicker: merge fop into fps: remove Fopentry.cxx
Forgot that in 095528351c3c916ef3c79f7275113ec628b4d473.
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index e70bdf4..986b167 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,fps,\
fpicker/source/win32/filepicker/VistaFilePickerImpl \
fpicker/source/win32/filepicker/WinFileOpenImpl \
fpicker/source/win32/folderpicker/FolderPicker \
- fpicker/source/win32/folderpicker/Fopentry \
fpicker/source/win32/folderpicker/MtaFop \
fpicker/source/win32/folderpicker/WinFOPImpl \
fpicker/source/win32/misc/AutoBuffer \
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx
b/fpicker/source/win32/folderpicker/Fopentry.cxx
deleted file mode 100644
index e90ea62..000
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ /dev/null
@@ -1,102 +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.
- *
- * 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
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-
-//---
-// includes of other projects
-//---
-#include cppuhelper/factory.hxx
-#include com/sun/star/container/XSet.hpp
-#include osl/diagnose.h
-
-#include FolderPicker.hxx
-
-#include FOPServiceInfo.hxx
-#include WinFOPImpl.hxx
-
-//---
-// namespace directives
-//---
-
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::registry ;
-using namespace ::cppu ;
-using com::sun::star::ui::dialogs::XFolderPicker;
-
-
-namespace
-{
-
-//---
-//
-//---
-
-Reference XInterface SAL_CALL createInstance( const Reference
XMultiServiceFactory rServiceManager )
-{
-return Reference XInterface ( static_cast XFolderPicker* ( new
CFolderPicker( rServiceManager ) ) );
-}
-}
-
-extern C
-{
-
-//--
-// component_getFactory
-// returns a factory to create XFilePicker-Services
-//--
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplName, uno_Interface* pSrvManager, uno_Interface* )
-{
-void* pRet = 0;
-
-if ( pSrvManager ( 0 == rtl_str_compare( pImplName,
FOLDER_PICKER_IMPL_NAME ) ) )
-{
-Sequence OUString aSNS( 1 );
-aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(
FOLDER_PICKER_SERVICE_NAME ) );
-
-Reference XSingleServiceFactory xFactory ( createSingleFactory(
-reinterpret_cast XMultiServiceFactory* ( pSrvManager ),
-OUString::createFromAscii( pImplName ),
-createInstance,
-aSNS ) );
-if ( xFactory.is() )
-{
-xFactory-acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
-
-} // extern C
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
