[Libreoffice-commits] .: sdext/source

Joseph Powers jpowers at kemper.freedesktop.org
Mon Dec 6 19:53:12 PST 2010


 sdext/source/minimizer/informationdialog.cxx |   13 ++++++------
 sdext/source/minimizer/optimizerdialog.cxx   |   29 +++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 968bdae89a2df2511ccc6c96f4eb15144d8ecd44
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Dec 6 19:53:07 2010 -0800

    Fix Trianry Issues
    
    They where giving me an error stating that the two sides where of
    different types.
    
    Informationdialog: I just changed it back to the old ones.
    optimizerdialg: I removed the HC icon reference (I thought we'd kill all
    of these before).

diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 36aef94..22f12d6 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
@@ -269,13 +269,13 @@ void InformationDialog::InitDialog()
         Any( sal_Int32( 115 ) ),
         Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
         Any( sal_Int32( DIALOG_WIDTH ) ) };
-    
+
     sal_Int32 nCount = SAL_N_ELEMENTS( pNames );
 
     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;
@@ -322,7 +322,8 @@ void InformationDialog::InitDialog()
     OUString aInfoString( getString( eInfoString ) );
     const OUString aOldSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLDFILESIZE" ) );
     const OUString aNewSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%NEWFILESIZE" ) );
-    const OUString aTitlePlaceholder( aTitle.getLength() ? RTL_CONSTASCII_USTRINGPARAM("%TITLE") : RTL_CONSTASCII_USTRINGPARAM("'%TITLE'") );
+    const OUString aTitlePlaceholder( aTitle.getLength() ? OUString::createFromAscii("%TITLE"  )
+                                                         : OUString::createFromAscii("'%TITLE'") );
 
     sal_Int32 i = aInfoString.indexOf( aOldSizePlaceholder, 0 );
     if ( i >= 0 )
@@ -336,7 +337,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(RTL_CONSTASCII_USTRINGPARAM("aboutimage")) ), ImpGetStandardImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:standardimage/query")) ), 5, 5, 25, 25 );
     InsertFixedText( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext")) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
     if ( maSaveAsURL.getLength() )
@@ -364,7 +365,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/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index c58f490..c5439df 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
@@ -80,13 +80,13 @@ void OptimizerDialog::InitDialog()
         Any( sal_Int32( 52 ) ),
         Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
         Any( sal_Int32( OD_DIALOG_WIDTH ) ) };
-    
+
     sal_Int32 nCount = SAL_N_ELEMENTS( pNames );
 
     Sequence< rtl::OUString >	aNames( pNames, nCount );
     Sequence< Any >				aValues( pValues, nCount );
 
-    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); 
+    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
 }
 
 // -----------------------------------------------------------------------------
@@ -129,8 +129,7 @@ void OptimizerDialog::InitRoadmap()
         InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
 
         rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) );
-        rtl::OUString sBitmap( isHighContrast() ? RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80_h.png")
-                                                : RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80.png") );
+        rtl::OUString sBitmap( RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80.png") );
         rtl::OUString sURL( sBitmapPath += sBitmap );
 
         xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) );
@@ -175,7 +174,7 @@ void OptimizerDialog::UpdateConfiguration()
 
     Sequence< sal_Int16 > aSelectedItems;
     Sequence< OUString > aStringItemList;
-        
+
     // page0
     aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) );
     if ( aAny >>= aSelectedItems )
@@ -283,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 );
 
@@ -548,7 +547,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                     Reference< XLayoutManager > xLayoutManager;
                     if ( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLayoutManager )
                     {
-                        xLayoutManager->setVisible( sal_False );                    
+                        xLayoutManager->setVisible( sal_False );
                         xLayoutManager->hideElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")) );
                         xLayoutManager->destroyElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) );
                     }
@@ -561,7 +560,7 @@ 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_btnNavNext :	mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break;
         case TK_btnNavFinish :
         {
             mrOptimizerDialog.UpdateConfiguration();
@@ -575,7 +574,7 @@ 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 
+            // 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;
@@ -782,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 ) );
     }
 }
@@ -796,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 */ )


More information about the Libreoffice-commits mailing list