diff options
Diffstat (limited to 'sdext/source/minimizer')
28 files changed, 614 insertions, 614 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 7e89eecbcd36..83187bc5b15e 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.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 @@ -70,21 +70,21 @@ void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAcc Any aValue( rSettings->getByName( aPropertyName ) ); switch( TKGet( aPropertyName ) ) { - case TK_Name : aValue >>= maName; break; - case TK_JPEGCompression : aValue >>= mbJPEGCompression; break; - case TK_JPEGQuality : aValue >>= mnJPEGQuality; break; - case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break; - case TK_ImageResolution : aValue >>= mnImageResolution; break; - case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break; - case TK_OLEOptimization : aValue >>= mbOLEOptimization; break; - case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break; - case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break; - case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break; - case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break; - case TK_SaveAs : aValue >>= mbSaveAs; break; -// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration -// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration - case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break; + case TK_Name : aValue >>= maName; break; + case TK_JPEGCompression : aValue >>= mbJPEGCompression; break; + case TK_JPEGQuality : aValue >>= mnJPEGQuality; break; + case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break; + case TK_ImageResolution : aValue >>= mnImageResolution; break; + case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break; + case TK_OLEOptimization : aValue >>= mbOLEOptimization; break; + case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break; + case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break; + case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break; + case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break; + case TK_SaveAs : aValue >>= mbSaveAs; break; +// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration +// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration + case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break; default: break; } } @@ -112,11 +112,11 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla TKGet( TK_DeleteHiddenSlides ), TKGet( TK_DeleteNotesPages ), TKGet( TK_SaveAs ), -// TKGet( TK_SaveAsURL ), -// TKGet( TK_FilterName ), - TKGet( TK_OpenNewDocument ) }; +// TKGet( TK_SaveAsURL ), +// TKGet( TK_FilterName ), + TKGet( TK_OpenNewDocument ) }; - Any pValues[] = { + Any pValues[] = { Any( maName ), Any( mbJPEGCompression ), Any( mnJPEGQuality ), @@ -129,8 +129,8 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla Any( mbDeleteHiddenSlides ), Any( mbDeleteNotesPages ), Any( mbSaveAs ), -// Any( maSaveAsURL ), -// Any( maFilterName ), +// Any( maSaveAsURL ), +// Any( maFilterName ), Any( mbOpenNewDocument ) }; sal_Int32 i, nCount = sizeof( pNames ) / sizeof( OUString ); @@ -160,7 +160,7 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti && ( rOptimizerSettings.mbDeleteUnusedMasterPages == mbDeleteUnusedMasterPages ) && ( rOptimizerSettings.mbDeleteHiddenSlides == mbDeleteHiddenSlides ) && ( rOptimizerSettings.mbDeleteNotesPages == mbDeleteNotesPages ); -// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument ); +// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument ); } @@ -234,7 +234,7 @@ void ConfigurationAccess::LoadStrings() } catch( Exception& ) { - } + } } } } @@ -344,8 +344,8 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly ) { Sequence< Any > aCreationArguments( 2 ); aCreationArguments[0] = makeAny( PropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0, - makeAny( GetPathToConfigurationRoot() ), + OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0, + makeAny( GetPathToConfigurationRoot() ), PropertyState_DIRECT_VALUE ) ); aCreationArguments[1] = makeAny(beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ), @@ -369,7 +369,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly ) } Reference< XInterface > ConfigurationAccess::GetConfigurationNode( - const Reference< XInterface >& xRoot, + const Reference< XInterface >& xRoot, const OUString& sPathToNode ) { Reference< XInterface > xNode; @@ -405,22 +405,22 @@ com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimi { switch( ePropertyToken ) { - case TK_Name : aRetValue <<= rSettings.maName; break; - case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break; - case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break; - case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break; - case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break; - case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break; - case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break; - case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break; - case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break; - case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break; - case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break; - case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break; - case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break; - case TK_FilterName : aRetValue <<= rSettings.maFilterName; break; - case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break; - case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break; + case TK_Name : aRetValue <<= rSettings.maName; break; + case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break; + case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break; + case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break; + case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break; + case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break; + case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break; + case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break; + case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break; + case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break; + case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break; + case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break; + case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break; + case TK_FilterName : aRetValue <<= rSettings.maFilterName; break; + case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break; + case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break; default: break; } @@ -438,23 +438,23 @@ void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum eProper { switch( ePropertyToken ) { - case TK_Name : rValue >>= rSettings.maName; break; - case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break; - case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break; - case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break; - case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break; - case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break; - case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break; - case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break; - case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break; - case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break; - case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break; - case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break; - case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break; - case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break; - case TK_FilterName : rValue >>= rSettings.maFilterName; break; - case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break; - case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break; + case TK_Name : rValue >>= rSettings.maName; break; + case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break; + case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break; + case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break; + case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break; + case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break; + case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break; + case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break; + case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break; + case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break; + case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break; + case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break; + case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break; + case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break; + case TK_FilterName : rValue >>= rSettings.maFilterName; break; + case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break; + case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break; default: break; } diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 436ae90fe071..2ccc8ece8428 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.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 @@ -47,24 +47,24 @@ struct OptimizerSettings { - rtl::OUString maName; - sal_Bool mbJPEGCompression; - sal_Int32 mnJPEGQuality; - sal_Bool mbRemoveCropArea; - sal_Int32 mnImageResolution; - sal_Bool mbEmbedLinkedGraphics; - sal_Bool mbOLEOptimization; - sal_Int16 mnOLEOptimizationType; - sal_Bool mbDeleteUnusedMasterPages; - sal_Bool mbDeleteHiddenSlides; - sal_Bool mbDeleteNotesPages; - rtl::OUString maCustomShowName; - sal_Bool mbSaveAs; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; - sal_Bool mbOpenNewDocument; - sal_Int64 mnEstimatedFileSize; - + rtl::OUString maName; + sal_Bool mbJPEGCompression; + sal_Int32 mnJPEGQuality; + sal_Bool mbRemoveCropArea; + sal_Int32 mnImageResolution; + sal_Bool mbEmbedLinkedGraphics; + sal_Bool mbOLEOptimization; + sal_Int16 mnOLEOptimizationType; + sal_Bool mbDeleteUnusedMasterPages; + sal_Bool mbDeleteHiddenSlides; + sal_Bool mbDeleteNotesPages; + rtl::OUString maCustomShowName; + sal_Bool mbSaveAs; + rtl::OUString maSaveAsURL; + rtl::OUString maFilterName; + sal_Bool mbOpenNewDocument; + sal_Int64 mnEstimatedFileSize; + OptimizerSettings() : mbJPEGCompression( sal_False ), mnJPEGQuality( 90 ), @@ -80,13 +80,13 @@ struct OptimizerSettings mbOpenNewDocument( sal_True ), mnEstimatedFileSize( 0 ){}; ~OptimizerSettings(){}; - + void LoadSettingsFromConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rSettings ); void SaveSettingsToConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameReplace >& rSettings ); sal_Bool operator==( const OptimizerSettings& rOptimizerSettings ) const; -}; +}; class ConfigurationAccess { public : @@ -108,7 +108,7 @@ class ConfigurationAccess sal_Int32 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int32 nDefault ) const; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetConfigurationSequence(); - + // getting access to the OptimizerSettings list std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; }; std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const rtl::OUString& rName ); @@ -136,6 +136,6 @@ class ConfigurationAccess const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const rtl::OUString& sPathToNode ); }; -#endif // _CONFIGURATION_ACCESS_HXX_ +#endif // _CONFIGURATION_ACCESS_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 6091e34cf614..ef5cd430ca36 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.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 @@ -71,7 +71,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) : mxMSF( rxMSF ) { Sequence< Any > aInitPropSeq( 1 ); - aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION; // TemplateDescription.FILEOPEN_SIMPLE + aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION; // TemplateDescription.FILEOPEN_SIMPLE mxFilePicker = Reference < XFilePicker >( mxMSF->getServiceManager()->createInstanceWithArgumentsAndContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aInitPropSeq, rxMSF ),UNO_QUERY_THROW ); @@ -117,10 +117,10 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) : j = aFilterProperties.getLength(); } break; - case TK_Name : rProperty.Value >>= aFilterEntry.maName; break; - case TK_UIName : rProperty.Value >>= aFilterEntry.maUIName; break; - case TK_Type : rProperty.Value >>= aFilterEntry.maType; break; - case TK_Flags : rProperty.Value >>= aFilterEntry.maFlags; break; + case TK_Name : rProperty.Value >>= aFilterEntry.maName; break; + case TK_UIName : rProperty.Value >>= aFilterEntry.maUIName; break; + case TK_Type : rProperty.Value >>= aFilterEntry.maType; break; + case TK_Flags : rProperty.Value >>= aFilterEntry.maFlags; break; default : break; } } @@ -139,7 +139,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) : OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxMSF ), UNO_QUERY_THROW ); Sequence< OUString > aTypeList( xFilters->getElementNames() ); -// mxFilePicker->setDefaultName( ); +// mxFilePicker->setDefaultName( ); Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW ); std::vector< FilterEntry >::iterator aIter( aFilterEntryList.begin() ); @@ -184,12 +184,12 @@ void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName ) { mxFilePicker->setDefaultName( rDefaultName ); } -::rtl::OUString FileOpenDialog::getURL() const +::rtl::OUString FileOpenDialog::getURL() const { Sequence< OUString > aFileSeq( mxFilePicker->getFiles() ); return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString(); }; -::rtl::OUString FileOpenDialog::getFilterName() const +::rtl::OUString FileOpenDialog::getFilterName() const { rtl::OUString aFilterName; Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 8ddbba752113..6cb2d615f145 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.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 @@ -63,12 +63,12 @@ public : sal_Int16 execute(); void setDefaultName( const rtl::OUString& ); -// void setDefaultDirectory( const rtl::OUString& ); +// void setDefaultDirectory( const rtl::OUString& ); - ::rtl::OUString getURL() const; + ::rtl::OUString getURL() const; ::rtl::OUString getFilterName() const; }; -#endif // _FILEOPEN_DIALOG_HXX_ +#endif // _FILEOPEN_DIALOG_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index d4258e66953c..66b33b690a03 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.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 @@ -218,7 +218,7 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, c Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW ); xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width; xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height; - + Reference< XPropertySet > xBackgroundPropSet; if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet ) ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet ); @@ -267,7 +267,7 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Size100thMM ) ) >>= aSize100thMM ) { if ( !aSize100thMM.Width && !aSize100thMM.Height ) - { // MAPMODE_PIXEL USED :-( + { // MAPMODE_PIXEL USED :-( awt::Size aSourceSizePixel( 0, 0 ); if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel ) { @@ -404,7 +404,7 @@ void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxMSF * Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW ); xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width; xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height; - + Reference< XPropertySet > xBackgroundPropSet; if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet ) { diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index f67e06058cfa..392a632ba334 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.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 @@ -42,11 +42,11 @@ struct GraphicSettings { - sal_Bool mbJPEGCompression; - sal_Int32 mnJPEGQuality; - sal_Bool mbRemoveCropArea; - sal_Int32 mnImageResolution; - sal_Bool mbEmbedLinkedGraphics; + sal_Bool mbJPEGCompression; + sal_Int32 mnJPEGQuality; + sal_Bool mbRemoveCropArea; + sal_Int32 mnImageResolution; + sal_Bool mbEmbedLinkedGraphics; GraphicSettings( sal_Bool bJPEGCompression, sal_Int32 nJPEGQuality, sal_Bool bRemoveCropArea, sal_Int32 nImageResolution, sal_Bool bEmbedLinkedGraphics ) @@ -63,25 +63,25 @@ class GraphicCollector struct GraphicUser { - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet; - rtl::OUString maGraphicURL; - rtl::OUString maGraphicStreamURL; - com::sun::star::text::GraphicCrop maGraphicCropLogic; - com::sun::star::awt::Size maLogicalSize; - sal_Bool mbFillBitmap; + com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet; + rtl::OUString maGraphicURL; + rtl::OUString maGraphicStreamURL; + com::sun::star::text::GraphicCrop maGraphicCropLogic; + com::sun::star::awt::Size maLogicalSize; + sal_Bool mbFillBitmap; GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( sal_False ) {}; }; struct GraphicEntity { - com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > mxGraphic; // the corresponding XGraphic of the Shape - com::sun::star::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed - sal_Bool mbRemoveCropArea; // - com::sun::star::text::GraphicCrop maGraphicCropLogic; - std::vector< GraphicUser > maUser; + com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > mxGraphic; // the corresponding XGraphic of the Shape + com::sun::star::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed + sal_Bool mbRemoveCropArea; // + com::sun::star::text::GraphicCrop maGraphicCropLogic; + std::vector< GraphicUser > maUser; GraphicEntity( const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& xGraphic, const GraphicUser& rUser ) : mxGraphic( xGraphic ), maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( sal_False ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); }; diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index d2e00fb94f26..9d4e49e5f951 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.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 @@ -236,13 +236,13 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const Sequence< PropertyValue > aFilterData( 8 ); aFilterData[ 0 ].Name = TKGet( TK_ImageResolution ); aFilterData[ 0 ].Value <<= nImageResolution; - aFilterData[ 1 ].Name = TKGet( TK_ColorMode ); // todo: jpeg color mode (0->true color, 1->greyscale) + aFilterData[ 1 ].Name = TKGet( TK_ColorMode ); // todo: jpeg color mode (0->true color, 1->greyscale) aFilterData[ 1 ].Value <<= (sal_Int32)0; - aFilterData[ 2 ].Name = TKGet( TK_Quality ); // quality that is used if we export to jpeg + aFilterData[ 2 ].Name = TKGet( TK_Quality ); // quality that is used if we export to jpeg aFilterData[ 2 ].Value <<= nJPEGQuality; - aFilterData[ 3 ].Name = TKGet( TK_Compression ); // compression that is used if we export to png + aFilterData[ 3 ].Name = TKGet( TK_Compression ); // compression that is used if we export to png aFilterData[ 3 ].Value <<= (sal_Int32)6; - aFilterData[ 4 ].Name = TKGet( TK_Interlaced ); // interlaced is turned off if we export to png + aFilterData[ 4 ].Name = TKGet( TK_Interlaced ); // interlaced is turned off if we export to png aFilterData[ 4 ].Value <<= (sal_Int32)0; aFilterData[ 5 ].Name = TKGet( TK_LogicalSize ); aFilterData[ 5 ].Value <<= rLogicalSize; @@ -250,9 +250,9 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const aFilterData[ 6 ].Value <<= bRemoveCropping; aFilterData[ 7 ].Name = TKGet( TK_GraphicCropLogic ); aFilterData[ 7 ].Value <<= rGraphicCropLogic; - + Sequence< PropertyValue > aArgs( 3 ); - aArgs[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"... + aArgs[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"... aArgs[ 0 ].Value <<= rDestMimeType; aArgs[ 1 ].Name = TKGet( TK_OutputStream ); aArgs[ 1 ].Value <<= rxOutputStream; @@ -282,8 +282,8 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL ) { sal_Bool bTransparent = sal_False; - sal_Bool bAlpha = sal_False; - sal_Bool bAnimated = sal_False; + sal_Bool bAlpha = sal_False; + sal_Bool bAnimated = sal_False; awt::Size aSourceSizePixel( 0, 0 ); text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 ); @@ -295,7 +295,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& { awt::Size aDestSizePixel( aSourceSizePixel ); if ( !bAnimated ) - { + { sal_Bool bNeedsOptimizing = sal_False; sal_Bool bRemoveCropArea( rGraphicSettings.mbRemoveCropArea ); @@ -329,7 +329,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& if ( rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha && !bAnimated ) { aDestMimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "image/jpeg" ) ); -// if( aSourceMimeType != aDestMimeType ) +// if( aSourceMimeType != aDestMimeType ) bNeedsOptimizing = sal_True; } if ( bRemoveCropArea ) @@ -427,7 +427,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont if ( aGraphicUserIter->maGraphicCropLogic.Left || aGraphicUserIter->maGraphicCropLogic.Top || aGraphicUserIter->maGraphicCropLogic.Right || aGraphicUserIter->maGraphicCropLogic.Bottom ) - { // removing crop area was not possible or should't been applied + { // removing crop area was not possible or should't been applied text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 ); if ( !aGraphicSettings.mbRemoveCropArea ) { @@ -481,19 +481,19 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont // ---------------- ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel ) : - mxMSF ( rxMSF ), - mxModel ( rxModel ), - mbJPEGCompression ( sal_False ), - mnJPEGQuality ( 90 ), - mbRemoveCropArea ( sal_False ), - mnImageResolution ( 0 ), - mbEmbedLinkedGraphics ( sal_True ), - mbOLEOptimization ( sal_False ), - mnOLEOptimizationType ( 0 ), - mbDeleteUnusedMasterPages ( sal_False ), - mbDeleteHiddenSlides ( sal_False ), - mbDeleteNotesPages ( sal_False ), - mbOpenNewDocument ( sal_True ) + mxMSF ( rxMSF ), + mxModel ( rxModel ), + mbJPEGCompression ( sal_False ), + mnJPEGQuality ( 90 ), + mbRemoveCropArea ( sal_False ), + mnImageResolution ( 0 ), + mbEmbedLinkedGraphics ( sal_True ), + mbOLEOptimization ( sal_False ), + mnOLEOptimizationType ( 0 ), + mbDeleteUnusedMasterPages ( sal_False ), + mbDeleteHiddenSlides ( sal_False ), + mbDeleteNotesPages ( sal_False ), + mbOpenNewDocument ( sal_True ) { } @@ -619,21 +619,21 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) { switch( TKGet( aSettings[ j ].Name ) ) { - case TK_JPEGCompression : aSettings[ j ].Value >>= mbJPEGCompression; break; - case TK_JPEGQuality : aSettings[ j ].Value >>= mnJPEGQuality; break; - case TK_RemoveCropArea : aSettings[ j ].Value >>= mbRemoveCropArea; break; - case TK_ImageResolution : aSettings[ j ].Value >>= mnImageResolution; break; - case TK_EmbedLinkedGraphics : aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break; - case TK_OLEOptimization : aSettings[ j ].Value >>= mbOLEOptimization; break; - case TK_OLEOptimizationType : aSettings[ j ].Value >>= mnOLEOptimizationType; break; - case TK_CustomShowName : aSettings[ j ].Value >>= maCustomShowName; break; + case TK_JPEGCompression : aSettings[ j ].Value >>= mbJPEGCompression; break; + case TK_JPEGQuality : aSettings[ j ].Value >>= mnJPEGQuality; break; + case TK_RemoveCropArea : aSettings[ j ].Value >>= mbRemoveCropArea; break; + case TK_ImageResolution : aSettings[ j ].Value >>= mnImageResolution; break; + case TK_EmbedLinkedGraphics : aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break; + case TK_OLEOptimization : aSettings[ j ].Value >>= mbOLEOptimization; break; + case TK_OLEOptimizationType : aSettings[ j ].Value >>= mnOLEOptimizationType; break; + case TK_CustomShowName : aSettings[ j ].Value >>= maCustomShowName; break; case TK_DeleteUnusedMasterPages : aSettings[ j ].Value >>= mbDeleteUnusedMasterPages; break; - case TK_DeleteHiddenSlides : aSettings[ j ].Value >>= mbDeleteHiddenSlides; break; - case TK_DeleteNotesPages : aSettings[ j ].Value >>= mbDeleteNotesPages; break; - case TK_SaveAsURL : aSettings[ j ].Value >>= maSaveAsURL; break; - case TK_FilterName : aSettings[ j ].Value >>= maFilterName; break; - case TK_OpenNewDocument : aSettings[ j ].Value >>= mbOpenNewDocument; break; - case TK_EstimatedFileSize : aSettings[ j ].Value >>= nEstimatedFileSize; break; + case TK_DeleteHiddenSlides : aSettings[ j ].Value >>= mbDeleteHiddenSlides; break; + case TK_DeleteNotesPages : aSettings[ j ].Value >>= mbDeleteNotesPages; break; + case TK_SaveAsURL : aSettings[ j ].Value >>= maSaveAsURL; break; + case TK_FilterName : aSettings[ j ].Value >>= maFilterName; break; + case TK_OpenNewDocument : aSettings[ j ].Value >>= mbOpenNewDocument; break; + case TK_EstimatedFileSize : aSettings[ j ].Value >>= nEstimatedFileSize; break; default: break; } } @@ -649,7 +649,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) Reference< XFrame > xSelf; if ( maSaveAsURL.getLength() ) { - + SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) ); SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) ); DispatchStatus(); @@ -697,7 +697,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) mxModel->lockControllers(); bRet = Optimize(); mxModel->unlockControllers(); - + // clearing undo stack: Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog ); if ( xFrame.is() ) @@ -723,7 +723,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) ); DispatchStatus(); } - + if ( maSaveAsURL.getLength() ) { if ( mbOpenNewDocument && xSelf.is() ) diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index ac3b4e8c36e4..9112cbd1bd61 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.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,27 +50,27 @@ class ImpOptimizer : public OptimizationStats { private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; - com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; + com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel; + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; - sal_Bool mbJPEGCompression; - sal_Int32 mnJPEGQuality; - sal_Bool mbRemoveCropArea; - sal_Int32 mnImageResolution; - sal_Bool mbEmbedLinkedGraphics; - sal_Bool mbOLEOptimization; - sal_Int32 mnOLEOptimizationType; - rtl::OUString maCustomShowName; - sal_Bool mbDeleteUnusedMasterPages; - sal_Bool mbDeleteHiddenSlides; - sal_Bool mbDeleteNotesPages; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; - sal_Bool mbOpenNewDocument; + sal_Bool mbJPEGCompression; + sal_Int32 mnJPEGQuality; + sal_Bool mbRemoveCropArea; + sal_Int32 mnImageResolution; + sal_Bool mbEmbedLinkedGraphics; + sal_Bool mbOLEOptimization; + sal_Int32 mnOLEOptimizationType; + rtl::OUString maCustomShowName; + sal_Bool mbDeleteUnusedMasterPages; + sal_Bool mbDeleteHiddenSlides; + sal_Bool mbDeleteNotesPages; + rtl::OUString maSaveAsURL; + rtl::OUString maFilterName; + sal_Bool mbOpenNewDocument; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog; - + sal_Bool Optimize(); public: @@ -80,7 +80,7 @@ public: ~ImpOptimizer(); sal_Bool Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments ); - void DispatchStatus(); + void DispatchStatus(); }; #endif diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 17f900ccc6b6..de6bd58aeb04 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.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 @@ -38,10 +38,10 @@ #include "com/sun/star/util/URL.hpp" #include "com/sun/star/util/XURLTransformer.hpp" -#define DIALOG_WIDTH 240 -#define DIALOG_HEIGHT 80 -#define PAGE_POS_X 35 -#define PAGE_WIDTH ( DIALOG_WIDTH - PAGE_POS_X ) - 6 +#define DIALOG_WIDTH 240 +#define DIALOG_HEIGHT 80 +#define PAGE_POS_X 35 +#define PAGE_WIDTH ( DIALOG_WIDTH - PAGE_POS_X ) - 6 // --------------------- @@ -78,7 +78,7 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl: TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( nHeight ), Any( rLabel ), Any( bMultiLine ), @@ -90,8 +90,8 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl: sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertFixedText( rControlName, aNames, aValues ); return rControlName; @@ -109,7 +109,7 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString TKGet( TK_ScaleImage ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_Int16( 0 ) ), Any( nHeight ), Any( rURL ), @@ -119,8 +119,8 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString Any( nWidth ) }; sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertImage( rControlName, aNames, aValues ); return rControlName; @@ -140,7 +140,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( nHeight ), Any( rLabel ), @@ -152,8 +152,8 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rInformationDialog.insertCheckBox( rControlName, aNames, aValues ) ); if ( xItemListener.is() ) @@ -175,7 +175,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( nHeight ), Any( rInformationDialog.getString( nResID ) ), @@ -189,8 +189,8 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertButton( rControlName, xActionListener, aNames, aValues ); return rControlName; @@ -229,7 +229,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) { OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) ); Sequence< PropertyValue > aArgs2( 2 ); - aArgs2[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"... + aArgs2[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"... aArgs2[ 0 ].Value <<= aDestMimeType; aArgs2[ 1 ].Name = TKGet( TK_OutputStream ); aArgs2[ 1 ].Value <<= xOutputStream; @@ -260,7 +260,7 @@ void InformationDialog::InitDialog() TKGet( TK_Title ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( nDialogHeight ), Any( sal_True ), @@ -268,13 +268,13 @@ void InformationDialog::InitDialog() Any( sal_Int32( 115 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), Any( sal_Int32( DIALOG_WIDTH ) ) }; - + sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); - mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); + mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); sal_Int64 nSource = mnSourceSize; sal_Int64 nDest = mnDestSize; @@ -335,7 +335,7 @@ void InformationDialog::InitDialog() if ( k >= 0 ) aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); - com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; + com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 ); InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); if ( maSaveAsURL.getLength() ) @@ -363,7 +363,7 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMS Reference< XFrame > xFrame( mxController->getFrame() ); Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() ); Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW ); - createWindowPeer( xWindowPeer ); + createWindowPeer( xWindowPeer ); InitDialog(); } diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 44d2d4c035be..0b38f57eb177 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.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 @@ -60,19 +60,19 @@ public : sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest ); ~InformationDialog(); - sal_Bool execute(); + sal_Bool execute(); private : com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF; - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame; - com::sun::star::uno::Reference< com::sun::star::io::XStream > mxTempFile; + com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame; + com::sun::star::uno::Reference< com::sun::star::io::XStream > mxTempFile; - com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; + com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL ); void InitDialog(); - + sal_Int64 mnSourceSize; sal_Int64 mnDestSize; sal_Int64 mnApproxSize; @@ -93,7 +93,7 @@ public: virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + InformationDialog& mrInformationDialog; }; diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 8f6eaeeb7f1c..a1e22ea08548 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.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/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx index 3359b5888627..5a45de99f62e 100644 --- a/sdext/source/minimizer/optimizationstats.hxx +++ b/sdext/source/minimizer/optimizationstats.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 diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 17fd2b1cdde5..32bac3134ef5 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.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 @@ -71,7 +71,7 @@ void OptimizerDialog::InitDialog() TKGet( TK_Title ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( sal_Int32( DIALOG_HEIGHT ) ), Any( sal_True ), @@ -79,13 +79,13 @@ void OptimizerDialog::InitDialog() Any( sal_Int32( 52 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), Any( sal_Int32( OD_DIALOG_WIDTH ) ) }; - + sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); - mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); + mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); } // ----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ void OptimizerDialog::InitRoadmap() TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_Int32( DIALOG_HEIGHT - 26 ) ), Any( sal_Int32( 0 ) ), Any( sal_Int32( 0 ) ), @@ -112,11 +112,11 @@ void OptimizerDialog::InitRoadmap() sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); mxRoadmapControlModel = insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ), - TKGet( TK_rdmNavi ), aNames, aValues ); + TKGet( TK_rdmNavi ), aNames, aValues ); Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW ); xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet( TK_rdmNavi ) ) ); @@ -168,13 +168,13 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool void OptimizerDialog::UpdateConfiguration() { - sal_Int16 nInt16 = 0; - OUString aString; - Any aAny; + sal_Int16 nInt16 = 0; + OUString aString; + Any aAny; Sequence< sal_Int16 > aSelectedItems; Sequence< OUString > aStringItemList; - + // page0 aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) ); if ( aAny >>= aSelectedItems ) @@ -266,7 +266,7 @@ sal_Bool OptimizerDialog::execute() Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW ); maRoadmapBroadcaster->addItemListener( mxItemListener ); UnoDialog::execute(); - UpdateConfiguration(); // taking actual control settings for the configuration + UpdateConfiguration(); // taking actual control settings for the configuration maRoadmapBroadcaster->removeItemListener( mxItemListener ); return mbStatus; } @@ -282,14 +282,14 @@ void OptimizerDialog::SwitchPage( sal_Int16 nNewStep ) disableControl( TKGet( TK_btnNavBack ) ); else if ( nOldStep == 0 ) enableControl( TKGet( TK_btnNavBack ) ); - + if ( nNewStep == MAX_STEP ) disableControl( TKGet( TK_btnNavNext ) ); else if ( nOldStep == MAX_STEP ) enableControl( TKGet( TK_btnNavNext ) ); setControlProperty( TKGet( TK_rdmNavi ), TKGet( TK_CurrentItemID ), Any( nNewStep ) ); - + DeactivatePage( nOldStep ); UpdateControlStates( nNewStep ); @@ -547,7 +547,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) Reference< XLayoutManager > xLayoutManager; if ( xPropSet->getPropertyValue( OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager ) { - xLayoutManager->setVisible( sal_False ); + xLayoutManager->setVisible( sal_False ); xLayoutManager->hideElement( OUString::createFromAscii( "private:resource/menubar/menubar" ) ); xLayoutManager->destroyElement( OUString::createFromAscii( "private:resource/statusbar/statusbar" ) ); } @@ -559,8 +559,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } } break; - case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break; - case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break; + case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break; + case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break; case TK_btnNavFinish : { mrOptimizerDialog.UpdateConfiguration(); @@ -574,9 +574,9 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText0Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) ); - // check if we have to open the FileDialog - sal_Bool bSuccessfullyExecuted = sal_True; - sal_Int16 nInt16 = 0; + // check if we have to open the FileDialog + sal_Bool bSuccessfullyExecuted = sal_True; + sal_Int16 nInt16 = 0; mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16; if ( nInt16 ) { @@ -629,7 +629,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } } if ( bSuccessfullyExecuted ) - { // now check if we have to store a session template + { // now check if we have to store a session template nInt16 = 0; OUString aSettingsName; mrOptimizerDialog.getControlProperty( TKGet( TK_CheckBox1Pg4 ), TKGet( TK_State ) ) >>= nInt16; @@ -682,8 +682,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } } break; - case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break; - case TK_Button0Pg0 : // delete configuration + case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break; + case TK_Button0Pg0 : // delete configuration { OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( TK_ListBox0Pg0 ) ); if ( aSelectedItem.getLength() ) @@ -781,7 +781,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) fDouble += 9; if ( fDouble > 100 ) fDouble = 100; - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } } @@ -795,20 +795,20 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) fDouble -= 9; if ( fDouble < 0 ) fDouble = 0; - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } } void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) ); } void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) ); } void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc index bc3fd49a277f..9bf81f9d612a 100644 --- a/sdext/source/minimizer/optimizerdialog.hrc +++ b/sdext/source/minimizer/optimizerdialog.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 @@ -27,10 +27,10 @@ #ifndef _OPTIMIZERDIALOG_HRC #define _OPTIMIZERDIALOG_HRC -#define ITEM_ID_INTRODUCTION 0 -#define ITEM_ID_SLIDES 1 -#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 -#define ITEM_ID_OLE_OPTIMIZATION 3 -#define ITEM_ID_SUMMARY 4 +#define ITEM_ID_INTRODUCTION 0 +#define ITEM_ID_SLIDES 1 +#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 +#define ITEM_ID_OLE_OPTIMIZATION 3 +#define ITEM_ID_SUMMARY 4 #endif diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 08036c056069..af661121dbcb 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.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,16 +53,16 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/awt/PushButtonType.hpp> -#define MAX_STEP 4 -#define OD_DIALOG_WIDTH 330 -#define DIALOG_HEIGHT 210 -#define BUTTON_WIDTH 50 -#define BUTTON_HEIGHT 14 -#define BUTTON_POS_Y DIALOG_HEIGHT - BUTTON_HEIGHT - 6 +#define MAX_STEP 4 +#define OD_DIALOG_WIDTH 330 +#define DIALOG_HEIGHT 210 +#define BUTTON_WIDTH 50 +#define BUTTON_HEIGHT 14 +#define BUTTON_POS_Y DIALOG_HEIGHT - BUTTON_HEIGHT - 6 -#define PAGE_POS_X 91 -#define PAGE_POS_Y 8 -#define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X +#define PAGE_POS_X 91 +#define PAGE_POS_Y 8 +#define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X // ------------------- // - OPTIMIZERDIALOG - @@ -75,26 +75,26 @@ public : com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher ); ~OptimizerDialog(); - sal_Bool execute(); + sal_Bool execute(); - sal_Int16 mnCurrentStep; - sal_Int16 mnTabIndex; - sal_Bool mbIsReadonly; + sal_Int16 mnCurrentStep; + sal_Int16 mnTabIndex; + sal_Bool mbIsReadonly; private : com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF; - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame; + com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControl; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControlModel; + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControl; + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControlModel; - com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > mxItemListener; - com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; - com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListenerListBox0Pg0; - com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerFormattedField0Pg1; - com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerComboBox0Pg1; - com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; + com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > mxItemListener; + com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; + com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListenerListBox0Pg0; + com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerFormattedField0Pg1; + com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerComboBox0Pg1; + com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1; + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; std::vector< std::vector< rtl::OUString > > maControlPages; @@ -161,7 +161,7 @@ public: virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + OptimizerDialog& mrOptimizerDialog; }; @@ -175,7 +175,7 @@ public: virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + OptimizerDialog& mrOptimizerDialog; }; @@ -189,7 +189,7 @@ public: virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + OptimizerDialog& mrOptimizerDialog; }; @@ -203,7 +203,7 @@ public: virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + OptimizerDialog& mrOptimizerDialog; }; @@ -220,7 +220,7 @@ public: virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); private: - + OptimizerDialog& mrOptimizerDialog; }; @@ -238,7 +238,7 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; private: - + com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& mrXFrame; }; diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index bdd3cf0e80c1..a72ec1482d48 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.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 @@ -81,7 +81,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString TKGet( TK_Step ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( nHeight ), Any( nOrientation ), Any( nPosX ), @@ -91,8 +91,8 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ), rControlName, aNames, aValues ); @@ -115,7 +115,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( bEnabled ), Any( nHeight ), Any( rOptimizerDialog.getString( nResID ) ), @@ -129,8 +129,8 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertButton( rControlName, xActionListener, aNames, aValues ); return rControlName; @@ -151,7 +151,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( nHeight ), Any( rLabel ), Any( bMultiLine ), @@ -163,8 +163,8 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertFixedText( rControlName, aNames, aValues ); if ( bBold ) @@ -188,7 +188,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( nHeight ), Any( rLabel ), @@ -200,8 +200,8 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rOptimizerDialog.insertCheckBox( rControlName, aNames, aValues ) ); if ( xItemListener.is() ) @@ -228,7 +228,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( fEffectiveMax ), Any( fEffectiveMin ), Any( sal_True ), @@ -243,8 +243,8 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertFormattedField( rControlName, aNames, aValues ), UNO_QUERY_THROW ); if ( xTextListener.is() ) @@ -275,7 +275,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( bEnabled ), Any( nHeight ), @@ -289,8 +289,8 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertComboBox( rControlName, aNames, aValues ), UNO_QUERY_THROW ); if ( xTextListener.is() ) @@ -313,7 +313,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( nHeight ), Any( rLabel ), Any( bMultiLine ), @@ -325,8 +325,8 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XRadioButton > xRadioButton( rOptimizerDialog.insertRadioButton( rControlName, aNames, aValues ) ); if ( xItemListener.is() ) @@ -353,7 +353,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& TKGet( TK_TabIndex ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( sal_True ), Any( bEnabled ), Any( nHeight ), @@ -368,8 +368,8 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XListBox > xListBox( rOptimizerDialog.insertListBox( rControlName, aNames, aValues ) ); if ( xListBox.is() ) @@ -381,10 +381,10 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& void OptimizerDialog::InitNavigationBar() { - sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6; - sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH; - sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH; - sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH; + sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6; + sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH; + sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH; + sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH; InsertSeparator( *this, TKGet( TK_lnNavSep1 ), 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 ); InsertSeparator( *this, TKGet( TK_lnNavSep2 ), 1, 85, 0, 1, BUTTON_POS_Y - 6 ); @@ -406,7 +406,7 @@ void OptimizerDialog::UpdateControlStatesPage0() short nSelectedItem = -1; Sequence< OUString > aItemList; const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() ); - if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one + if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one { aItemList.realloc( rList.size() - 1 ); for ( i = 1; i < rList.size(); i++ ) @@ -425,7 +425,7 @@ void OptimizerDialog::UpdateControlStatesPage0() { aSelectedItems.realloc( 1 ); aSelectedItems[ 0 ] = nSelectedItem; - if ( nSelectedItem > 2 ) // only allowing to delete custom themes, the first can|t be deleted + if ( nSelectedItem > 2 ) // only allowing to delete custom themes, the first can|t be deleted bRemoveButtonEnabled = sal_True; } setControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_StringItemList ), Any( aItemList ) ); @@ -630,7 +630,7 @@ void OptimizerDialog::UpdateControlStatesPage4() sal_uInt32 w; Sequence< OUString > aItemList; const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() ); - if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one + if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one { aItemList.realloc( rList.size() - 1 ); for ( w = 1; w < rList.size(); w++ ) @@ -640,7 +640,7 @@ void OptimizerDialog::UpdateControlStatesPage4() // now check if it is sensible to enable the combo box sal_Bool bSaveSettingsEnabled = sal_True; - if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one + if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one { for ( w = 1; w < rList.size(); w++ ) { @@ -769,7 +769,7 @@ void OptimizerDialog::UpdateControlStatesPage4() sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 ); if ( i >= 0 ) aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) ); - + sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 ); if ( j >= 0 ) aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) ); @@ -846,7 +846,7 @@ void OptimizerDialog::UpdateControlStatesPage4() void OptimizerDialog::InitPage4() { - { // creating progress bar: + { // creating progress bar: OUString pNames[] = { TKGet( TK_Height ), TKGet( TK_Name ), @@ -857,7 +857,7 @@ void OptimizerDialog::InitPage4() TKGet( TK_ProgressValueMin ), TKGet( TK_Width ) }; - Any pValues[] = { + Any pValues[] = { Any( (sal_Int32)12 ), Any( TKGet( STR_SAVE_AS ) ), Any( (sal_Int32)( PAGE_POS_X + 6 ) ), @@ -869,8 +869,8 @@ void OptimizerDialog::InitPage4() sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< Any > aValues( pValues, nCount ); Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" ) ), TKGet( TK_Progress ), aNames, aValues ), UNO_QUERY ); @@ -879,7 +879,7 @@ void OptimizerDialog::InitPage4() Sequence< OUString > aItemList; std::vector< rtl::OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg4 ), getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); -// aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) ); +// aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) ); aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText4Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText5Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) ); diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index e9f733533475..33522109549c 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.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/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx index 3387dd92213f..60c0292ee111 100644 --- a/sdext/source/minimizer/pagecollector.hxx +++ b/sdext/source/minimizer/pagecollector.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 diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 4fac633ca4dc..9fbd5233a5f9 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.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 @@ -107,7 +107,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat Reference < XDispatch > xRet; if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 ) { -// if ( aURL.Path.compareToAscii( "Function1" ) == 0 ) +// if ( aURL.Path.compareToAscii( "Function1" ) == 0 ) xRet = this; } return xRet; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index eaa4502e8d5f..871e8c886cd9 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.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 PPPOptimizer : public cppu::WeakImplHelper4< public: PPPOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF ); - virtual ~PPPOptimizer(); + virtual ~PPPOptimizer(); // XInitialization void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 5729eda5c4dc..776c2d9d32e6 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.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 @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sdext.hxx" -#include "pppoptimizerdialog.hxx" -#include "optimizerdialog.hxx" +#include "pppoptimizerdialog.hxx" +#include "optimizerdialog.hxx" using namespace ::rtl; using namespace ::com::sun::star::uno; @@ -65,7 +65,7 @@ PPPOptimizerDialog::~PPPOptimizerDialog() void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { - if( aArguments.getLength() != 1 ) + if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); aArguments[ 0 ] >>= mxFrame; @@ -83,13 +83,13 @@ OUString SAL_CALL PPPOptimizerDialog::getImplementationName() return PPPOptimizerDialog_getImplementationName(); } -sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName ) +sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SERVICE_NAME ) ); } -Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() +Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() throw (RuntimeException) { return PPPOptimizerDialog_getSupportedServiceNames(); @@ -161,7 +161,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) ); sBuf.append( rtl::OUString::createFromAscii( "KB." ) ); OUString sResult( sBuf.makeStringAndClear() ); -// mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False ); +// mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False ); } delete mpOptimizerDialog, mpOptimizerDialog = NULL; } @@ -201,7 +201,7 @@ OUString PPPOptimizerDialog_getImplementationName() return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.SunPresentationMinimizerImp" ) ); } -Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() +Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -209,7 +209,7 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() return aRet; } -Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr) +Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr) throw( Exception ) { return (cppu::OWeakObject*) new PPPOptimizerDialog( rSMgr ); diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 712db18cb7ee..76fad42b6a9d 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.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 @@ -48,7 +48,7 @@ // ---------------------- class OptimizerDialog; -class PPPOptimizerDialog : public ::cppu::WeakImplHelper4< +class PPPOptimizerDialog : public ::cppu::WeakImplHelper4< com::sun::star::lang::XInitialization, com::sun::star::lang::XServiceInfo, com::sun::star::frame::XDispatchProvider, @@ -58,12 +58,12 @@ class PPPOptimizerDialog : public ::cppu::WeakImplHelper4< com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame; com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController; - OptimizerDialog* mpOptimizerDialog; + OptimizerDialog* mpOptimizerDialog; public: PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF ); - virtual ~PPPOptimizerDialog(); + virtual ~PPPOptimizerDialog(); // XInitialization void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index ef80a02798ab..e213a065d489 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.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,261 +51,261 @@ static ::osl::Mutex& getHashMapMutex() struct TokenTable { - const char* pS; - PPPOptimizerTokenEnum pE; + const char* pS; + PPPOptimizerTokenEnum pE; }; - -static const TokenTable pTokenTableArray[] = + +static const TokenTable pTokenTableArray[] = { - { "rdmNavi", TK_rdmNavi }, - { "lnNavSep1", TK_lnNavSep1 }, - { "lnNavSep2", TK_lnNavSep2 }, - { "btnNavHelp", TK_btnNavHelp }, - { "btnNavBack", TK_btnNavBack }, - { "btnNavNext", TK_btnNavNext }, - { "btnNavFinish", TK_btnNavFinish }, - { "btnNavCancel", TK_btnNavCancel }, + { "rdmNavi", TK_rdmNavi }, + { "lnNavSep1", TK_lnNavSep1 }, + { "lnNavSep2", TK_lnNavSep2 }, + { "btnNavHelp", TK_btnNavHelp }, + { "btnNavBack", TK_btnNavBack }, + { "btnNavNext", TK_btnNavNext }, + { "btnNavFinish", TK_btnNavFinish }, + { "btnNavCancel", TK_btnNavCancel }, - { "FixedText0Pg0", TK_FixedText0Pg0 }, - { "FixedText1Pg0", TK_FixedText1Pg0 }, - { "Separator1Pg0", TK_Separator1Pg0 }, - { "FixedText2Pg0", TK_FixedText2Pg0 }, - { "ListBox0Pg0", TK_ListBox0Pg0 }, - { "Button0Pg0", TK_Button0Pg0 }, - { "RadioButton0Pg1", TK_RadioButton0Pg1 }, - { "RadioButton1Pg1", TK_RadioButton1Pg1 }, - { "FixedText0Pg1", TK_FixedText0Pg1 }, - { "CheckBox1Pg1", TK_CheckBox1Pg1 }, - { "FixedText1Pg1", TK_FixedText1Pg1 }, - { "FixedText2Pg1", TK_FixedText2Pg1 }, - { "FormattedField0Pg1", TK_FormattedField0Pg1 }, - { "ComboBox0Pg1", TK_ComboBox0Pg1 }, - { "CheckBox2Pg1", TK_CheckBox2Pg1 }, - { "FixedText0Pg2", TK_FixedText0Pg2 }, - { "FixedText1Pg2", TK_FixedText1Pg2 }, - { "CheckBox0Pg2", TK_CheckBox0Pg2 }, - { "RadioButton0Pg2", TK_RadioButton0Pg2 }, - { "RadioButton1Pg2", TK_RadioButton1Pg2 }, - { "FixedText0Pg3", TK_FixedText0Pg3 }, - { "CheckBox0Pg3", TK_CheckBox0Pg3 }, - { "FixedText1Pg3", TK_FixedText1Pg3 }, - { "CheckBox1Pg3", TK_CheckBox1Pg3 }, - { "FixedText2Pg3", TK_FixedText2Pg3 }, - { "CheckBox2Pg3", TK_CheckBox2Pg3 }, - { "CheckBox3Pg3", TK_CheckBox3Pg3 }, - { "ListBox0Pg3", TK_ListBox0Pg3 }, - { "Separator0Pg4", TK_Separator0Pg4 }, - { "RadioButton0Pg4", TK_RadioButton0Pg4 }, - { "RadioButton1Pg4", TK_RadioButton1Pg4 }, - { "Separator1Pg4", TK_Separator1Pg4 }, - { "FixedText0Pg4", TK_FixedText0Pg4 }, - { "FixedText1Pg4", TK_FixedText1Pg4 }, - { "FixedText2Pg4", TK_FixedText2Pg4 }, - { "FixedText3Pg4", TK_FixedText3Pg4 }, - { "FixedText4Pg4", TK_FixedText4Pg4 }, - { "FixedText5Pg4", TK_FixedText5Pg4 }, - { "FixedText6Pg4", TK_FixedText6Pg4 }, - { "FixedText7Pg4", TK_FixedText7Pg4 }, - { "FixedText8Pg4", TK_FixedText8Pg4 }, - { "CheckBox1Pg4", TK_CheckBox1Pg4 }, - { "ComboBox0Pg4", TK_ComboBox0Pg4 }, + { "FixedText0Pg0", TK_FixedText0Pg0 }, + { "FixedText1Pg0", TK_FixedText1Pg0 }, + { "Separator1Pg0", TK_Separator1Pg0 }, + { "FixedText2Pg0", TK_FixedText2Pg0 }, + { "ListBox0Pg0", TK_ListBox0Pg0 }, + { "Button0Pg0", TK_Button0Pg0 }, + { "RadioButton0Pg1", TK_RadioButton0Pg1 }, + { "RadioButton1Pg1", TK_RadioButton1Pg1 }, + { "FixedText0Pg1", TK_FixedText0Pg1 }, + { "CheckBox1Pg1", TK_CheckBox1Pg1 }, + { "FixedText1Pg1", TK_FixedText1Pg1 }, + { "FixedText2Pg1", TK_FixedText2Pg1 }, + { "FormattedField0Pg1", TK_FormattedField0Pg1 }, + { "ComboBox0Pg1", TK_ComboBox0Pg1 }, + { "CheckBox2Pg1", TK_CheckBox2Pg1 }, + { "FixedText0Pg2", TK_FixedText0Pg2 }, + { "FixedText1Pg2", TK_FixedText1Pg2 }, + { "CheckBox0Pg2", TK_CheckBox0Pg2 }, + { "RadioButton0Pg2", TK_RadioButton0Pg2 }, + { "RadioButton1Pg2", TK_RadioButton1Pg2 }, + { "FixedText0Pg3", TK_FixedText0Pg3 }, + { "CheckBox0Pg3", TK_CheckBox0Pg3 }, + { "FixedText1Pg3", TK_FixedText1Pg3 }, + { "CheckBox1Pg3", TK_CheckBox1Pg3 }, + { "FixedText2Pg3", TK_FixedText2Pg3 }, + { "CheckBox2Pg3", TK_CheckBox2Pg3 }, + { "CheckBox3Pg3", TK_CheckBox3Pg3 }, + { "ListBox0Pg3", TK_ListBox0Pg3 }, + { "Separator0Pg4", TK_Separator0Pg4 }, + { "RadioButton0Pg4", TK_RadioButton0Pg4 }, + { "RadioButton1Pg4", TK_RadioButton1Pg4 }, + { "Separator1Pg4", TK_Separator1Pg4 }, + { "FixedText0Pg4", TK_FixedText0Pg4 }, + { "FixedText1Pg4", TK_FixedText1Pg4 }, + { "FixedText2Pg4", TK_FixedText2Pg4 }, + { "FixedText3Pg4", TK_FixedText3Pg4 }, + { "FixedText4Pg4", TK_FixedText4Pg4 }, + { "FixedText5Pg4", TK_FixedText5Pg4 }, + { "FixedText6Pg4", TK_FixedText6Pg4 }, + { "FixedText7Pg4", TK_FixedText7Pg4 }, + { "FixedText8Pg4", TK_FixedText8Pg4 }, + { "CheckBox1Pg4", TK_CheckBox1Pg4 }, + { "ComboBox0Pg4", TK_ComboBox0Pg4 }, - { "_blank", TK__blank }, - { "_self", TK__self }, - { "Activated", TK_Activated }, - { "Align", TK_Align }, - { "Alpha", TK_Alpha }, - { "Animated", TK_Animated }, - { "Background", TK_Background }, - { "BitmapPath", TK_BitmapPath }, - { "Border", TK_Border }, - { "Closeable", TK_Closeable }, - { "ColorMode", TK_ColorMode }, - { "Complete", TK_Complete }, - { "Compression", TK_Compression }, - { "CurrentItemID", TK_CurrentItemID }, - { "DefaultButton", TK_DefaultButton }, - { "DocumentService", TK_DocumentService }, - { "Dropdown", TK_Dropdown }, - { "EffectiveValue", TK_EffectiveValue }, - { "EffectiveMin", TK_EffectiveMin }, - { "EffectiveMax", TK_EffectiveMax }, - { "Enabled", TK_Enabled }, - { "Extensions", TK_Extensions }, + { "_blank", TK__blank }, + { "_self", TK__self }, + { "Activated", TK_Activated }, + { "Align", TK_Align }, + { "Alpha", TK_Alpha }, + { "Animated", TK_Animated }, + { "Background", TK_Background }, + { "BitmapPath", TK_BitmapPath }, + { "Border", TK_Border }, + { "Closeable", TK_Closeable }, + { "ColorMode", TK_ColorMode }, + { "Complete", TK_Complete }, + { "Compression", TK_Compression }, + { "CurrentItemID", TK_CurrentItemID }, + { "DefaultButton", TK_DefaultButton }, + { "DocumentService", TK_DocumentService }, + { "Dropdown", TK_Dropdown }, + { "EffectiveValue", TK_EffectiveValue }, + { "EffectiveMin", TK_EffectiveMin }, + { "EffectiveMax", TK_EffectiveMax }, + { "Enabled", TK_Enabled }, + { "Extensions", TK_Extensions }, { "FileSizeDestination",TK_FileSizeDestination }, - { "FileSizeSource", TK_FileSizeSource }, - { "FillBitmap", TK_FillBitmap }, + { "FileSizeSource", TK_FileSizeSource }, + { "FillBitmap", TK_FillBitmap }, { "FillBitmapLogicalSize",TK_FillBitmapLogicalSize }, - { "FillBitmapMode", TK_FillBitmapMode }, - { "FillBitmapSizeX", TK_FillBitmapSizeX }, - { "FillBitmapSizeY", TK_FillBitmapSizeY }, - { "FillBitmapURL", TK_FillBitmapURL }, - { "FillStyle", TK_FillStyle }, - { "FilterData", TK_FilterData }, - { "FilterName", TK_FilterName }, - { "Flags", TK_Flags }, - { "FontDescriptor", TK_FontDescriptor }, - { "Graphic", TK_Graphic }, - { "GraphicCrop", TK_GraphicCrop }, - { "GraphicCropLogic", TK_GraphicCropLogic }, - { "GraphicURL", TK_GraphicURL }, - { "GraphicStreamURL", TK_GraphicStreamURL }, - { "Height", TK_Height }, - { "HelpFile", TK_HelpFile }, - { "Hidden", TK_Hidden }, - { "ID", TK_ID }, - { "ImageURL", TK_ImageURL }, - { "InformationDialog", TK_InformationDialog }, - { "InputStream", TK_InputStream }, - { "Interlaced", TK_Interlaced }, - { "IsInternal", TK_IsInternal }, - { "Label", TK_Label }, - { "LineCount", TK_LineCount }, - { "LogicalHeight", TK_LogicalHeight }, - { "LogicalWidth", TK_LogicalWidth }, - { "LogicalSize", TK_LogicalSize }, - { "MimeType", TK_MimeType }, - { "Moveable", TK_Moveable }, - { "MultiLine", TK_MultiLine }, - { "MultiSelection", TK_MultiSelection }, - { "Name", TK_Name }, - { "Orientation", TK_Orientation }, - { "OutputStream", TK_OutputStream }, - { "PixelHeight", TK_PixelHeight }, - { "PixelWidth", TK_PixelWidth }, - { "PositionX", TK_PositionX }, - { "PositionY", TK_PositionY }, - { "Progress", TK_Progress }, - { "ProgressValue", TK_ProgressValue }, - { "ProgressValueMax", TK_ProgressValueMax }, - { "ProgressValueMin", TK_ProgressValueMin }, - { "PushButtonType", TK_PushButtonType }, - { "Quality", TK_Quality }, - { "ReadOnly", TK_ReadOnly }, - { "Repeat", TK_Repeat }, - { "ScaleImage", TK_ScaleImage }, - { "SelectedItems", TK_SelectedItems }, - { "Settings", TK_Settings }, - { "Size100thMM", TK_Size100thMM }, - { "SizePixel", TK_SizePixel }, - { "Spin", TK_Spin }, - { "Step", TK_Step }, - { "State", TK_State }, - { "StatusDispatcher", TK_StatusDispatcher }, - { "StringItemList", TK_StringItemList }, - { "Strings", TK_Strings }, - { "TabIndex", TK_TabIndex }, - { "Template", TK_Template }, - { "Text", TK_Text }, - { "Title", TK_Title }, - { "Transparent", TK_Transparent }, - { "Type", TK_Type }, - { "UIName", TK_UIName }, - { "Value", TK_Value }, - { "Width", TK_Width }, - { "ZOrder", TK_ZOrder }, + { "FillBitmapMode", TK_FillBitmapMode }, + { "FillBitmapSizeX", TK_FillBitmapSizeX }, + { "FillBitmapSizeY", TK_FillBitmapSizeY }, + { "FillBitmapURL", TK_FillBitmapURL }, + { "FillStyle", TK_FillStyle }, + { "FilterData", TK_FilterData }, + { "FilterName", TK_FilterName }, + { "Flags", TK_Flags }, + { "FontDescriptor", TK_FontDescriptor }, + { "Graphic", TK_Graphic }, + { "GraphicCrop", TK_GraphicCrop }, + { "GraphicCropLogic", TK_GraphicCropLogic }, + { "GraphicURL", TK_GraphicURL }, + { "GraphicStreamURL", TK_GraphicStreamURL }, + { "Height", TK_Height }, + { "HelpFile", TK_HelpFile }, + { "Hidden", TK_Hidden }, + { "ID", TK_ID }, + { "ImageURL", TK_ImageURL }, + { "InformationDialog", TK_InformationDialog }, + { "InputStream", TK_InputStream }, + { "Interlaced", TK_Interlaced }, + { "IsInternal", TK_IsInternal }, + { "Label", TK_Label }, + { "LineCount", TK_LineCount }, + { "LogicalHeight", TK_LogicalHeight }, + { "LogicalWidth", TK_LogicalWidth }, + { "LogicalSize", TK_LogicalSize }, + { "MimeType", TK_MimeType }, + { "Moveable", TK_Moveable }, + { "MultiLine", TK_MultiLine }, + { "MultiSelection", TK_MultiSelection }, + { "Name", TK_Name }, + { "Orientation", TK_Orientation }, + { "OutputStream", TK_OutputStream }, + { "PixelHeight", TK_PixelHeight }, + { "PixelWidth", TK_PixelWidth }, + { "PositionX", TK_PositionX }, + { "PositionY", TK_PositionY }, + { "Progress", TK_Progress }, + { "ProgressValue", TK_ProgressValue }, + { "ProgressValueMax", TK_ProgressValueMax }, + { "ProgressValueMin", TK_ProgressValueMin }, + { "PushButtonType", TK_PushButtonType }, + { "Quality", TK_Quality }, + { "ReadOnly", TK_ReadOnly }, + { "Repeat", TK_Repeat }, + { "ScaleImage", TK_ScaleImage }, + { "SelectedItems", TK_SelectedItems }, + { "Settings", TK_Settings }, + { "Size100thMM", TK_Size100thMM }, + { "SizePixel", TK_SizePixel }, + { "Spin", TK_Spin }, + { "Step", TK_Step }, + { "State", TK_State }, + { "StatusDispatcher", TK_StatusDispatcher }, + { "StringItemList", TK_StringItemList }, + { "Strings", TK_Strings }, + { "TabIndex", TK_TabIndex }, + { "Template", TK_Template }, + { "Text", TK_Text }, + { "Title", TK_Title }, + { "Transparent", TK_Transparent }, + { "Type", TK_Type }, + { "UIName", TK_UIName }, + { "Value", TK_Value }, + { "Width", TK_Width }, + { "ZOrder", TK_ZOrder }, - { "LastUsedSettings", TK_LastUsedSettings }, - { "Settings/Templates", TK_Settings_Templates }, + { "LastUsedSettings", TK_LastUsedSettings }, + { "Settings/Templates", TK_Settings_Templates }, { "Settings/Templates/",TK_Settings_Templates_ }, - { "JPEGCompression", TK_JPEGCompression }, - { "JPEGQuality", TK_JPEGQuality }, - { "RemoveCropArea", TK_RemoveCropArea }, - { "ImageResolution", TK_ImageResolution }, + { "JPEGCompression", TK_JPEGCompression }, + { "JPEGQuality", TK_JPEGQuality }, + { "RemoveCropArea", TK_RemoveCropArea }, + { "ImageResolution", TK_ImageResolution }, { "EmbedLinkedGraphics",TK_EmbedLinkedGraphics }, - { "OLEOptimization", TK_OLEOptimization }, + { "OLEOptimization", TK_OLEOptimization }, { "OLEOptimizationType",TK_OLEOptimizationType }, { "DeleteUnusedMasterPages", TK_DeleteUnusedMasterPages }, { "DeleteHiddenSlides", TK_DeleteHiddenSlides }, - { "DeleteNotesPages", TK_DeleteNotesPages }, - { "CustomShowName", TK_CustomShowName }, - { "SaveAs", TK_SaveAs }, - { "SaveAsURL", TK_SaveAsURL }, - { "OpenNewDocument", TK_OpenNewDocument }, - { "EstimatedFileSize", TK_EstimatedFileSize }, + { "DeleteNotesPages", TK_DeleteNotesPages }, + { "CustomShowName", TK_CustomShowName }, + { "SaveAs", TK_SaveAs }, + { "SaveAsURL", TK_SaveAsURL }, + { "OpenNewDocument", TK_OpenNewDocument }, + { "EstimatedFileSize", TK_EstimatedFileSize }, - { "Status", TK_Status }, - { "Pages", TK_Pages }, - { "CurrentPage", TK_CurrentPage }, - { "GraphicObjects", TK_GraphicObjects }, + { "Status", TK_Status }, + { "Pages", TK_Pages }, + { "CurrentPage", TK_CurrentPage }, + { "GraphicObjects", TK_GraphicObjects }, { "CurrentGraphicObject",TK_CurrentGraphicObject }, - { "OLEObjects", TK_OLEObjects }, - { "CurrentOLEObject", TK_CurrentOLEObject }, + { "OLEObjects", TK_OLEObjects }, + { "CurrentOLEObject", TK_CurrentOLEObject }, { "STR_SUN_OPTIMIZATION_WIZARD2",STR_SUN_OPTIMIZATION_WIZARD2 }, - { "STR_STEPS", STR_STEPS }, - { "STR_HELP", STR_HELP }, - { "STR_BACK", STR_BACK }, - { "STR_NEXT", STR_NEXT }, - { "STR_FINISH", STR_FINISH }, - { "STR_CANCEL", STR_CANCEL }, - { "STR_INTRODUCTION", STR_INTRODUCTION }, - { "STR_INTRODUCTION_T", STR_INTRODUCTION_T }, - { "STR_CHOSE_SETTINGS", STR_CHOSE_SETTINGS }, - { "STR_REMOVE", STR_REMOVE }, - { "STR_GRAPHIC_OPTIMIZATION", STR_GRAPHIC_OPTIMIZATION }, - { "STR_IMAGE_OPTIMIZATION", STR_IMAGE_OPTIMIZATION }, - { "STR_LOSSLESS_COMPRESSION", STR_LOSSLESS_COMPRESSION }, - { "STR_JPEG_COMPRESSION", STR_JPEG_COMPRESSION }, - { "STR_QUALITY", STR_QUALITY }, - { "STR_REMOVE_CROP_AREA", STR_REMOVE_CROP_AREA }, - { "STR_IMAGE_RESOLUTION", STR_IMAGE_RESOLUTION }, - { "STR_IMAGE_RESOLUTION_0", STR_IMAGE_RESOLUTION_0 }, - { "STR_IMAGE_RESOLUTION_1", STR_IMAGE_RESOLUTION_1 }, - { "STR_IMAGE_RESOLUTION_2", STR_IMAGE_RESOLUTION_2 }, - { "STR_IMAGE_RESOLUTION_3", STR_IMAGE_RESOLUTION_3 }, - { "STR_EMBED_LINKED_GRAPHICS", STR_EMBED_LINKED_GRAPHICS }, - { "STR_OLE_OBJECTS", STR_OLE_OBJECTS }, - { "STR_OLE_OPTIMIZATION", STR_OLE_OPTIMIZATION }, - { "STR_OLE_REPLACE", STR_OLE_REPLACE }, - { "STR_ALL_OLE_OBJECTS", STR_ALL_OLE_OBJECTS }, - { "STR_ALIEN_OLE_OBJECTS_ONLY", STR_ALIEN_OLE_OBJECTS_ONLY }, - { "STR__OLE_OBJECTS_DESC", STR_OLE_OBJECTS_DESC }, - { "STR_NO_OLE_OBJECTS_DESC", STR_NO_OLE_OBJECTS_DESC }, - { "STR_SLIDES", STR_SLIDES }, - { "STR_CHOOSE_SLIDES", STR_CHOOSE_SLIDES }, - { "STR_MASTER_PAGES", STR_MASTER_PAGES }, - { "STR_DELETE_MASTER_PAGES", STR_DELETE_MASTER_PAGES }, - { "STR_DELETE_NOTES_PAGES", STR_DELETE_NOTES_PAGES }, - { "STR_DELETE_HIDDEN_SLIDES", STR_DELETE_HIDDEN_SLIDES }, - { "STR_CUSTOM_SHOW", STR_CUSTOM_SHOW }, - { "STR_SUMMARY", STR_SUMMARY }, - { "STR_SUMMARY_TITLE", STR_SUMMARY_TITLE }, - { "STR_PROGRESS", STR_PROGRESS }, - { "STR_OBJECTS_OPTIMIZED", STR_OBJECTS_OPTIMIZED }, - { "STR_APPLY_TO_CURRENT", STR_APPLY_TO_CURRENT }, - { "STR_AUTOMATICALLY_OPEN", STR_AUTOMATICALLY_OPEN }, - { "STR_SAVE_SETTINGS", STR_SAVE_SETTINGS }, - { "STR_SAVE_AS", STR_SAVE_AS }, - { "STR_DELETE_SLIDES", STR_DELETE_SLIDES }, - { "STR_OPTIMIZE_IMAGES", STR_OPTIMIZE_IMAGES }, - { "STR_CREATE_REPLACEMENT", STR_CREATE_REPLACEMENT }, - { "STR_CURRENT_FILESIZE", STR_CURRENT_FILESIZE }, - { "STR_ESTIMATED_FILESIZE", STR_ESTIMATED_FILESIZE }, - { "STR_MB", STR_MB }, - { "MY_SETTINGS", STR_MY_SETTINGS }, - { "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION }, - { "STR_MODIFY_WARNING", STR_MODIFY_WARNING }, - { "STR_YES", STR_YES }, - { "STR_OK", STR_OK }, - { "STR_INFO_1", STR_INFO_1 }, - { "STR_INFO_2", STR_INFO_2 }, - { "STR_INFO_3", STR_INFO_3 }, - { "STR_INFO_4", STR_INFO_4 }, + { "STR_STEPS", STR_STEPS }, + { "STR_HELP", STR_HELP }, + { "STR_BACK", STR_BACK }, + { "STR_NEXT", STR_NEXT }, + { "STR_FINISH", STR_FINISH }, + { "STR_CANCEL", STR_CANCEL }, + { "STR_INTRODUCTION", STR_INTRODUCTION }, + { "STR_INTRODUCTION_T", STR_INTRODUCTION_T }, + { "STR_CHOSE_SETTINGS", STR_CHOSE_SETTINGS }, + { "STR_REMOVE", STR_REMOVE }, + { "STR_GRAPHIC_OPTIMIZATION", STR_GRAPHIC_OPTIMIZATION }, + { "STR_IMAGE_OPTIMIZATION", STR_IMAGE_OPTIMIZATION }, + { "STR_LOSSLESS_COMPRESSION", STR_LOSSLESS_COMPRESSION }, + { "STR_JPEG_COMPRESSION", STR_JPEG_COMPRESSION }, + { "STR_QUALITY", STR_QUALITY }, + { "STR_REMOVE_CROP_AREA", STR_REMOVE_CROP_AREA }, + { "STR_IMAGE_RESOLUTION", STR_IMAGE_RESOLUTION }, + { "STR_IMAGE_RESOLUTION_0", STR_IMAGE_RESOLUTION_0 }, + { "STR_IMAGE_RESOLUTION_1", STR_IMAGE_RESOLUTION_1 }, + { "STR_IMAGE_RESOLUTION_2", STR_IMAGE_RESOLUTION_2 }, + { "STR_IMAGE_RESOLUTION_3", STR_IMAGE_RESOLUTION_3 }, + { "STR_EMBED_LINKED_GRAPHICS", STR_EMBED_LINKED_GRAPHICS }, + { "STR_OLE_OBJECTS", STR_OLE_OBJECTS }, + { "STR_OLE_OPTIMIZATION", STR_OLE_OPTIMIZATION }, + { "STR_OLE_REPLACE", STR_OLE_REPLACE }, + { "STR_ALL_OLE_OBJECTS", STR_ALL_OLE_OBJECTS }, + { "STR_ALIEN_OLE_OBJECTS_ONLY", STR_ALIEN_OLE_OBJECTS_ONLY }, + { "STR__OLE_OBJECTS_DESC", STR_OLE_OBJECTS_DESC }, + { "STR_NO_OLE_OBJECTS_DESC", STR_NO_OLE_OBJECTS_DESC }, + { "STR_SLIDES", STR_SLIDES }, + { "STR_CHOOSE_SLIDES", STR_CHOOSE_SLIDES }, + { "STR_MASTER_PAGES", STR_MASTER_PAGES }, + { "STR_DELETE_MASTER_PAGES", STR_DELETE_MASTER_PAGES }, + { "STR_DELETE_NOTES_PAGES", STR_DELETE_NOTES_PAGES }, + { "STR_DELETE_HIDDEN_SLIDES", STR_DELETE_HIDDEN_SLIDES }, + { "STR_CUSTOM_SHOW", STR_CUSTOM_SHOW }, + { "STR_SUMMARY", STR_SUMMARY }, + { "STR_SUMMARY_TITLE", STR_SUMMARY_TITLE }, + { "STR_PROGRESS", STR_PROGRESS }, + { "STR_OBJECTS_OPTIMIZED", STR_OBJECTS_OPTIMIZED }, + { "STR_APPLY_TO_CURRENT", STR_APPLY_TO_CURRENT }, + { "STR_AUTOMATICALLY_OPEN", STR_AUTOMATICALLY_OPEN }, + { "STR_SAVE_SETTINGS", STR_SAVE_SETTINGS }, + { "STR_SAVE_AS", STR_SAVE_AS }, + { "STR_DELETE_SLIDES", STR_DELETE_SLIDES }, + { "STR_OPTIMIZE_IMAGES", STR_OPTIMIZE_IMAGES }, + { "STR_CREATE_REPLACEMENT", STR_CREATE_REPLACEMENT }, + { "STR_CURRENT_FILESIZE", STR_CURRENT_FILESIZE }, + { "STR_ESTIMATED_FILESIZE", STR_ESTIMATED_FILESIZE }, + { "STR_MB", STR_MB }, + { "MY_SETTINGS", STR_MY_SETTINGS }, + { "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION }, + { "STR_MODIFY_WARNING", STR_MODIFY_WARNING }, + { "STR_YES", STR_YES }, + { "STR_OK", STR_OK }, + { "STR_INFO_1", STR_INFO_1 }, + { "STR_INFO_2", STR_INFO_2 }, + { "STR_INFO_3", STR_INFO_3 }, + { "STR_INFO_4", STR_INFO_4 }, { "STR_DUPLICATING_PRESENTATION",STR_DUPLICATING_PRESENTATION }, - { "STR_DELETING_SLIDES", STR_DELETING_SLIDES }, - { "STR_OPTIMIZING_GRAPHICS", STR_OPTIMIZING_GRAPHICS }, + { "STR_DELETING_SLIDES", STR_DELETING_SLIDES }, + { "STR_OPTIMIZING_GRAPHICS", STR_OPTIMIZING_GRAPHICS }, { "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS }, - { "STR_FileSizeSeparator", STR_FILESIZESEPARATOR }, - - { "Last", TK_Last }, - { "NotFound", TK_NotFound } + { "STR_FileSizeSeparator", STR_FILESIZESEPARATOR }, + + { "Last", TK_Last }, + { "NotFound", TK_NotFound } }; PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) { if ( !pHashMap ) - { // init hash map + { // init hash map ::osl::MutexGuard aGuard( getHashMapMutex() ); if ( !pHashMap ) { diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index 19ae973c7572..3a4cf2f93637 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.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 @@ -274,7 +274,7 @@ enum PPPOptimizerTokenEnum STR_CREATING_OLE_REPLACEMENTS, STR_FILESIZESEPARATOR, - TK_Last, + TK_Last, TK_NotFound }; diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 1bb4d182bb2b..a905ccb037d9 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.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,7 +51,7 @@ extern "C" } // ------------------------------------------------------------------------- - + sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) { if (pRegistryKey) @@ -68,7 +68,7 @@ extern "C" for ( nPos = rSNL1.getLength(); nPos--; ) xNewKey->createKey( pArray1[nPos] ); - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() ); + xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() ); xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames(); const OUString * pArray2 = rSNL2.getConstArray(); @@ -99,7 +99,7 @@ extern "C" { xFactory = createSingleComponentFactory( PPPOptimizer_createInstance, - OUString::createFromAscii( pImplName ), + OUString::createFromAscii( pImplName ), PPPOptimizer_getSupportedServiceNames() ); } diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu index 08324953d32c..0cf414778f8a 100644 --- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu +++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu @@ -53,7 +53,7 @@ </prop> <prop oor:name="STR_LOSSLESS_COMPRESSION"> <value xml:lang="en-US">~Lossless compression</value> - </prop> + </prop> <prop oor:name="STR_JPEG_COMPRESSION"> <value xml:lang="en-US">~JPEG compression</value> </prop> @@ -80,7 +80,7 @@ </prop> <prop oor:name="STR_EMBED_LINKED_GRAPHICS"> <value xml:lang="en-US">~Break links to external graphics</value> - </prop> + </prop> <prop oor:name="STR_OLE_OBJECTS"> <value xml:lang="en-US">OLE Objects</value> </prop> @@ -105,7 +105,7 @@ The current presentation contains OLE objects.</value> <value xml:lang="en-US">Object Linking and Embedding (OLE) is a technology that allows embedding and linking to documents and other objects. The current presentation contains no OLE objects.</value> - </prop> + </prop> <prop oor:name="STR_SLIDES"> <value xml:lang="en-US">Slides</value> </prop> @@ -180,13 +180,13 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="STR_YES"> <value xml:lang="en-US">~Yes</value> - </prop> + </prop> <prop oor:name="STR_OK"> <value xml:lang="en-US">OK</value> - </prop> + </prop> <prop oor:name="STR_INFO_1"> <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value> - </prop> + </prop> <prop oor:name="STR_INFO_2"> <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value> </prop> @@ -230,7 +230,7 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="EmbedLinkedGraphics"> <value>true</value> - </prop> + </prop> <prop oor:name="OLEOptimization"> <value>true</value> </prop> @@ -251,11 +251,11 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="OpenNewDocument"> <value>true</value> - </prop> + </prop> </node> <node oor:name="Settings"> <node oor:name="Templates"> - <node oor:name="template1" oor:op="replace"> + <node oor:name="template1" oor:op="replace"> <prop oor:name="Name"> <value xml:lang="en-US">Screen optimized (smallest file size)</value> </prop> @@ -294,7 +294,7 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="OpenNewDocument"> <value>true</value> - </prop> + </prop> </node> <node oor:name="template2" oor:op="replace"> <prop oor:name="Name"> @@ -314,7 +314,7 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="EmbedLinkedGraphics"> <value>true</value> - </prop> + </prop> <prop oor:name="OLEOptimization"> <value>true</value> </prop> @@ -335,7 +335,7 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="OpenNewDocument"> <value>true</value> - </prop> + </prop> </node> <node oor:name="template3" oor:op="replace"> <prop oor:name="Name"> @@ -355,7 +355,7 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="EmbedLinkedGraphics"> <value>true</value> - </prop> + </prop> <prop oor:name="OLEOptimization"> <value>true</value> </prop> @@ -376,8 +376,8 @@ The current presentation contains no OLE objects.</value> </prop> <prop oor:name="OpenNewDocument"> <value>true</value> - </prop> - </node> + </prop> + </node> </node> </node> </oor:component-data> diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index e5f6fdceeed3..554a3537710c 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.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 @@ -77,7 +77,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxMSF, Reference< XF Reference< XFrame > xFrame( mxController->getFrame() ); Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() ); mxWindowPeer = Reference< XWindowPeer >( xContainerWindow, UNO_QUERY_THROW ); - createWindowPeer( mxWindowPeer ); + createWindowPeer( mxWindowPeer ); } // ----------------------------------------------------------------------------- @@ -113,7 +113,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x xParentPeer = xToolkit->getDesktopWindow(); mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY ); mxControl->createPeer( xToolkit, xParentPeer ); -// xWindowPeer = xControl.getPeer(); +// xWindowPeer = xControl.getPeer(); return mxControl->getPeer(); } diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 78e3fd0f409c..39c366474301 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.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 @@ -119,28 +119,28 @@ public : void enableControl( const rtl::OUString& rControlName ); void disableControl( const rtl::OUString& rControlName ); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; - com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController; - com::sun::star::uno::Reference< com::sun::star::awt::XReschedule > mxReschedule; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; + com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController; + com::sun::star::uno::Reference< com::sun::star::awt::XReschedule > mxReschedule; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxDialogModel; - com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > mxDialogModelMultiPropertySet; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxDialogModelPropertySet; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxDialogModelMSF; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxDialogModelNameContainer; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDialogModelNameAccess; + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxDialogModel; + com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > mxDialogModelMultiPropertySet; + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxDialogModelPropertySet; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxDialogModelMSF; + com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxDialogModelNameContainer; + com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDialogModelNameAccess; - com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel; + com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel; - com::sun::star::uno::Reference< com::sun::star::awt::XDialog > mxDialog; - com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxControl; - com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer; + com::sun::star::uno::Reference< com::sun::star::awt::XDialog > mxDialog; + com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxControl; + com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer; - com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer > mxDialogControlContainer; - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > mxDialogComponent; - com::sun::star::uno::Reference< com::sun::star::awt::XWindow > mxDialogWindow; + com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer > mxDialogControlContainer; + com::sun::star::uno::Reference< com::sun::star::lang::XComponent > mxDialogComponent; + com::sun::star::uno::Reference< com::sun::star::awt::XWindow > mxDialogWindow; - sal_Bool mbStatus; + sal_Bool mbStatus; }; #endif // UNODIALOG_HXX |