diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
commit | 99effbc418feee675b6fd54a07c2f68d927de469 (patch) | |
tree | b9a415494780c6cb86d0dfcf2d69a9da9cc436bd /sdext/source/minimizer/optimizerdialog.cxx | |
parent | f76f752dc908cfbab1cade605fe4f742233dfa6d (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 01c917c0bdbb833cda4a0a77bc10264c4d40fcd5 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:16 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 983cd7d8b4d9c87f872472343f8399cb640cfb9a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 12 10:03:30 2011 +0100
fix presenter screens description.xml build
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit cb68579984b772fcbccd673f9cf930b4828d6fde
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: extensions_libreoffice-3.3.0.4
Diffstat (limited to 'sdext/source/minimizer/optimizerdialog.cxx')
-rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
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 */ ) |