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

Diminish the number of writerperfect libraries

Browse Source 
Instead of a pleiade of libraries, one for graphic filters (wpftdraw)
and one for text document filters (wpftwriter) to diminish duplicate
static linking.
This commit is contained in:
Fridrich Štrba
2012-04-19 14:33:09 +02:00
parent b98c960e97
commit 9284c50f97
34 changed files with 107 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Repository.mk
View File

@@ -277,7 +277,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
merged \
msfilter \
msword \
msworks \
odfflatxml \
offacc \
pcr \
@@ -338,10 +337,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde \
vclplug_kde4 \
vclplug_svp \
cdrimport \
visioimport \
wpft \
wpgimport \
wpftdraw \
wpftwriter \
writerfilter \
xcr \
xmlfa \

7
postprocess/packcomponents/makefile.mk
View File

@@ -205,11 +205,8 @@ my_components += \
my_components += \
component/writerfilter/util/writerfilter \
component/writerperfect/util/msworksfilter \
component/writerperfect/util/visiofilter \
component/writerperfect/util/wpft \
component/writerperfect/util/wpgfilter \
component/writerperfect/util/cdrfilter \
component/writerperfect/util/wpftwriter \
component/writerperfect/util/wpftdraw \
.ENDIF

6
scp2/source/graphicfilter/file_graphicfilter.scp
View File

@@ -38,8 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport )
STD_FILTER_FILE( gid_File_Lib_CDRImport, cdrimport )
STD_FILTER_FILE( gid_File_Lib_WpftDraw, wpftdraw )

3
scp2/source/graphicfilter/module_graphicfilter.scp
View File

@@ -33,7 +33,6 @@ Module gid_Module_Optional_Grfflt
Sortkey = "600";
ParentID = gid_Module_Optional;
Default = YES;
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WpftDraw,
gid_File_Share_Registry_Graphicfilter_Xcd);
End

4
scp2/source/ooo/file_library_ooo.scp
View File

@@ -888,9 +888,7 @@ End
#endif
STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
STD_LIB_FILE(gid_File_Lib_Msworks,msworks)
STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter)
STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)

3
scp2/source/writer/module_writer.scp
View File

@@ -48,8 +48,7 @@ Module gid_Module_Prg_Wrt_Bin
gid_File_Lib_Swd,
gid_File_Lib_Swui,
gid_File_Lib_Msword,
gid_File_Lib_Wpft,
gid_File_Lib_Msworks,
gid_File_Lib_WpftWriter,
gid_File_Lib_T602Filter,
gid_File_Lib_Writerfilter,
gid_File_Lib_Wlwp,

69
writerperfect/Library_msworks.mk
View File

@@ -1,69 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
$(eval $(call gb_Library_Library,msworks))
$(eval $(call gb_Library_set_componentfile,msworks,writerperfect/util/msworksfilter))
$(eval $(call gb_Library_set_include,msworks,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
))
$(eval $(call gb_Library_use_api,msworks,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_libraries,msworks,\
cppu \
cppuhelper \
sal \
sot \
ucbhelper \
tl \
utl \
xo \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,msworks,\
writerperfect \
))
$(eval $(call gb_Library_use_externals,msworks,\
wpd \
wps \
))
$(eval $(call gb_Library_add_exception_objects,msworks,\
writerperfect/source/wpsimp/MSWorksImportFilter \
writerperfect/source/wpsimp/msworks_genericfilter \
))
# vim: set noet sw=4 ts=4:

69
writerperfect/Library_visioimport.mk
View File

@@ -1,69 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
$(eval $(call gb_Library_Library,visioimport))
$(eval $(call gb_Library_set_componentfile,visioimport,writerperfect/util/visiofilter))
$(eval $(call gb_Library_set_include,visioimport,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
))
$(eval $(call gb_Library_use_api,visioimport,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_libraries,visioimport,\
cppu \
cppuhelper \
sal \
sot \
tl \
utl \
xo \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,visioimport,\
writerperfect \
))
$(eval $(call gb_Library_use_externals,visioimport,\
wpd \
wpg \
visio \
))
$(eval $(call gb_Library_add_exception_objects,visioimport,\
writerperfect/source/vsdimp/VisioImportFilter \
writerperfect/source/vsdimp/visioimport_genericfilter \
))
# vim: set noet sw=4 ts=4:

