diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
| commit | 41bc9ff8d750b4af10d20a36539c57da14695dcf (patch) | |
| tree | dc2ee437c54daba12ac442fd0e10baf97eadf184 /reportdesign/source/filter/xml | |
| parent | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (diff) | |
| parent | e35c56815d43a06c53488e3efa35f062a6a2d60c (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'reportdesign/source/filter/xml')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlservices.cxx | 8 |
4 files changed, 4 insertions, 10 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index e79603a6294b..767fc340d1f8 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1382,7 +1382,7 @@ void ORptExport::_ExportAutoStyles() GetPageExport()->exportAutoStyles(); } // ----------------------------------------------------------------------------- -void ORptExport::_ExportStyles(BOOL bUsed) +void ORptExport::_ExportStyles(sal_Bool bUsed) { SvXMLExport::_ExportStyles(bUsed); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 3d71e8deac69..8e0e7299335b 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -182,7 +182,7 @@ private: virtual void SetBodyAttributes(); protected: - virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportStyles( sal_Bool bUsed ); virtual void _ExportAutoStyles(); virtual void _ExportContent(); virtual void _ExportMasterStyles(); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b92e7599cadc..b44fd3282ed3 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -509,7 +509,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( - sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); + sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 ); if( pMedium ) { diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 3e4a09d3993a..b479396371b8 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -94,11 +94,5 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" sal_Bool SAL_CALL component_writeInfo( - void * serviceManager, void * registryKey) -{ - return cppu::component_writeInfoHelper( - serviceManager, registryKey, entries); -} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file |