diff options
| author | Thorsten Behrens <thb@openoffice.org> | 2001-04-27 09:19:59 +0000 |
|---|---|---|
| committer | Thorsten Behrens <thb@openoffice.org> | 2001-04-27 09:19:59 +0000 |
| commit | 4cc5e7ca025ef16fc2e75ff69ca75942289ba252 (patch) | |
| tree | 3e90dfa8533aec0c69f5ca663141d86997f2968a /xmloff/source/core | |
| parent | 6ad1a5a9a6a4b9a784608bf3446fea74d6002019 (diff) | |
Conflicts removed
Diffstat (limited to 'xmloff/source/core')
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index cfd25bdc7cb1..ffa5d59d145a 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlimp.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: thb $ $Date: 2001-04-26 18:05:46 $ + * last change: $Author: thb $ $Date: 2001-04-27 10:19:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -267,13 +267,8 @@ SvXMLImport::SvXMLImport( const Reference< XModel > & rModel, xNumberFormatsSupplier (rModel, uno::UNO_QUERY), pProgressBarHelper( NULL ), pEventImportHelper( NULL ), -<<<<<<< xmlimp.cxx - pImageMapImportHelper( NULL ), mnImportFlags( IMPORT_ALL ), mbIsFormsSupported( sal_True ) -======= - mnImportFlags( IMPORT_ALL ) ->>>>>>> 1.34 { _InitCtor(); } |