diff options
Diffstat (limited to 'svtools/source/filter.vcl/filter')
27 files changed, 434 insertions, 434 deletions
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx index 324b267eb7c4..2aba8ff9f751 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ // #define TOKEN_INDEX_FOR_HASDIALOG 2 using namespace ::com::sun::star::lang ; // XMultiServiceFactory -using namespace ::com::sun::star::container ; // XNameAccess -using namespace ::com::sun::star::uno ; // Reference -using namespace ::com::sun::star::beans ; // PropertyValue +using namespace ::com::sun::star::container ; // XNameAccess +using namespace ::com::sun::star::uno ; // Reference +using namespace ::com::sun::star::beans ; // PropertyValue using namespace ::utl ; // getProcessServiceFactory(); -using namespace ::rtl ; +using namespace ::rtl ; const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] = { @@ -313,9 +313,9 @@ void FilterConfigCache::ImplInitSmart() const char** pPtr; for ( pPtr = InternalFilterListForSvxLight; *pPtr; pPtr++ ) { - FilterConfigCacheEntry aEntry; + FilterConfigCacheEntry aEntry; - OUString sExtension( OUString::createFromAscii( *pPtr++ ) ); + OUString sExtension( OUString::createFromAscii( *pPtr++ ) ); aEntry.lExtensionList.realloc( 1 ); aEntry.lExtensionList[ 0 ] = sExtension; @@ -326,7 +326,7 @@ void FilterConfigCache::ImplInitSmart() ByteString sFlags( *pPtr++ ); aEntry.nFlags = sFlags.ToInt32(); - OUString sUserData( OUString::createFromAscii( *pPtr ) ); + OUString sUserData( OUString::createFromAscii( *pPtr ) ); aEntry.CreateFilterName( sUserData ); if ( aEntry.nFlags & 1 ) diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx index b1579bec092a..9e663e329717 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx +++ b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,27 +49,27 @@ class SVT_DLLPUBLIC FilterConfigCache ::rtl::OUString sInternalFilterName; ::rtl::OUString sType; ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensionList; - ::rtl::OUString sUIName; - ::rtl::OUString sDocumentService; + ::rtl::OUString sUIName; + ::rtl::OUString sDocumentService; ::rtl::OUString sFilterService; ::rtl::OUString sTemplateName; - ::rtl::OUString sMediaType; + ::rtl::OUString sMediaType; ::rtl::OUString sFilterType; - sal_Int32 nFlags; - sal_Int32 nFileFormatVersion; + sal_Int32 nFlags; + sal_Int32 nFileFormatVersion; // user data - String sFilterName; - sal_Bool bHasDialog : 1; - sal_Bool bIsInternalFilter : 1; - sal_Bool bIsPixelFormat : 1; + String sFilterName; + sal_Bool bHasDialog : 1; + sal_Bool bIsInternalFilter : 1; + sal_Bool bIsPixelFormat : 1; - sal_Bool IsValid(); - sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); + sal_Bool IsValid(); + sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); String GetShortName( ); - + static const char* InternalPixelFilterNameList[]; static const char* InternalVectorFilterNameList[]; static const char* ExternalPixelFilterNameList[]; @@ -78,9 +78,9 @@ class SVT_DLLPUBLIC FilterConfigCache typedef std::vector< FilterConfigCacheEntry > CacheVector; - CacheVector aImport; - CacheVector aExport; - sal_Bool bUseConfig; + CacheVector aImport; + CacheVector aExport; + sal_Bool bUseConfig; static sal_Bool bInitialized; static sal_Int32 nIndType; @@ -92,56 +92,56 @@ class SVT_DLLPUBLIC FilterConfigCache static sal_Int32 nIndFileFormatVersion; static sal_Int32 nIndTemplateName; - static const char* InternalFilterListForSvxLight[]; - - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSmart(); + static const char* InternalFilterListForSvxLight[]; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplInitSmart(); + public : - sal_uInt16 GetImportFormatCount() const + sal_uInt16 GetImportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aImport.size()); }; - sal_uInt16 GetImportFormatNumber( const String& rFormatName ); - sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); - sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); - sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); - String GetImportFilterName( sal_uInt16 nFormat ); - String GetImportFormatName( sal_uInt16 nFormat ); - String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0); - String GetImportFormatMediaType( sal_uInt16 nFormat ); - String GetImportFormatShortName( sal_uInt16 nFormat ); - String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); + sal_uInt16 GetImportFormatNumber( const String& rFormatName ); + sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); + String GetImportFilterName( sal_uInt16 nFormat ); + String GetImportFormatName( sal_uInt16 nFormat ); + String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0); + String GetImportFormatMediaType( sal_uInt16 nFormat ); + String GetImportFormatShortName( sal_uInt16 nFormat ); + String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); String GetImportFilterType( sal_uInt16 nFormat ); String GetImportFilterTypeName( sal_uInt16 nFormat ); - sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsImportDialog( sal_uInt16 nFormat ); + sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); + sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + sal_Bool IsImportDialog( sal_uInt16 nFormat ); - sal_uInt16 GetExportFormatCount() const + sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; - sal_uInt16 GetExportFormatNumber( const String& rFormatName ); - sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType ); - sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); - sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); - String GetExportFilterName( sal_uInt16 nFormat ); - String GetExportFormatName( sal_uInt16 nFormat ); - String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); - String GetExportFormatMediaType( sal_uInt16 nFormat ); - String GetExportFormatShortName( sal_uInt16 nFormat ); - String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); + sal_uInt16 GetExportFormatNumber( const String& rFormatName ); + sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); + String GetExportFilterName( sal_uInt16 nFormat ); + String GetExportFormatName( sal_uInt16 nFormat ); + String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + String GetExportFormatMediaType( sal_uInt16 nFormat ); + String GetExportFormatShortName( sal_uInt16 nFormat ); + String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); String GetExportFilterTypeName( sal_uInt16 nFormat ); String GetExportInternalFilterName( sal_uInt16 nFormat ); - sal_Bool IsExportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsExportDialog( sal_uInt16 nFormat ); + sal_Bool IsExportInternalFilter( sal_uInt16 nFormat ); + sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + sal_Bool IsExportDialog( sal_uInt16 nFormat ); FilterConfigCache( sal_Bool bUseConfig ); ~FilterConfigCache(); }; -#endif // _FILTER_CONFIG_CACHE_HXX_ +#endif // _FILTER_CONFIG_CACHE_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx index ee788458e609..d6b23770dc41 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,22 +40,22 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> using namespace ::rtl; -using namespace ::utl ; // getProcessServiceFactory -using namespace ::com::sun::star::lang ; // XMultiServiceFactory -using namespace ::com::sun::star::beans ; // PropertyValue -using namespace ::com::sun::star::uno ; // Reference -using namespace ::com::sun::star::util ; // XChangesBatch -using namespace ::com::sun::star::awt ; // Size -using namespace ::com::sun::star::container ; // -using namespace ::com::sun::star::task ; // XStatusIndicator +using namespace ::utl ; // getProcessServiceFactory +using namespace ::com::sun::star::lang ; // XMultiServiceFactory +using namespace ::com::sun::star::beans ; // PropertyValue +using namespace ::com::sun::star::uno ; // Reference +using namespace ::com::sun::star::util ; // XChangesBatch +using namespace ::com::sun::star::awt ; // Size +using namespace ::com::sun::star::container ; // +using namespace ::com::sun::star::task ; // XStatusIndicator static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const String& rTree ) { - sal_Bool bAvailable = rTree.Len() != 0; + sal_Bool bAvailable = rTree.Len() != 0; if ( bAvailable ) { - xub_StrLen nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' ); - xub_StrLen i = 0; + xub_StrLen nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' ); + xub_StrLen i = 0; if ( rTree.GetChar( 0 ) == (sal_Unicode)'/' ) i++; @@ -65,7 +65,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv Any aAny; aAny <<= (OUString)rTree.GetToken( i++, (sal_Unicode)'/' ); - // creation arguments: nodepath + // creation arguments: nodepath PropertyValue aPathArgument; aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); aPathArgument.Value = aAny; @@ -83,7 +83,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv catch ( ::com::sun::star::uno::Exception& ) { bAvailable = sal_False; - } + } if ( xReadAccess.is() ) { for ( ; bAvailable && ( i < nTokenCount ); i++ ) @@ -109,7 +109,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv { bAvailable = sal_False; } - } + } } } } @@ -123,9 +123,9 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) OUString sTree( ConfigManager::GetConfigBaseURL() ); sTree += rSubTree; - Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); // get global uno service manager + Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); // get global uno service manager - Reference< XMultiServiceFactory > xCfgProv( + Reference< XMultiServiceFactory > xCfgProv( xSMGR->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ) ), UNO_QUERY ); @@ -134,19 +134,19 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) if ( ImpIsTreeAvailable( xCfgProv, String( sTree ) ) ) { Any aAny; - // creation arguments: nodepath + // creation arguments: nodepath PropertyValue aPathArgument; aAny <<= sTree; aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); aPathArgument.Value = aAny; - // creation arguments: commit mode + // creation arguments: commit mode PropertyValue aModeArgument; sal_Bool bAsyncron = sal_True; aAny <<= bAsyncron; aModeArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ); aModeArgument.Value = aAny; - + Sequence< Any > aArguments( 2 ); aArguments[ 0 ] <<= aPathArgument; aArguments[ 1 ] <<= aModeArgument; @@ -178,7 +178,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun: aFilterData = *pFilterData; } -FilterConfigItem::FilterConfigItem( const OUString& rSubTree, +FilterConfigItem::FilterConfigItem( const OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) { ImpInitTree( rSubTree ); diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx index 6a5d9306241d..09cc71e50df4 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ #include "vcl/svapp.hxx" #if defined WIN || (defined OS2 && !defined ICC) -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" +#define EXPDLG_FUNCTION_NAME "_DoExportDialog" #else -#define EXPDLG_FUNCTION_NAME "DoExportDialog" +#define EXPDLG_FUNCTION_NAME "DoExportDialog" #endif using namespace ::rtl; @@ -95,8 +95,8 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > & xMgr ) : - rxMgr ( xMgr ), - eFieldUnit ( FUNIT_CM ) + rxMgr ( xMgr ), + eFieldUnit ( FUNIT_CM ) { } @@ -151,7 +151,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() sal_Int32 i, nCount; for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) break; } if ( i == nCount ) @@ -164,7 +164,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() } void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, + throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -173,7 +173,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope sal_Int32 i, nCount; for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) { aMediaDescriptor[ i ].Value >>= aFilterDataSequence; break; @@ -207,14 +207,14 @@ sal_Int16 SvFilterOptionsDialog::execute() aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "impress_" ) ), String(), 0 ); break; } - } + } if ( aInternalFilterName.Len() ) { GraphicFilter aGraphicFilter( sal_True ); sal_uInt16 nFormat, nFilterCount = aGraphicFilter.pConfig->GetExportFormatCount(); for ( nFormat = 0; nFormat < nFilterCount; nFormat++ ) - { + { if ( aGraphicFilter.pConfig->GetExportInternalFilterName( nFormat ) == aInternalFilterName ) break; } @@ -223,7 +223,7 @@ sal_Int16 SvFilterOptionsDialog::execute() FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, eFieldUnit ); aFltCallDlgPara.aFilterData = aFilterDataSequence; - String aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) ); + String aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) ); if ( aGraphicFilter.pConfig->IsExportInternalFilter( nFormat ) ) { // Export-Dialog fuer Bitmap's, SVM's und WMF's @@ -234,8 +234,8 @@ sal_Int16 SvFilterOptionsDialog::execute() ( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )|| ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) ) { - ByteString aResMgrName( "svt", 3 ); - ResMgr* pResMgr; + ByteString aResMgrName( "svt", 3 ); + ResMgr* pResMgr; pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); aFltCallDlgPara.pResMgr = pResMgr; @@ -258,15 +258,15 @@ sal_Int16 SvFilterOptionsDialog::execute() nRet = ui::dialogs::ExecutableDialogResults::OK; } else - { + { aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); if ( DlgExportVec( aFltCallDlgPara ).Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; } delete pResMgr; } - } - else // ladbare Filter + } + else // ladbare Filter { xub_StrLen i, nTokenCount = aGraphicFilter.aFilterPath.GetTokenCount( ';' ); for ( i = 0; i < nTokenCount; i++ ) @@ -282,7 +282,7 @@ sal_Int16 SvFilterOptionsDialog::execute() aSystemPath += OUString( aFilterName ); osl::Module aLibrary( aSystemPath ); - PFilterDlgCall pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); + PFilterDlgCall pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); // Dialog in DLL ausfuehren if( pFunc ) { diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx index 3e9fce6cf4ca..e6e27af1aadd 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5 com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterDataSequence; rtl::OUString aDialogTitle; - FieldUnit eFieldUnit; + FieldUnit eFieldUnit; public: @@ -70,18 +70,18 @@ public: throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); // XPropertyAccess virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aProps ) - throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, + throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -92,7 +92,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; diff --git a/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx index 4cedaf70e509..1a0ae297402d 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.cxx +++ b/svtools/source/filter.vcl/filter/dlgejpg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include "strings.hrc" #include <svtools/FilterConfigItem.hxx> -#define KEY_QUALITY "Quality" -#define KEY_GRAYSCALES "ColorMode" +#define KEY_QUALITY "Quality" +#define KEY_GRAYSCALES "ColorMode" /************************************************************************* |* @@ -44,7 +44,7 @@ DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_JPG, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aFiDescr ( this, ResId( FI_DESCR, *rPara.pResMgr ) ), aNumFldQuality ( this, ResId( NUM_FLD_QUALITY, *rPara.pResMgr ) ), aGrpQuality ( this, ResId( GRP_QUALITY, *rPara.pResMgr ) ), @@ -56,7 +56,7 @@ DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) : aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ) { FreeResource(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); // reading filter options diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc index 90a3c1d162be..c5fc85483532 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.hrc +++ b/svtools/source/filter.vcl/filter/dlgejpg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx index efc5daa7105c..12a7922d7600 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.hxx +++ b/svtools/source/filter.vcl/filter/dlgejpg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,16 +51,16 @@ private: FltCallDialogParameter& rFltCallPara; - FixedInfo aFiDescr; - NumericField aNumFldQuality; + FixedInfo aFiDescr; + NumericField aNumFldQuality; FixedLine aGrpQuality; - RadioButton aRbGray; - RadioButton aRbRGB; + RadioButton aRbGray; + RadioButton aRbRGB; FixedLine aGrpColors; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - FilterConfigItem* pConfigItem; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + FilterConfigItem* pConfigItem; DECL_LINK( OK, void * ); diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src index fd224f22c409..c0c58d7a1b82 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.src +++ b/svtools/source/filter.vcl/filter/dlgejpg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx index 1b400cba87c6..95e25de06be5 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.cxx +++ b/svtools/source/filter.vcl/filter/dlgepng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ using namespace ::com::sun::star::uno; DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_EPNG, *rPara.pResMgr ) ), - FilterConfigItem ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ), - rFltCallPara ( rPara ), + FilterConfigItem ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ), + rFltCallPara ( rPara ), aGrpCompression ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ), aFiCompression ( this, ResId( FI_COMPRESSION, *rPara.pResMgr ) ), aNumCompression ( this, ResId( NUM_COMPRESSION, *rPara.pResMgr ) ), @@ -53,18 +53,18 @@ DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) : aBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ) + pMgr ( rPara.pResMgr ) { FreeResource(); // Config-Parameter lesen - sal_Int32 nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); + sal_Int32 nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); if ( ( nCompression < 0 ) || ( nCompression > 9 ) ) nCompression = 6; aNumCompression.SetValue( nCompression ); - sal_Int32 nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ); - sal_Bool bInterlaced = nInterlaced != 0; + sal_Int32 nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ); + sal_Bool bInterlaced = nInterlaced != 0; aCbxInterlaced.Check( bInterlaced ); aBtnOK.SetClickHdl( LINK( this, DlgExportEPNG, OK ) ); diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc index b3ffaab3ab1e..d63234de40fb 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.hrc +++ b/svtools/source/filter.vcl/filter/dlgepng.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx index b43feafc0d49..e4f9123b1190 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.hxx +++ b/svtools/source/filter.vcl/filter/dlgepng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,14 +53,14 @@ class DlgExportEPNG : public ModalDialog, FilterConfigItem FltCallDialogParameter& rFltCallPara; - FixedLine aGrpCompression; - FixedInfo aFiCompression; - NumericField aNumCompression; - CheckBox aCbxInterlaced; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - ResMgr* pMgr; + FixedLine aGrpCompression; + FixedInfo aFiCompression; + NumericField aNumCompression; + CheckBox aCbxInterlaced; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + ResMgr* pMgr; DECL_LINK( OK, void * ); diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src index aa778842dc48..9924441fbfc3 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.src +++ b/svtools/source/filter.vcl/filter/dlgepng.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx index 951dd2c1a551..0157549c8d89 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.cxx +++ b/svtools/source/filter.vcl/filter/dlgexpor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_svtools.hxx" #ifndef GCC -# pragma hdrstop +# pragma hdrstop #endif #include <tools/ref.hxx> @@ -49,7 +49,7 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_PIX, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aBtnOK ( this, ResId( BTN_OK_PIX, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL_PIX, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP_PIX, *rPara.pResMgr ) ), @@ -65,15 +65,15 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : aMtfSizeY ( this, ResId( MTF_SIZEY_PIX, *rPara.pResMgr ) ), aGrpMode ( this, ResId( GRP_MODE_PIX, *rPara.pResMgr ) ), aCbbRes ( this, ResId( CBB_RES_PIX, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) + pMgr ( rPara.pResMgr ), + aExt ( rPara.aFilterExt ) { aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); aFilterConfigPath.Append( aExt ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - String aTitle( aExt ); + String aTitle( aExt ); FreeResource(); aBtnOK.SetClickHdl( LINK( this, DlgExportPix, OK ) ); @@ -112,13 +112,13 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : switch ( rPara.eFieldUnit ) { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : -// case FUNIT_M : +// case FUNIT_NONE : +// case FUNIT_KM : +// case FUNIT_PERCENT : +// case FUNIT_CUSTOM : +// case FUNIT_MILE : +// case FUNIT_FOOT : +// case FUNIT_M : case FUNIT_MM : case FUNIT_CM : case FUNIT_TWIP : @@ -133,7 +133,7 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : break; default: - break; // -Wall multiple values not handled. + break; // -Wall multiple values not handled. } switch ( nMode ) @@ -176,7 +176,7 @@ IMPL_LINK( DlgExportPix, OK, void *, EMPTYARG ) { // Config-Parameter schreiben - sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) ); + sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) ); ::com::sun::star::awt::Size aSize( static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )), static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) ); @@ -287,7 +287,7 @@ IMPL_LINK( DlgExportPix, SelectLbColors, void*, EMPTYARG ) DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_VEC, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aBtnOK ( this, ResId( BTN_OK_VEC, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL_VEC, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP_VEC, *rPara.pResMgr ) ), @@ -299,15 +299,15 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : aFtSizeY ( this, ResId( FT_SIZEY_VEC, *rPara.pResMgr ) ), aMtfSizeY ( this, ResId( MTF_SIZEY_VEC, *rPara.pResMgr ) ), aGrpSize ( this, ResId( GRP_SIZE_VEC, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) + pMgr ( rPara.pResMgr ), + aExt ( rPara.aFilterExt ) { aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); aFilterConfigPath.Append( aExt ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - String aTitle( aExt ); + String aTitle( aExt ); FreeResource(); aBtnOK.SetClickHdl( LINK( this, DlgExportVec, OK ) ); @@ -332,12 +332,12 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : switch ( rPara.eFieldUnit ) { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : +// case FUNIT_NONE : +// case FUNIT_KM : +// case FUNIT_PERCENT : +// case FUNIT_CUSTOM : +// case FUNIT_MILE : +// case FUNIT_FOOT : case FUNIT_MM : case FUNIT_CM : case FUNIT_M : @@ -352,7 +352,7 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : } break; default: - break; // -Wall Multiple values not handled. + break; // -Wall Multiple values not handled. } switch ( nMode ) diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc index 69870c9b00b0..d25380b6dd18 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.hrc +++ b/svtools/source/filter.vcl/filter/dlgexpor.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx index 4c8b926335cd..13a518c97938 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.hxx +++ b/svtools/source/filter.vcl/filter/dlgexpor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,28 +50,28 @@ private: FltCallDialogParameter& rFltCallPara; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - ListBox aLbColors; - CheckBox aCbxRLE; - FixedLine aGrpColors; + ListBox aLbColors; + CheckBox aCbxRLE; + FixedLine aGrpColors; - RadioButton aRbOriginal; - RadioButton aRbRes; - RadioButton aRbSize; - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpMode; - ComboBox aCbbRes; + RadioButton aRbOriginal; + RadioButton aRbRes; + RadioButton aRbSize; + FixedText aFtSizeX; + MetricField aMtfSizeX; + FixedText aFtSizeY; + MetricField aMtfSizeY; + FixedLine aGrpMode; + ComboBox aCbbRes; - FilterConfigItem* pConfigItem; - ResMgr* pMgr; + FilterConfigItem* pConfigItem; + ResMgr* pMgr; - String aExt; + String aExt; DECL_LINK( OK, void* p ); DECL_LINK( ClickRbOriginal,void* p ); @@ -96,24 +96,24 @@ private: FltCallDialogParameter& rFltCallPara; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - RadioButton aRbOriginal; - RadioButton aRbSize; - FixedLine aGrpMode; + RadioButton aRbOriginal; + RadioButton aRbSize; + FixedLine aGrpMode; - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpSize; + FixedText aFtSizeX; + MetricField aMtfSizeX; + FixedText aFtSizeY; + MetricField aMtfSizeY; + FixedLine aGrpSize; - FilterConfigItem* pConfigItem; - ResMgr* pMgr; + FilterConfigItem* pConfigItem; + ResMgr* pMgr; - String aExt; + String aExt; DECL_LINK( OK, void* p ); DECL_LINK( ClickRbOriginal,void* p ); diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src index 7573b394d72f..1edef36ed5f7 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.src +++ b/svtools/source/filter.vcl/filter/dlgexpor.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,7 +198,7 @@ ModalDialog DLG_EXPORT_VEC RadioButton RB_SIZE_VEC { Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; + Size = MAP_APPFONT ( 98 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Size" ; }; diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 879bf684b5a6..e8ddf8828ea9 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,21 +76,21 @@ #include "SvFilterOptionsDialog.hxx" -#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF +#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF #if defined WIN || (defined OS2 && !defined ICC) -#define IMPORT_FUNCTION_NAME "_GraphicImport" -#define EXPORT_FUNCTION_NAME "_GraphicExport" -#define IMPDLG_FUNCTION_NAME "_DoImportDialog" -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" +#define IMPORT_FUNCTION_NAME "_GraphicImport" +#define EXPORT_FUNCTION_NAME "_GraphicExport" +#define IMPDLG_FUNCTION_NAME "_DoImportDialog" +#define EXPDLG_FUNCTION_NAME "_DoExportDialog" #else -#define IMPORT_FUNCTION_NAME "GraphicImport" -#define EXPORT_FUNCTION_NAME "GraphicExport" -#define IMPDLG_FUNCTION_NAME "DoImportDialog" -#define EXPDLG_FUNCTION_NAME "DoExportDialog" +#define IMPORT_FUNCTION_NAME "GraphicImport" +#define EXPORT_FUNCTION_NAME "GraphicExport" +#define IMPDLG_FUNCTION_NAME "DoImportDialog" +#define EXPDLG_FUNCTION_NAME "DoExportDialog" #endif @@ -106,11 +106,11 @@ using namespace ::rtl; using namespace ::com::sun::star; -static List* pFilterHdlList = NULL; +static List* pFilterHdlList = NULL; static ::osl::Mutex& getListMutex() { - static ::osl::Mutex s_aListProtection; + static ::osl::Mutex s_aListProtection; return s_aListProtection; } @@ -124,11 +124,11 @@ class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< ::com::sun::star:: { protected: - SvStream& mrStm; + SvStream& mrStm; - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); } - virtual void SAL_CALL flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw() {} + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); } + virtual void SAL_CALL flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); } + virtual void SAL_CALL closeOutput() throw() {} public: @@ -142,8 +142,8 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj ) try { - ::rtl::OUString aTitle; - ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ), + ::rtl::OUString aTitle; + ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); bExists = aCnt.isDocument(); @@ -158,7 +158,7 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj ) } catch( ... ) { -// DBG_ERRORFILE( "Any other exception" ); +// DBG_ERRORFILE( "Any other exception" ); } return bExists; } @@ -212,8 +212,8 @@ BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize ) inline String ImpGetExtension( const String &rPath ) { - String aExt; - INetURLObject aURL( rPath ); + String aExt; + INetURLObject aURL( rPath ); aExt = aURL.GetFileExtension().toAsciiUpperCase(); return aExt; } @@ -256,7 +256,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B USHORT i; BYTE sFirstBytes[ 256 ]; ULONG nFirstLong,nSecondLong; - ULONG nStreamPos = rStream.Tell(); + ULONG nStreamPos = rStream.Tell(); rStream.Seek( STREAM_SEEK_TO_END ); ULONG nStreamLen = rStream.Tell() - nStreamPos; @@ -552,7 +552,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B { bSomethingTested = TRUE; BYTE sBuf[4]; - sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes + sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 ) { rStream.Seek( nStreamPos + nOffset ); @@ -740,9 +740,9 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const String& rPath, SvStream& rS static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem ) { - Graphic aGraphic; - ByteString aResMgrName( "svt", 3 ); - ResMgr* pResMgr; + Graphic aGraphic; + ByteString aResMgrName( "svt", 3 ); + ResMgr* pResMgr; pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); @@ -753,9 +753,9 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, *pResMgr ) ), -1 ); - if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter - { // is called via UnoGraphicExporter and not from a graphic export Dialog - nMode = 0; // then we are defaulting this mode to 0 + if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter + { // is called via UnoGraphicExporter and not from a graphic export Dialog + nMode = 0; // then we are defaulting this mode to 0 if ( nLogicalWidth || nLogicalHeight ) nMode = 2; } @@ -778,11 +778,11 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r // Aufloesung wird eingestellt if( nMode == 1 ) { - Bitmap aBitmap( rGraphic.GetBitmap() ); - MapMode aMap( MAP_100TH_INCH ); + Bitmap aBitmap( rGraphic.GetBitmap() ); + MapMode aMap( MAP_100TH_INCH ); sal_Int32 nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, *pResMgr ) ), 75 ); - Fraction aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); + Fraction aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); aMap.SetScaleX( aFrac ); aMap.SetScaleY( aFrac ); @@ -817,7 +817,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { if( ( nMode == 1 ) || ( nMode == 2 ) ) { - GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() ); + GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() ); ::com::sun::star::awt::Size aDefaultSize( 10000, 10000 ); Size aNewSize( OutputDevice::LogicToLogic( Size( nLogicalWidth, nLogicalHeight ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) ); @@ -844,12 +844,12 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName ) { - ::rtl::OUString aPathURL; + ::rtl::OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); aPathURL += String( '/' ); - ::rtl::OUString aSystemPath; + ::rtl::OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); aSystemPath += ::rtl::OUString( rFilterName ); @@ -865,29 +865,29 @@ class ImpFilterLibCache; struct ImpFilterLibCacheEntry { - ImpFilterLibCacheEntry* mpNext; - osl::Module maLibrary; - String maFiltername; - PFilterCall mpfnImport; - PFilterDlgCall mpfnImportDlg; + ImpFilterLibCacheEntry* mpNext; + osl::Module maLibrary; + String maFiltername; + PFilterCall mpfnImport; + PFilterDlgCall mpfnImportDlg; ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ); - int operator==( const String& rFiltername ) const { return maFiltername == rFiltername; } + int operator==( const String& rFiltername ) const { return maFiltername == rFiltername; } - PFilterCall GetImportFunction(); - PFilterDlgCall GetImportDlgFunction(); - PFilterCall GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); } - PFilterDlgCall GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); } + PFilterCall GetImportFunction(); + PFilterDlgCall GetImportDlgFunction(); + PFilterCall GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); } + PFilterDlgCall GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); } }; // ------------------------------------------------------------------------ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ) : - mpNext ( NULL ), - maLibrary ( rPathname ), - maFiltername ( rFiltername ), - mpfnImport ( NULL ), - mpfnImportDlg ( NULL ) + mpNext ( NULL ), + maLibrary ( rPathname ), + maFiltername ( rFiltername ), + mpfnImport ( NULL ), + mpfnImportDlg ( NULL ) { } @@ -917,21 +917,21 @@ PFilterDlgCall ImpFilterLibCacheEntry::GetImportDlgFunction() class ImpFilterLibCache { - ImpFilterLibCacheEntry* mpFirst; - ImpFilterLibCacheEntry* mpLast; + ImpFilterLibCacheEntry* mpFirst; + ImpFilterLibCacheEntry* mpLast; public: ImpFilterLibCache(); ~ImpFilterLibCache(); - ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername ); + ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername ); }; // ------------------------------------------------------------------------ ImpFilterLibCache::ImpFilterLibCache() : - mpFirst ( NULL ), - mpLast ( NULL ) + mpFirst ( NULL ), + mpLast ( NULL ) { } @@ -939,7 +939,7 @@ ImpFilterLibCache::ImpFilterLibCache() : ImpFilterLibCache::~ImpFilterLibCache() { - ImpFilterLibCacheEntry* pEntry = mpFirst; + ImpFilterLibCacheEntry* pEntry = mpFirst; while( pEntry ) { ImpFilterLibCacheEntry* pNext = pEntry->mpNext; @@ -952,7 +952,7 @@ ImpFilterLibCache::~ImpFilterLibCache() ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, const String& rFilterName ) { - ImpFilterLibCacheEntry* pEntry = mpFirst; + ImpFilterLibCacheEntry* pEntry = mpFirst; while( pEntry ) { @@ -991,7 +991,7 @@ namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; } // ----------------- GraphicFilter::GraphicFilter( sal_Bool bConfig ) : - bUseConfig ( bConfig ), + bUseConfig ( bConfig ), nExpGraphHint ( 0 ) { ImplInit(); @@ -1231,11 +1231,11 @@ BOOL GraphicFilter::IsExportPixelFormat( USHORT nFormat ) USHORT GraphicFilter::CanImportGraphic( const INetURLObject& rPath, USHORT nFormat, USHORT* pDeterminedFormat ) { - sal_uInt16 nRetValue = GRFILTER_FORMATERROR; + sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::CanImportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); if ( pStream ) { nRetValue = CanImportGraphic( aMainUrl, *pStream, nFormat, pDeterminedFormat ); @@ -1268,8 +1268,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ImportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); if ( pStream ) { nRetValue = ImportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pDeterminedFormat, nImportFlags ); @@ -1290,18 +1290,18 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) { - String aFilterName; - ULONG nStmBegin; - USHORT nStatus; - GraphicReader* pContext = rGraphic.GetContext(); - GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; - BOOL bDummyContext = ( pContext == (GraphicReader*) 1 ); - const BOOL bLinkSet = rGraphic.IsLink(); + String aFilterName; + ULONG nStmBegin; + USHORT nStatus; + GraphicReader* pContext = rGraphic.GetContext(); + GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; + BOOL bDummyContext = ( pContext == (GraphicReader*) 1 ); + const BOOL bLinkSet = rGraphic.IsLink(); FilterConfigItem* pFilterConfigItem = NULL; - Size aPreviewSizeHint( 0, 0 ); - sal_Bool bAllowPartialStreamRead = sal_False; - sal_Bool bCreateNativeLink = sal_True; + Size aPreviewSizeHint( 0, 0 ); + sal_Bool bAllowPartialStreamRead = sal_False; + sal_Bool bCreateNativeLink = sal_True; ResetLastError(); @@ -1496,8 +1496,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS else if( aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGF ) || aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGV ) ) { - USHORT nVersion; - unsigned char nTyp = CheckSgfTyp( rIStream, nVersion ); + USHORT nVersion; + unsigned char nTyp = CheckSgfTyp( rIStream, nVersion ); switch( nTyp ) { @@ -1560,7 +1560,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS } else { - ImpFilterLibCacheEntry* pFilter = NULL; + ImpFilterLibCacheEntry* pFilter = NULL; // find first filter in filter pathes xub_StrLen i, nTokenCount = aFilterPath.GetTokenCount( ';' ); @@ -1609,11 +1609,11 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS if( nStatus == GRFILTER_OK && bCreateNativeLink && ( eLinkType != GFX_LINK_TYPE_NONE ) && !rGraphic.GetContext() && !bLinkSet ) { const ULONG nStmEnd = rIStream.Tell(); - const ULONG nBufSize = nStmEnd - nStmBegin; + const ULONG nBufSize = nStmEnd - nStmBegin; if( nBufSize ) { - BYTE* pBuf=0; + BYTE* pBuf=0; try { pBuf = new BYTE[ nBufSize ]; @@ -1653,12 +1653,12 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData ) { - sal_uInt16 nRetValue = GRFILTER_FORMATERROR; + sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - BOOL bAlreadyExists = ImplDirEntryHelper::Exists( rPath ); + BOOL bAlreadyExists = ImplDirEntryHelper::Exists( rPath ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC ); if ( pStream ) { nRetValue = ExportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pFilterData ); @@ -1701,10 +1701,10 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData ); String aFilterName( pConfig->GetExportFilterName( nFormat ) ); - bAbort = FALSE; - USHORT nStatus = GRFILTER_OK; - GraphicType eType; - Graphic aGraphic( rGraphic ); + bAbort = FALSE; + USHORT nStatus = GRFILTER_OK; + GraphicType eType; + Graphic aGraphic( rGraphic ); aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem ); eType = aGraphic.GetType(); @@ -1718,9 +1718,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat VirtualDevice aVirDev; // Maximalen Speicherbedarf fuer das Bildes holen: -// if( GetOptionsConfig() ) -// nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32(); -// else +// if( GetOptionsConfig() ) +// nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32(); +// else nMaxMem = 1024; nMaxMem *= 1024; // In Bytes @@ -1769,7 +1769,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat if( !aBmp.Convert( (BmpConversion) nColorRes ) ) aBmp = aGraphic.GetBitmap(); } - ResMgr* pResMgr = CREATERESMGR( svt ); + ResMgr* pResMgr = CREATERESMGR( svt ); sal_Bool bRleCoding = aConfigItem.ReadBool( String( ResId( KEY_RLE_CODING, *pResMgr ) ), sal_True ); // Wollen wir RLE-Kodiert speichern? aBmp.Write( rOStm, bRleCoding ); @@ -1783,7 +1783,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat sal_Int32 nVersion = aConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 0 ) ; if ( nVersion ) rOStm.SetVersion( nVersion ); - GDIMetaFile aMTF; + GDIMetaFile aMTF; if ( eType != GRAPHIC_BITMAP ) aMTF = aGraphic.GetGDIMetaFile(); @@ -1810,9 +1810,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat } else { - Bitmap aBmp( aGraphic.GetBitmap() ); - GDIMetaFile aMTF; - VirtualDevice aVirDev; + Bitmap aBmp( aGraphic.GetBitmap() ); + GDIMetaFile aMTF; + VirtualDevice aVirDev; aMTF.Record( &aVirDev ); aVirDev.DrawBitmap( Point(), aBmp ); @@ -1834,9 +1834,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat } else { - Bitmap aBmp( aGraphic.GetBitmap() ); - GDIMetaFile aMTF; - VirtualDevice aVirDev; + Bitmap aBmp( aGraphic.GetBitmap() ); + GDIMetaFile aMTF; + VirtualDevice aVirDev; aMTF.Record( &aVirDev ); aVirDev.DrawBitmap( Point(), aBmp ); @@ -1933,7 +1933,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat if( xActiveDataSource.is() ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf( static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) ); SvMemoryStream aMemStm( 65535, 65535 ); @@ -2002,7 +2002,7 @@ BOOL GraphicFilter::Setup( USHORT ) BOOL GraphicFilter::HasImportDialog( USHORT ) { return sal_True; -// return pConfig->IsImportDialog( nFormat ); +// return pConfig->IsImportDialog( nFormat ); } // ------------------------------------------------------------------------ @@ -2084,8 +2084,8 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( pData ) { - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; - ByteString aShortName; + USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; + ByteString aShortName; switch( pData->mnFormat ) { case( CVT_BMP ): aShortName = BMP_SHORTNAME; break; diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index 0220961b657a..985da72df106 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include "FilterConfigCache.hxx" #include <unotools/ucbstreamhelper.hxx> -#define DATA_SIZE 640 +#define DATA_SIZE 640 BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG ); @@ -51,7 +51,7 @@ BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG ); \************************************************************************/ GraphicDescriptor::GraphicDescriptor( const String* pPath ) : - pFileStm ( NULL ) + pFileStm ( NULL ) { ImpConstruct(); @@ -96,7 +96,7 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : \************************************************************************/ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) : - pFileStm ( NULL ) + pFileStm ( NULL ) { ImpConstruct(); @@ -150,32 +150,32 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo ) if ( bDataReady ) { - SvStream& rStm = GetSearchStream(); - UINT16 nOldFormat = rStm.GetNumberFormatInt(); - - if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE; + SvStream& rStm = GetSearchStream(); + UINT16 nOldFormat = rStm.GetNumberFormatInt(); + + if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE; // diese Formate lassen sich nur bei WideSearch im gesamten // Stream ermitteln @@ -262,8 +262,8 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const /******************************************************************************/ -/* IMP-Methoden */ -/* */ +/* IMP-Methoden */ +/* */ /************************************************************************* @@ -296,8 +296,8 @@ void GraphicDescriptor::ImpConstruct() BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) { - UINT16 nTemp16; - BOOL bRet = FALSE; + UINT16 nTemp16; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -319,8 +319,8 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT32 nTemp32; - UINT32 nCompression; + UINT32 nTemp32; + UINT32 nCompression; // bis zur ersten Information rStm.SeekRel( 0x10 ); @@ -378,10 +378,10 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 n32; - UINT16 n16; - BOOL bRet = FALSE; - BYTE cByte; + UINT32 n32; + UINT16 n16; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -426,10 +426,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 nTemp32; - BOOL bRet = FALSE; - BYTE cByte = 0; - BOOL bM_COM; + UINT32 nTemp32; + BOOL bRet = FALSE; + BYTE cByte = 0; + BOOL bM_COM; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm.Seek( nStmPos ); @@ -460,12 +460,12 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) if( bExtendedInfo ) { MapMode aMap; - UINT16 nTemp16; - ULONG nCount = 9; - ULONG nMax; - ULONG nResX; - ULONG nResY; - BYTE cUnit; + UINT16 nTemp16; + ULONG nCount = 9; + ULONG nMax; + ULONG nResX; + ULONG nResY; + BYTE cUnit; // Groesse des verbleibenden Puffers ermitteln if ( bLinked ) @@ -555,16 +555,16 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL ) { - BOOL bRet = FALSE; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); if ( bWideSearch ) { - UINT32 nTemp32; - UINT16 nTemp16; - BYTE cByte; + UINT32 nTemp32; + UINT16 nTemp16; + BYTE cByte; rStm.SeekRel( 2048 ); rStm >> nTemp32; @@ -606,8 +606,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) // We must detect the whole header. bExtendedInfo = TRUE; - BOOL bRet = FALSE; - BYTE cByte; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -620,13 +620,13 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT16 nTemp16; - USHORT nXmin; - USHORT nXmax; - USHORT nYmin; - USHORT nYmax; - USHORT nDPIx; - USHORT nDPIy; + UINT16 nTemp16; + USHORT nXmin; + USHORT nXmax; + USHORT nYmin; + USHORT nYmax; + USHORT nDPIx; + USHORT nDPIy; rStm.SeekRel( 1 ); @@ -661,7 +661,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) nDPIy = nTemp16; // logische Groesse setzen - MapMode aMap( MAP_INCH, Point(), + MapMode aMap( MAP_INCH, Point(), Fraction( 1, nDPIx ), Fraction( 1, nDPIy ) ); aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) ); @@ -688,8 +688,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 nTemp32; - BOOL bRet = FALSE; + UINT32 nTemp32; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm.Seek( nStmPos ); @@ -729,7 +729,7 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) if ( bWideSearch ) { - UINT32 nLen32; + UINT32 nLen32; rStm.SeekRel( 8 ); @@ -746,8 +746,8 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) if ( nTemp32 == 0x70485973 ) { - ULONG nXRes; - ULONG nYRes; + ULONG nXRes; + ULONG nYRes; // horizontale Aufloesung rStm >> nTemp32; @@ -788,10 +788,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) { - BOOL bDetectOk = FALSE; - BOOL bRet = FALSE; - BYTE cByte1; - BYTE cByte2; + BOOL bDetectOk = FALSE; + BOOL bRet = FALSE; + BYTE cByte1; + BYTE cByte2; rStm.Seek( nStmPos ); rStm >> cByte1; @@ -811,7 +811,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) if ( bDetectOk ) { - UINT16 nTemp16; + UINT16 nTemp16; rStm >> nTemp16; if ( nTemp16 == 0x2a ) @@ -821,10 +821,10 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - ULONG nCount; - ULONG nMax = DATA_SIZE - 48; - UINT32 nTemp32; - BOOL bOk = FALSE; + ULONG nCount; + ULONG nMax = DATA_SIZE - 48; + UINT32 nTemp32; + BOOL bOk = FALSE; // Offset des ersten IFD einlesen rStm >> nTemp32; @@ -966,7 +966,7 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) ) @@ -993,7 +993,7 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) ) @@ -1020,7 +1020,7 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) ) @@ -1079,7 +1079,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) { BOOL bRet = FALSE; - UINT32 nMagicNumber; + UINT32 nMagicNumber; rStm.Seek( nStmPos ); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nMagicNumber; @@ -1097,7 +1097,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) UINT32 nColumns; UINT16 nDepth; UINT16 nMode; - rStm.SeekRel( 6 ); // Pad + rStm.SeekRel( 6 ); // Pad rStm >> nChannels >> nRows >> nColumns >> nDepth >> nMode; if ( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) ) { @@ -1138,8 +1138,8 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL ) // es wird die EPS mit Vorschaubild Variante und die Extensionuebereinstimmung // geprueft - sal_uInt32 nFirstLong; - sal_uInt8 nFirstBytes[20]; + sal_uInt32 nFirstLong; + sal_uInt8 nFirstBytes[20]; rStm.Seek( nStmPos ); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); @@ -1276,9 +1276,9 @@ BOOL GraphicDescriptor::ImpDetectSGV( SvStream&, BOOL ) BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 n32; - BOOL bRet = FALSE; - BYTE cByte; + UINT32 n32; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -1294,8 +1294,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT32 nTemp32; - UINT16 nTemp16; + UINT32 nTemp32; + UINT16 nTemp16; rStm.SeekRel( 0x04 ); @@ -1386,34 +1386,34 @@ BOOL GraphicDescriptor::ImpDetectEMF( SvStream&, BOOL ) String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat ) { - ByteString aKeyName; + ByteString aKeyName; switch( nFormat ) { - case( GFF_BMP ) : aKeyName = "bmp"; break; - case( GFF_GIF ) : aKeyName = "gif"; break; - case( GFF_JPG ) : aKeyName = "jpg"; break; - case( GFF_PCD ) : aKeyName = "pcd"; break; - case( GFF_PCX ) : aKeyName = "pcx"; break; - case( GFF_PNG ) : aKeyName = "png"; break; - case( GFF_XBM ) : aKeyName = "xbm"; break; - case( GFF_XPM ) : aKeyName = "xpm"; break; - case( GFF_PBM ) : aKeyName = "pbm"; break; - case( GFF_PGM ) : aKeyName = "pgm"; break; - case( GFF_PPM ) : aKeyName = "ppm"; break; - case( GFF_RAS ) : aKeyName = "ras"; break; - case( GFF_TGA ) : aKeyName = "tga"; break; - case( GFF_PSD ) : aKeyName = "psd"; break; - case( GFF_EPS ) : aKeyName = "eps"; break; - case( GFF_TIF ) : aKeyName = "tif"; break; - case( GFF_DXF ) : aKeyName = "dxf"; break; - case( GFF_MET ) : aKeyName = "met"; break; - case( GFF_PCT ) : aKeyName = "pct"; break; - case( GFF_SGF ) : aKeyName = "sgf"; break; - case( GFF_SGV ) : aKeyName = "sgv"; break; - case( GFF_SVM ) : aKeyName = "svm"; break; - case( GFF_WMF ) : aKeyName = "wmf"; break; - case( GFF_EMF ) : aKeyName = "emf"; break; + case( GFF_BMP ) : aKeyName = "bmp"; break; + case( GFF_GIF ) : aKeyName = "gif"; break; + case( GFF_JPG ) : aKeyName = "jpg"; break; + case( GFF_PCD ) : aKeyName = "pcd"; break; + case( GFF_PCX ) : aKeyName = "pcx"; break; + case( GFF_PNG ) : aKeyName = "png"; break; + case( GFF_XBM ) : aKeyName = "xbm"; break; + case( GFF_XPM ) : aKeyName = "xpm"; break; + case( GFF_PBM ) : aKeyName = "pbm"; break; + case( GFF_PGM ) : aKeyName = "pgm"; break; + case( GFF_PPM ) : aKeyName = "ppm"; break; + case( GFF_RAS ) : aKeyName = "ras"; break; + case( GFF_TGA ) : aKeyName = "tga"; break; + case( GFF_PSD ) : aKeyName = "psd"; break; + case( GFF_EPS ) : aKeyName = "eps"; break; + case( GFF_TIF ) : aKeyName = "tif"; break; + case( GFF_DXF ) : aKeyName = "dxf"; break; + case( GFF_MET ) : aKeyName = "met"; break; + case( GFF_PCT ) : aKeyName = "pct"; break; + case( GFF_SGF ) : aKeyName = "sgf"; break; + case( GFF_SGV ) : aKeyName = "sgv"; break; + case( GFF_SVM ) : aKeyName = "svm"; break; + case( GFF_WMF ) : aKeyName = "wmf"; break; + case( GFF_EMF ) : aKeyName = "emf"; break; } return String( aKeyName, RTL_TEXTENCODING_ASCII_US ); diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx index a9559070a8b8..a744db615055 100644 --- a/svtools/source/filter.vcl/filter/fldll.cxx +++ b/svtools/source/filter.vcl/filter/fldll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx index d1afb0dd743c..fb90e5fe9049 100644 --- a/svtools/source/filter.vcl/filter/gradwrap.cxx +++ b/svtools/source/filter.vcl/filter/gradwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl, const Link& rDrawPolyPolyRecordHdl, const Link& rSetFillInBrushRecordHdl) : - aDrawPolyRecordHdl (rDrawPolyRecordHdl), - aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), + aDrawPolyRecordHdl (rDrawPolyRecordHdl), + aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl) { } @@ -266,7 +266,7 @@ void GradientWrapper::WriteLinearGradient(const Rectangle& rRect, void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, const Gradient& rGradient) { - USHORT nStepCount = 100; + USHORT nStepCount = 100; Rectangle aClipRect = rRect; Rectangle aRect = rRect; long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; @@ -412,9 +412,9 @@ void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, void GradientWrapper::WriteRectGradient(const Rectangle& rRect, const Gradient& rGradient) { - USHORT nStepCount = 100; + USHORT nStepCount = 100; Rectangle aClipRect = rRect; - Rectangle aRect = rRect; + Rectangle aRect = rRect; aRect.Left()--; aRect.Top()--; diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx index f07c8a7dbf0c..a4166bb0686a 100644 --- a/svtools/source/filter.vcl/filter/sgfbram.cxx +++ b/svtools/source/filter.vcl/filter/sgfbram.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index 5c72dc6ba04f..3269624918d9 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -809,12 +809,12 @@ void CircType::Draw(OutputDevice& rOut) void BmapType::Draw(OutputDevice& rOut) { //ifstream aInp; - unsigned char nSgfTyp; - USHORT nVersion; - String aStr( + unsigned char nSgfTyp; + USHORT nVersion; + String aStr( reinterpret_cast< char const * >(&Filename[ 1 ]), (xub_StrLen)Filename[ 0 ], RTL_TEXTENCODING_UTF8 ); - INetURLObject aFNam( aStr ); + INetURLObject aFNam( aStr ); SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if ( pInp ) @@ -1065,7 +1065,7 @@ BOOL SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath ) BOOL bRet=FALSE; // Returncode aIniPath.Append( String::CreateFromAscii( "sgf.ini", 7 ) ); -// aIniPath.ToAbs(); +// aIniPath.ToAbs(); pSgfFonts = new SgfFontLst; diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx index 8bd09a4680dc..860fdb4dfe76 100644 --- a/svtools/source/filter.vcl/filter/sgvspln.cxx +++ b/svtools/source/filter.vcl/filter/sgvspln.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 1655c53a5393..cbb4e5684865 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc index 0eea67fb2338..b4029f513830 100644 --- a/svtools/source/filter.vcl/filter/strings.hrc +++ b/svtools/source/filter.vcl/filter/strings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src index 60e628ee0b5c..060570430021 100644 --- a/svtools/source/filter.vcl/filter/strings.src +++ b/svtools/source/filter.vcl/filter/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |