diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:38:26 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:38:26 +0100 |
| commit | 62abc842160313fbcdee8ff46c6b4fae6321f21d (patch) | |
| tree | e64848c660027d77782a046e5da55d827c2e4b29 /filter/source/odfflatxml | |
| parent | af9cd95a2499e602887352c833d3ac52ce9670f2 (diff) | |
| parent | c08aba6a410bd7e85095a485486dcfb5bb6612b8 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
binfilter/bf_forms/source/component/forms_Filter.cxx
binfilter/bf_sw/source/core/inc/node2lay.hxx
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
binfilter/inc/bf_sw/swdbtoolsclient.hxx
filter/source/xsltdialog/xmlfileview.cxx
oox/source/ole/axcontrol.cxx
oox/source/vml/vmlformatting.cxx
oox/source/xls/autofiltercontext.cxx
oox/source/xls/externallinkfragment.cxx
oox/source/xls/formulaparser.cxx
oox/source/xls/pivotcachebuffer.cxx
oox/source/xls/pivotcachefragment.cxx
oox/source/xls/sheetdatacontext.cxx
writerfilter/source/dmapper/GraphicImport.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/ooxml/model.xml
Diffstat (limited to 'filter/source/odfflatxml')
| -rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index ae809892baf1..005bc9a11c2b 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -237,14 +237,6 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference _COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT -// extern "C" component_writeInfo() - -_COMPHELPER_COMPONENT_WRITEINFO -( - _COMPHELPER_COMPONENTINFO( OdfFlatXml, - OdfFlatXml::impl_getImplementationName(), - OdfFlatXml::impl_getSupportedServiceNames()) -) // extern "C" component_getFactory() _COMPHELPER_COMPONENT_GETFACTORY ( |