25
writerperfect/Library_cdrimport.mk → writerperfect/Library_wpftdraw.mk
View File

@@ -26,21 +26,21 @@
#
#*************************************************************************
$(eval $(call gb_Library_Library,cdrimport))
$(eval $(call gb_Library_Library,wpftdraw))
$(eval $(call gb_Library_set_componentfile,cdrimport,writerperfect/util/cdrfilter))
$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/util/wpftdraw))
$(eval $(call gb_Library_set_include,cdrimport,\
$(eval $(call gb_Library_set_include,wpftdraw,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
))
$(eval $(call gb_Library_use_api,cdrimport,\
$(eval $(call gb_Library_use_api,wpftdraw,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_libraries,cdrimport,\
$(eval $(call gb_Library_use_libraries,wpftdraw,\
cppu \
cppuhelper \
sal \
@@ -51,22 +51,25 @@ $(eval $(call gb_Library_use_libraries,cdrimport,\
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,cdrimport,\
$(eval $(call gb_Library_use_static_libraries,wpftdraw,\
writerperfect \
))
$(eval $(call gb_Library_use_externals,cdrimport,\
$(eval $(call gb_Library_use_externals,wpftdraw,\
wpd \
wpg \
visio \
cdr \
lcms2 \
zlib \
))
$(eval $(call gb_Library_add_exception_objects,cdrimport,\
writerperfect/source/cdrimp/CDRImportFilter \
writerperfect/source/cdrimp/CMXImportFilter \
writerperfect/source/cdrimp/cdrimport_genericfilter \
$(eval $(call gb_Library_add_exception_objects,wpftdraw,\
writerperfect/source/draw/CDRImportFilter \
writerperfect/source/draw/CMXImportFilter \
writerperfect/source/draw/VisioImportFilter \
writerperfect/source/draw/WPGImportFilter \
writerperfect/source/draw/wpftdraw_genericfilter \
))
# vim: set noet sw=4 ts=4:

22
writerperfect/Library_wpft.mk → writerperfect/Library_wpftwriter.mk
View File

@@ -26,21 +26,21 @@
#
#*************************************************************************
$(eval $(call gb_Library_Library,wpft))
$(eval $(call gb_Library_Library,wpftwriter))
$(eval $(call gb_Library_set_componentfile,wpft,writerperfect/util/wpft))
$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/util/wpftwriter))
$(eval $(call gb_Library_set_include,wpft,\
$(eval $(call gb_Library_set_include,wpftwriter,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
))
$(eval $(call gb_Library_use_api,wpft,\
$(eval $(call gb_Library_use_api,wpftwriter,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_libraries,wpft,\
$(eval $(call gb_Library_use_libraries,wpftwriter,\
cppu \
cppuhelper \
vcl \
@@ -54,18 +54,20 @@ $(eval $(call gb_Library_use_libraries,wpft,\
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,wpft,\
$(eval $(call gb_Library_use_static_libraries,wpftwriter,\
writerperfect \
))
$(eval $(call gb_Library_use_externals,wpft,\
$(eval $(call gb_Library_use_externals,wpftwriter,\
wpd \
wpg \
wps \
))
$(eval $(call gb_Library_add_exception_objects,wpft,\
writerperfect/source/wpdimp/WordPerfectImportFilter \
writerperfect/source/wpdimp/wpft_genericfilter \
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/MSWorksImportFilter \
writerperfect/source/writer/WordPerfectImportFilter \
writerperfect/source/writer/wpftwriter_genericfilter \
))
# vim: set noet sw=4 ts=4:

68
writerperfect/Library_wpgimport.mk
View File

@@ -1,68 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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.
#
#*************************************************************************
$(eval $(call gb_Library_Library,wpgimport))
$(eval $(call gb_Library_set_componentfile,wpgimport,writerperfect/util/wpgfilter))
$(eval $(call gb_Library_set_include,wpgimport,\
$$(INCLUDE) \
-I$(SRCDIR)/writerperfect/source \
))
$(eval $(call gb_Library_use_api,wpgimport,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_libraries,wpgimport,\
cppu \
cppuhelper \
sal \
sot \
tl \
utl \
xo \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,wpgimport,\
writerperfect \
))
$(eval $(call gb_Library_use_externals,wpgimport,\
wpd \
wpg \
))
$(eval $(call gb_Library_add_exception_objects,wpgimport,\
writerperfect/source/wpgimp/WPGImportFilter \
writerperfect/source/wpgimp/wpgimport_genericfilter \
))
# vim: set noet sw=4 ts=4:

28
writerperfect/Module_writerperfect.mk
View File

@@ -28,42 +28,32 @@
$(eval $(call gb_Module_Module,writerperfect))
ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_cdrimport \
))
endif
ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_msworks \
Library_wpftwriter \
))
endif
endif
ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_visioimport \
))
endif
ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpft \
))
endif
ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpgimport \
Library_wpftdraw \
))
endif
endif
endif
endif
ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
StaticLibrary_writerperfect \
))
endif
endif
# vim: set noet sw=4 ts=4:

0
writerperfect/source/cdrimp/CDRImportFilter.cxx → writerperfect/source/draw/CDRImportFilter.cxx
View File

0
writerperfect/source/cdrimp/CDRImportFilter.hxx → writerperfect/source/draw/CDRImportFilter.hxx
View File

0
writerperfect/source/cdrimp/CMXImportFilter.cxx → writerperfect/source/draw/CMXImportFilter.cxx
View File

0
writerperfect/source/cdrimp/CMXImportFilter.hxx → writerperfect/source/draw/CMXImportFilter.hxx
View File

0
writerperfect/source/vsdimp/VisioImportFilter.cxx → writerperfect/source/draw/VisioImportFilter.cxx
View File

5
writerperfect/source/vsdimp/VisioImportFilter.hxx → writerperfect/source/draw/VisioImportFilter.hxx
View File

@@ -40,11 +40,6 @@
#include <stdio.h>
enum FilterType
{
FILTER_IMPORT,
FILTER_EXPORT
};
/* This component will be instantiated for both import or export. Whether it calls
* setSourceDocument or setTargetDocument determines which Impl function the filter
* member calls */

0
writerperfect/source/wpgimp/WPGImportFilter.cxx → writerperfect/source/draw/WPGImportFilter.cxx
View File

5
writerperfect/source/wpgimp/WPGImportFilter.hxx → writerperfect/source/draw/WPGImportFilter.hxx
View File

@@ -40,11 +40,6 @@
#include <stdio.h>
enum FilterType
{
FILTER_IMPORT,
FILTER_EXPORT
};
/* This component will be instantiated for both import or export. Whether it calls
* setSourceDocument or setTargetDocument determines which Impl function the filter
* member calls */

44
writerperfect/source/vsdimp/visioimport_genericfilter.cxx → writerperfect/source/draw/wpftdraw_genericfilter.cxx
View File

@@ -31,7 +31,10 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include "CDRImportFilter.hxx"
#include "CMXImportFilter.hxx"
#include "VisioImportFilter.hxx"
#include "WPGImportFilter.hxx"
using namespace ::rtl;
using namespace ::cppu;
@@ -41,12 +44,51 @@ using namespace ::com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void *SAL_CALL visiofilter_component_getFactory(
SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpftdraw_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /* pRegistryKey */ )
{
void *pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager && implName.equals(CDRImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
CDRImportFilter_createInstance, CDRImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
if ( pServiceManager && implName.equals(CMXImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
CMXImportFilter_createInstance, CMXImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
if ( pServiceManager && implName.equals(WPGImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
WPGImportFilter_createInstance, WPGImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
if ( pServiceManager && implName.equals(VisioImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(

67
writerperfect/source/wpdimp/wpft_genericfilter.cxx
View File

@@ -1,67 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* genericfilter: mostly generic code for registering the filter
*
* Portions of this code Copyright 2000 by Sun Microsystems, Inc.
* Rest is Copyright (C) 2002 William Lachance (wlach@interlog.com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
/* "This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited."
*/
#include <stdio.h>
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include "WordPerfectImportFilter.hxx"
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpft_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /* pRegistryKey */ )
{
void *pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager && implName.equals(WordPerfectImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
WordPerfectImportFilter_createInstance, WordPerfectImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

68
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
View File

@@ -1,68 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* genericfilter: mostly generic code for registering the filter
*
* Portions of this code Copyright 2000 by Sun Microsystems, Inc.
* Rest is Copyright (C) 2002 William Lachance (wlach@interlog.com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
/* "This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited."
*/
#include <stdio.h>
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include "WPGImportFilter.hxx"
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpgfilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /* pRegistryKey */ )
{
void *pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager && implName.equals(WPGImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
WPGImportFilter_createInstance, WPGImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

68
writerperfect/source/wpsimp/msworks_genericfilter.cxx
View File

@@ -1,68 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* genericfilter: mostly generic code for registering the filter
*
* Portions of this code Copyright 2000 by Sun Microsystems, Inc.
* Rest is Copyright (C) 2002 William Lachance (wlach@interlog.com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
/* "This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited."
*/
#include <stdio.h>
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include "MSWorksImportFilter.hxx"
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void *SAL_CALL msworksfilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /* pRegistryKey */ )
{
void *pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager && implName.equals(MSWorksImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
MSWorksImportFilter_createInstance, MSWorksImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
xFactory->acquire();
pRet = xFactory.get();
}
}
return pRet;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

0
writerperfect/source/wpsimp/MSWorksImportFilter.cxx → writerperfect/source/writer/MSWorksImportFilter.cxx
View File

0
writerperfect/source/wpsimp/MSWorksImportFilter.hxx → writerperfect/source/writer/MSWorksImportFilter.hxx
View File

0
writerperfect/source/wpdimp/WordPerfectImportFilter.cxx → writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

0
writerperfect/source/wpdimp/WordPerfectImportFilter.hxx → writerperfect/source/writer/WordPerfectImportFilter.hxx
View File

15
writerperfect/source/cdrimp/cdrimport_genericfilter.cxx → writerperfect/source/writer/wpftwriter_genericfilter.cxx
View File

@@ -28,11 +28,10 @@
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include "CDRImportFilter.hxx"
#include "CMXImportFilter.hxx"
#include "WordPerfectImportFilter.hxx"
#include "MSWorksImportFilter.hxx"
using namespace ::rtl;
using namespace ::cppu;
@@ -42,18 +41,18 @@ using namespace ::com::sun::star::registry;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void *SAL_CALL cdrfilter_component_getFactory(
SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpftwriter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /* pRegistryKey */ )
{
void *pRet = 0;
OUString implName = OUString::createFromAscii( pImplName );
if ( pServiceManager && implName.equals(CDRImportFilter_getImplementationName()) )
if ( pServiceManager && implName.equals(WordPerfectImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
CDRImportFilter_createInstance, CDRImportFilter_getSupportedServiceNames() ) );
WordPerfectImportFilter_createInstance, WordPerfectImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{
@@ -61,12 +60,12 @@ extern "C"
pRet = xFactory.get();
}
}
if ( pServiceManager && implName.equals(CMXImportFilter_getImplementationName()) )
if ( pServiceManager && implName.equals(MSWorksImportFilter_getImplementationName()) )
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ),
CMXImportFilter_createInstance, CMXImportFilter_getSupportedServiceNames() ) );
MSWorksImportFilter_createInstance, MSWorksImportFilter_getSupportedServiceNames() ) );
if (xFactory.is())
{

8
writerperfect/util/msworksfilter.component
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary" prefix="msworksfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.MSWorksImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
</component>

8
writerperfect/util/visiofilter.component
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary" prefix="visiofilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.VisioImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
</component>

10
writerperfect/util/cdrfilter.component → writerperfect/util/wpftdraw.component
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary" prefix="cdrfilter"
<component loader="com.sun.star.loader.SharedLibrary" prefix="wpftdraw"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.CDRImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
@@ -9,4 +9,12 @@
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.VisioImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.WPGImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
</component>

6
writerperfect/util/wpft.component → writerperfect/util/wpftwriter.component
View File

@@ -26,8 +26,12 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="wpft"
<component loader="com.sun.star.loader.SharedLibrary" prefix="wpftwriter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.MSWorksImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
<implementation name="com.sun.star.comp.Writer.WordPerfectImportFilter">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
<service name="com.sun.star.document.ImportFilter"/>

8
writerperfect/util/wpgfilter.component
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary" prefix="wpgfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.WPGImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
</component>