strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add new libmwaw drawing formats (forgotten files)

Browse source 
Change-Id: Ib9ecd643a552063e2a09874776b3ea0f30e8440a
This commit is contained in:
osnola 2014-05-28 18:13:06 +02:00 committed by David Tardon
parent 0e17d7bb8a
commit ba0b63869a
6 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
filter/Configuration_filter.mk
View file

@ -599,10 +599,17 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw8_template \
draw_WordPerfect_Graphics \
draw_Visio_Document \
draw_Publisher_Document \
draw_Publisher_Document \
draw_CorelDraw_Document \
draw_Corel_Presentation_Exchange \
draw_Freehand_Document \
draw_Visio_Document \
draw_Beagle_Works \
draw_ClarisWorks \
draw_Great_Works \
draw_Mac_Works \
draw_MacPaint \
draw_SuperPaint \
)
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
@ -613,10 +620,16 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt
draw8_template \
WordPerfectGraphics \
VisioDocument \
PublisherDocument \
PublisherDocument \
CorelDrawDocument \
CorelPresentationExchange \
FreehandDocument \
Beagle_Works_Draw \
ClarisWorks_Draw \
Great_Works_Draw \
Mac_Works_Draw \
MacPaint_Draw \
SuperPaint_Draw \
)
$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\

2
writerperfect/Library_wpftdraw.mk
View file

@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
cdr \
freehand \
mspub \
mwaw \
odfgen \
revenge \
visio \
@ -58,6 +59,7 @@ $(eval $(call gb_Library_add_exception_objects,wpftdraw,\
writerperfect/source/draw/FreehandImportFilter \
writerperfect/source/draw/ImportFilterBase \
writerperfect/source/draw/MSPUBImportFilter \
writerperfect/source/draw/MWAWDrawImportFilter \
writerperfect/source/draw/VisioImportFilter \
writerperfect/source/draw/WPGImportFilter \
writerperfect/source/draw/wpftdraw_genericfilter \

6
writerperfect/source/draw/ImportFilterBase.cxx
View file

@ -95,6 +95,8 @@ throw (RuntimeException, std::exception)
OdgGenerator exporter;
exporter.addDocumentHandler(&xHandler, ODF_FLAT_XML);
doRegisterHandlers(exporter);
return doImportDocument(input, exporter);
}
@ -170,6 +172,10 @@ throw (Exception, RuntimeException, std::exception)
}
}
void ImportFilterImpl::doRegisterHandlers( OdgGenerator & )
{
}
}
}

3
writerperfect/source/draw/ImportFilterBase.hxx
View file

@ -39,6 +39,8 @@ namespace xml { namespace sax {
}
} } }
class OdgGenerator;
namespace writerperfect
{
namespace draw
@ -80,6 +82,7 @@ public:
private:
virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) = 0;
virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) = 0;
virtual void doRegisterHandlers( OdgGenerator &rGenerator );
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;

4
writerperfect/source/draw/wpftdraw.component
View file

@ -25,6 +25,10 @@
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
<implementation name="com.sun.star.comp.Draw.MWAWDrawImportFilter">
<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"/>

5
writerperfect/source/draw/wpftdraw_genericfilter.cxx
View file

@ -32,6 +32,7 @@
#include "CDRImportFilter.hxx"
#include "CMXImportFilter.hxx"
#include "MSPUBImportFilter.hxx"
#include "MWAWDrawImportFilter.hxx"
#include "FreehandImportFilter.hxx"
#include "VisioImportFilter.hxx"
#include "WPGImportFilter.hxx"
@ -53,6 +54,10 @@ static cppu::ImplementationEntry const services[] = {
&MSPUBImportFilter_getImplementationName,
&MSPUBImportFilter_getSupportedServiceNames,
&cppu::createSingleComponentFactory, 0, 0 },
{ &MWAWDrawImportFilter_createInstance,
&MWAWDrawImportFilter_getImplementationName,
&MWAWDrawImportFilter_getSupportedServiceNames,
&cppu::createSingleComponentFactory, 0, 0 },
{ &VisioImportFilter_createInstance,
&VisioImportFilter_getImplementationName,
&VisioImportFilter_getSupportedServiceNames,