diff options
Diffstat (limited to 'sdext/source')
11 files changed, 61 insertions, 436 deletions
diff --git a/sdext/source/minimizer/aboutdialog.cxx b/sdext/source/minimizer/aboutdialog.cxx deleted file mode 100644 index f495da9994ea..000000000000 --- a/sdext/source/minimizer/aboutdialog.cxx +++ /dev/null @@ -1,276 +0,0 @@ - /************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sdext.hxx" - -#include "aboutdialog.hxx" -#include "optimizationstats.hxx" -#include "fileopendialog.hxx" -#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> - -// --------------- -// - ABOUTDIALOG - -// --------------- - -using namespace ::rtl; -using namespace ::com::sun::star::ui; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::script; -using namespace ::com::sun::star::container; - -#define ABOUT_DIALOG_WIDTH 200 -#define ABOUT_DIALOG_HEIGHT 155 - -// ----------------------------------------------------------------------------- - - -rtl::OUString InsertFixedText( AboutDialog& rAboutDialog, const rtl::OUString& rControlName, const OUString& rLabel, - sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) -{ - OUString pNames[] = { - TKGet( TK_Height ), - TKGet( TK_Label ), - TKGet( TK_MultiLine ), - TKGet( TK_PositionX ), - TKGet( TK_PositionY ), - TKGet( TK_Step ), - TKGet( TK_TabIndex ), - TKGet( TK_Width ) }; - - Any pValues[] = { - Any( nHeight ), - Any( rLabel ), - Any( bMultiLine ), - Any( nXPos ), - Any( nYPos ), - Any( (sal_Int16)0 ), - Any( nTabIndex ), - Any( nWidth ) }; - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); - - rAboutDialog.insertFixedText( rControlName, aNames, aValues ); - return rControlName; -} - -#if 0 -rtl::OUString InsertSeparator( AboutDialog& rAboutDialog, const OUString& rControlName, sal_Int32 nOrientation, - sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) -{ - OUString pNames[] = { - TKGet( TK_Height ), - TKGet( TK_Orientation ), - TKGet( TK_PositionX ), - TKGet( TK_PositionY ), - TKGet( TK_Step ), - TKGet( TK_Width ) }; - - Any pValues[] = { - Any( nHeight ), - Any( nOrientation ), - Any( nPosX ), - Any( nPosY ), - Any( sal_Int16( 0 ) ), - Any( nWidth ) }; - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); - - rAboutDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ), - rControlName, aNames, aValues ); - return rControlName; -} - -#endif - -rtl::OUString InsertImage( AboutDialog& rAboutDialog, const OUString& rControlName, const OUString& rURL, - sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) -{ - OUString pNames[] = { - TKGet( TK_Border ), - TKGet( TK_Height ), - TKGet( TK_ImageURL ), - TKGet( TK_PositionX ), - TKGet( TK_PositionY ), - TKGet( TK_ScaleImage ), - TKGet( TK_Width ) }; - - Any pValues[] = { - Any( sal_Int16( 1 ) ), - Any( nHeight ), - Any( rURL ), - Any( nPosX ), - Any( nPosY ), - Any( sal_False ), - Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); - - rAboutDialog.insertImage( rControlName, aNames, aValues ); - return rControlName; -} - -rtl::OUString InsertButton( AboutDialog& rAboutDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, - sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID ) -{ - OUString pNames[] = { - TKGet( TK_Enabled ), - TKGet( TK_Height ), - TKGet( TK_Label ), - TKGet( TK_PositionX ), - TKGet( TK_PositionY ), - TKGet( TK_PushButtonType ), - TKGet( TK_Step ), - TKGet( TK_TabIndex ), - TKGet( TK_Width ) }; - - Any pValues[] = { - Any( sal_True ), - Any( nHeight ), - Any( rAboutDialog.getString( nResID ) ), - Any( nXPos ), - Any( nYPos ), - Any( static_cast< sal_Int16 >( PushButtonType_OK ) ), - Any( (sal_Int16)0 ), - Any( nTabIndex ), - Any( nWidth ) }; - - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); - - rAboutDialog.insertButton( rControlName, xActionListener, aNames, aValues ); - return rControlName; -} - -void AboutDialog::InitDialog() -{ - // setting the dialog properties - OUString pNames[] = { - rtl::OUString::createFromAscii( "BackgroundColor" ) , - TKGet( TK_Closeable ), - TKGet( TK_Height ), - TKGet( TK_Moveable ), - TKGet( TK_PositionX ), - TKGet( TK_PositionY ), - TKGet( TK_Title ), - TKGet( TK_Width ) }; - - Any pValues[] = { - Any( sal_Int32( 0xffffff ) ), - Any( sal_True ), - Any( sal_Int32( ABOUT_DIALOG_HEIGHT ) ), - Any( sal_True ), - Any( sal_Int32( 113 ) ), - Any( sal_Int32( 42 ) ), - Any( getString( STR_ABOUT_VERSION2 ) ), - Any( sal_Int32( ABOUT_DIALOG_WIDTH ) ) }; - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); - - Sequence< rtl::OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); - - rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) ); - rtl::OUString sBitmap( rtl::OUString::createFromAscii( "/aboutlogo.png" ) ); - rtl::OUString sURL( sBitmapPath += sBitmap ); - - mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); - sal_Int32 nWidth = getMapsFromPixels( 387 ); - if ( nWidth ) - mxDialogModelPropertySet->setPropertyValue( TKGet( TK_Width ), Any( nWidth ) ); - else - nWidth = ABOUT_DIALOG_WIDTH; - -// int nHeight = (int) getMapsFromPixels( 95 ); - - InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), sURL, 0, 0, nWidth, 60 ); - InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), getString( STR_ABOUT_PRN ), 9, 66, nWidth - 18, 50, sal_True, 0 ); -// InsertSeparator( *this, rtl::OUString( rtl::OUString::createFromAscii( "separator" ) ), 0, 0, ABOUT_DIALOG_HEIGHT - 25, nWidth, 8 ); - InsertButton( *this, rtl::OUString( rtl::OUString::createFromAscii( "button" ) ), mxActionListener, ( nWidth / 2 ) - 25, 120, 50, 14, 1, STR_OK ); -} - -// ----------------------------------------------------------------------------- - -AboutDialog::AboutDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame ) : - UnoDialog( rxMSF, rxFrame ), - ConfigurationAccess( rxMSF, NULL ), - mxMSF( rxMSF ), - mxFrame( rxFrame ), - mxActionListener( new AboutActionListener( *this ) ) -{ - Reference< XFrame > xFrame( mxController->getFrame() ); - Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() ); - Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW ); - createWindowPeer( xWindowPeer ); - - InitDialog(); -} - -// ----------------------------------------------------------------------------- - -AboutDialog::~AboutDialog() -{ -} - -// ----------------------------------------------------------------------------- - -sal_Bool AboutDialog::execute() -{ - UnoDialog::execute(); - return mbStatus; -} - -// ----------------------------------------------------------------------------- - -void AboutActionListener::actionPerformed( const ActionEvent& rEvent ) - throw ( com::sun::star::uno::RuntimeException ) -{ - if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString::createFromAscii( "button" ) ) ) - { - mrAboutDialog.endExecute( sal_True ); - } -} -void AboutActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) -{ -} diff --git a/sdext/source/minimizer/aboutdialog.hxx b/sdext/source/minimizer/aboutdialog.hxx deleted file mode 100644 index 3bc402fb2543..000000000000 --- a/sdext/source/minimizer/aboutdialog.hxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ABOUTDIALOG_HXX -#define ABOUTDIALOG_HXX -#include <vector> -#include "unodialog.hxx" -#include "configurationaccess.hxx" -#include "pppoptimizertoken.hxx" -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/awt/XItemEventBroadcaster.hpp> -#include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/awt/PushButtonType.hpp> - -#define DIALOG_WIDTH 310 -#define DIALOG_HEIGHT 210 -#define BUTTON_WIDTH 50 -#define BUTTON_HEIGHT 14 - -// ------------------- -// - OPTIMIZERDIALOG - -// ------------------- -class AboutDialog : public UnoDialog, public ConfigurationAccess -{ -public : - - AboutDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame ); - ~AboutDialog(); - - 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::awt::XActionListener > mxActionListener; - - void InitDialog(); - -public : - - com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; }; - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; }; -}; - -class AboutActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener > -{ -public: - AboutActionListener( AboutDialog& rAboutDialog ) : mrAboutDialog( rAboutDialog ){}; - - 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: - - AboutDialog& mrAboutDialog; -}; - -#endif // ABOUTDIALOG_HXX diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 3c4dbf69895d..089c81f55a6a 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -265,7 +265,7 @@ void InformationDialog::InitDialog() Any( sal_True ), Any( sal_Int32( 245 ) ), Any( sal_Int32( 115 ) ), - Any( getString( STR_ABOUT2 ) ), + Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), Any( sal_Int32( DIALOG_WIDTH ) ) }; sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); @@ -321,7 +321,6 @@ void InformationDialog::InitDialog() const OUString aOldSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLDFILESIZE" ) ); const OUString aNewSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%NEWFILESIZE" ) ); const OUString aTitlePlaceholder( aTitle.getLength() ? OUString::createFromAscii( "%TITLE" ) : OUString::createFromAscii( "'%TITLE'" ) ); - const OUString aExtensionPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%EXTENSIONNAME" ) ); sal_Int32 i = aInfoString.indexOf( aOldSizePlaceholder, 0 ); if ( i >= 0 ) @@ -335,10 +334,6 @@ void InformationDialog::InitDialog() if ( k >= 0 ) aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); - sal_Int32 l = aInfoString.indexOf( aExtensionPlaceholder, 0 ); - if ( l >= 0 ) - aInfoString = aInfoString.replaceAt( l, aExtensionPlaceholder.getLength(), getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ); - 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 ); diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 8a3a385fc8f2..969a0cb1f248 100755 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -61,7 +61,6 @@ SLOFILES= $(SLO)$/unodialog.obj \ $(SLO)$/pppoptimizerdialog.obj \ $(SLO)$/fileopendialog.obj \ $(SLO)$/optimizationstats.obj \ - $(SLO)$/aboutdialog.obj \ $(SLO)$/graphiccollector.obj \ $(SLO)$/pagecollector.obj \ $(SLO)$/informationdialog.obj @@ -81,6 +80,8 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) +COMPONENT_XCU_REPLACEMENT=s/@MINIMIZEREXTENSIONPRODUCTNAME@/Presentation Minimizer/g + COMPONENT_MERGED_XCU= \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \ @@ -115,6 +116,18 @@ COMPONENT_HELP= \ # make sure to add your custom files here EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) +ZIP2TARGET= presentation_minimizer_develop +.IF "$(WITH_LANG)"!="" +ZIP2DIR= $(MISC)/$(EXTENSIONNAME)_in/merge +.ELSE # "$(WITH_LANG)"!="" +ZIP2DIR= registry/data +.ENDIF # "$(WITH_LANG)"!="" +ZIP2EXT= .zip +ZIP2FLAGS=-r +ZIP2LIST= \ + org/openoffice/Office/Addons.xcu \ + org/openoffice/Office/extension/*.xcu + # --- Targets ---------------------------------- .INCLUDE : extension_pre.mk diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 854d4d9cebcd..b56f82b10543 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -30,7 +30,6 @@ #include "pppoptimizerdialog.hxx" #include "optimizerdialog.hxx" -#include "aboutdialog.hxx" using namespace ::rtl; using namespace ::com::sun::star::uno; @@ -175,11 +174,6 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, if ( mpOptimizerDialog ) mpOptimizerDialog->UpdateStatus( rArguments ); } - else if ( rURL.Path.compareToAscii( "about" ) == 0 ) - { - AboutDialog aAboutDialog( mxMSF, mxFrame ); - aAboutDialog.execute(); - } } } diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index b36078ea2af4..e44116c02bf8 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -286,9 +286,6 @@ static const TokenTable pTokenTableArray[] = { "STR_DEFAULT_SESSION", STR_DEFAULT_SESSION }, { "STR_MODIFY_WARNING", STR_MODIFY_WARNING }, { "STR_YES", STR_YES }, - { "STR_ABOUT2", STR_ABOUT2 }, - { "STR_ABOUT_VERSION2", STR_ABOUT_VERSION2 }, - { "STR_ABOUT_PRN", STR_ABOUT_PRN }, { "STR_OK", STR_OK }, { "STR_INFO_1", STR_INFO_1 }, { "STR_INFO_2", STR_INFO_2 }, diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index 9f544dd1a5bf..553a771c05f3 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -262,9 +262,6 @@ enum PPPOptimizerTokenEnum STR_DEFAULT_SESSION, STR_MODIFY_WARNING, STR_YES, - STR_ABOUT2, - STR_ABOUT_VERSION2, - STR_ABOUT_PRN, STR_OK, STR_INFO_1, STR_INFO_2, 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 251818079fe5..08324953d32c 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 @@ -11,7 +11,7 @@ <node oor:name="Strings"> <prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2"> - <value xml:lang="en-US">Oracle Presentation Minimizer</value> + <value xml:lang="en-US">@MINIMIZEREXTENSIONPRODUCTNAME@</value> </prop> <prop oor:name="STR_STEPS"> <value xml:lang="en-US">Steps</value> @@ -35,12 +35,12 @@ <value xml:lang="en-US">Introduction</value> </prop> <prop oor:name="STR_INTRODUCTION_T"> - <value xml:lang="en-US">The Oracle Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed. + <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed. At the last step of the wizard you can choose to apply the changes to the current presentation or to create an optimized new version of the presentation.</value> </prop> <prop oor:name="STR_CHOSE_SETTINGS"> - <value xml:lang="en-US">~Choose settings for Oracle Presentation Minimizer</value> + <value xml:lang="en-US">~Choose settings for @MINIMIZEREXTENSIONPRODUCTNAME@</value> </prop> <prop oor:name="STR_REMOVE"> <value xml:lang="en-US">~Delete</value> @@ -181,32 +181,20 @@ The current presentation contains no OLE objects.</value> <prop oor:name="STR_YES"> <value xml:lang="en-US">~Yes</value> </prop> - <prop oor:name="STR_ABOUT2"> - <value xml:lang="en-US">Oracle Presentation Minimizer</value> - </prop> - <prop oor:name="STR_ABOUT_VERSION2"> - <value xml:lang="en-US">About Oracle Presentation Minimizer 1.0.2</value> - </prop> - <prop oor:name="STR_ABOUT_PRN"> - <value xml:lang="en-US">Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved. - -This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html - </value> - </prop> <prop oor:name="STR_OK"> <value xml:lang="en-US">OK</value> </prop> <prop oor:name="STR_INFO_1"> - <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value> + <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 oor:name="STR_INFO_2"> - <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value> + <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> <prop oor:name="STR_INFO_3"> - <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value> + <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_INFO_4"> - <value xml:lang="en-US">The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value> + <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_DUPLICATING_PRESENTATION"> <value xml:lang="en-US">Duplicating presentation...</value> diff --git a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs index 59c947750064..f121768e0e72 100644 --- a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs +++ b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs @@ -106,7 +106,7 @@ <prop oor:name="HelpFile" oor:type="xs:string"/> <group oor:name="Strings"> <prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2" oor:type="xs:string" oor:localized="true"> - <value>Oracle Presentation Minimizer</value> + <value>Presentation Minimizer</value> </prop> <prop oor:name="STR_STEPS" oor:type="xs:string" oor:localized="true"> <value>Steps</value> @@ -130,7 +130,7 @@ <value>Introduction</value> </prop> <prop oor:name="STR_INTRODUCTION_T" oor:type="xs:string" oor:localized="true"> - <value>The Oracle Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed. + <value>The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed and data, that is no longer needed, will be removed. At the last step of the wizard you can choose to apply the changes to the current presentation or to create an optimized new version of the presentation.</value> </prop> @@ -279,32 +279,20 @@ The current presentation contains no OLE objects.</value> <prop oor:name="STR_YES" oor:type="xs:string" oor:localized="true"> <value>~Yes</value> </prop> - <prop oor:name="STR_ABOUT2" oor:type="xs:string" oor:localized="true"> - <value>Oracle Presentation Minimizer</value> - </prop> - <prop oor:name="STR_ABOUT_VERSION2" oor:type="xs:string" oor:localized="true"> - <value>About Oracle Presentation Minimizer 1.0.2</value> - </prop> - <prop oor:name="STR_ABOUT_PRN" oor:type="xs:string" oor:localized="true"> - <value>Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved. - -This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html/value> - </value> - </prop> <prop oor:name="STR_OK" oor:type="xs:string" oor:localized="true"> <value>OK</value> </prop> <prop oor:name="STR_INFO_1" oor:type="xs:string" oor:localized="true"> - <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value> + <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_INFO_2" oor:type="xs:string" oor:localized="true"> - <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value> + <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_INFO_3" oor:type="xs:string" oor:localized="true"> - <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value> + <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed to %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_INFO_4" oor:type="xs:string" oor:localized="true"> - <value>The %EXTENSIONNAME has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value> + <value>The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed to approximated %NEWFILESIZE MB.</value> </prop> <prop oor:name="STR_DUPLICATING_PRESENTATION" oor:type="xs:string" oor:localized="true"> <value>Duplicating presentation...</value> diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp index a1172d540d7e..ba8f29bb497f 100644 --- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp +++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp @@ -33,16 +33,16 @@ <meta> <topic id="textpresenterxml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</title> + <title xml-lang="en-US" id="tit" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</title> <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename> </topic> </meta> <body> <bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/> -<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>Presenter Console shortcuts</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts</bookmark_value> </bookmark> -<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</paragraph> - <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Oracle Presenter Console, you can use the following keys:</paragraph> +<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</paragraph> + <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys:</paragraph> <table id="tbl_id0921200901051232"> <tablerow> <tablecell> @@ -158,7 +158,7 @@ </tablerow> <tablerow> <tablecell> - <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the Presenter Console</paragraph> + <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the @PRESENTEREXTENSIONPRODUCTNAME@</paragraph> </tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id0921200901104544" role="tablecontent" l10n="NEW">Ctrl-'1'</paragraph> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 08a3470fc24d..a26cf54b3694 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -32,11 +32,16 @@ GEN_HID=FALSE EXTNAME=PresenterScreen ENABLE_EXCEPTIONS=TRUE +# survive zip dependencies +MAXLINELENGTH:=80000 # --- Settings ---------------------------------- .INCLUDE : rtlbootstrap.mk .INCLUDE : settings.mk + +PACKAGE=com.sun.PresenterScreen-$(PLATFORMID) + .IF "$(L10N_framework)"=="" .INCLUDE : $(PRJ)$/util$/makefile.pmk @@ -107,6 +112,12 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) +ZIP2TARGET= presenter-screen_develop +ZIP2DIR= $(COMMONMISC) +ZIP2EXT= .zip +ZIP2FLAGS=-r +ZIP2LIST= */com.sun.PresenterScreen/*.xhp + ZIP1TARGET= presenter-screen ZIP1DIR= $(MISC)$/$(TARGET) ZIP1EXT= .oxt @@ -248,10 +259,6 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) COMPONENT_HELP= \ $(ZIP1DIR)$/help/component.txt \ $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) -# $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp - -# no localization yet - see #i107498# -# $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) ZIP1DEPS= \ $(PACKLICS) \ @@ -262,14 +269,25 @@ ZIP1DEPS= \ $(COMPONENT_IMAGES) \ $(COMPONENT_LIBRARY) \ $(COMPONENT_HELP) + # $(COMPONENT_MERGED_XCU) \ +LINKNAME:=help +XHPLINKSRC:=$(ZIP1DIR)/help + +my_XHPFILES= \ + presenter.xhp + +LINKLINKFILES= \ + $(PACKAGE)/{$(my_XHPFILES)} # --- Targets ---------------------------------- .ENDIF # L10N_framework .INCLUDE : target.mk +.INCLUDE : extension_helplink.mk + .IF "$(L10N_framework)"=="" $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx @@ -284,10 +302,12 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp +$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp @echo creating $@ - @@-$(MKDIRHIER) $(@:d) - $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" > $@ + @-$(MKDIRHIER) $(@:d) + $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ + +$(ZIP1TARGETN) : $(HELPLINKALLTARGETS) $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) @@ -370,7 +390,7 @@ DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp PHONYDESC=.PHONY .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)" $(DESCRIPTION) $(PHONYDESC) : $$(@:f) - @@-$(MKDIRHIER) $(@:d) + @-$(MKDIRHIER) $(@:d) $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ |