[Libreoffice-commits] core.git: 6 commits - include/tools sdext/source
Stephan Bergmann
sbergman at redhat.com
Tue Oct 15 00:28:20 PDT 2013
include/tools/ref.hxx | 17
sdext/source/minimizer/configurationaccess.cxx | 84 ++--
sdext/source/minimizer/configurationaccess.hxx | 2
sdext/source/minimizer/fileopendialog.cxx | 6
sdext/source/minimizer/graphiccollector.cxx | 44 +-
sdext/source/minimizer/impoptimizer.cxx | 92 ++---
sdext/source/minimizer/informationdialog.cxx | 84 ++--
sdext/source/minimizer/optimizerdialog.cxx | 174 +++++-----
sdext/source/minimizer/optimizerdialog.hxx | 3
sdext/source/minimizer/optimizerdialogcontrols.cxx | 362 ++++++++++-----------
sdext/source/minimizer/pppoptimizertoken.cxx | 6
sdext/source/minimizer/pppoptimizertoken.hxx | 1
12 files changed, 432 insertions(+), 443 deletions(-)
New commits:
commit 71b2bf62d625b67696f612c30e214e71f36a5471
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 14 22:50:26 2013 +0200
Remove unnecessary TK_Last
Change-Id: Ia5095646f01a76258d69df866e3c803f8691915b
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index f4d8b40..874206c 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -278,7 +278,6 @@ static const TokenTable pTokenTableArray[] =
{ "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS },
{ "STR_FileSizeSeparator", STR_FILESIZESEPARATOR },
- { "Last", TK_Last },
{ "NotFound", TK_NotFound }
};
@@ -312,10 +311,7 @@ PPPOptimizerTokenEnum TKGet( const OUString& rToken )
OUString TKGet( const PPPOptimizerTokenEnum eToken )
{
- sal_uInt32 i = eToken >= TK_Last
- ? (sal_uInt32)TK_NotFound
- : (sal_uInt32)eToken;
- return OUString::createFromAscii( pTokenTableArray[ i ].pS );
+ return OUString::createFromAscii( pTokenTableArray[ eToken ].pS );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 6d97989..a3fdb0a 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -262,7 +262,6 @@ enum PPPOptimizerTokenEnum
STR_CREATING_OLE_REPLACEMENTS,
STR_FILESIZESEPARATOR,
- TK_Last,
TK_NotFound
};
commit 2f7492ad67222759006ad4f7e1fdd86147278729
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 14 22:44:03 2013 +0200
Small simplification (and exit loop early)
Change-Id: I076307174fdd63b58a8cb9c9690f50dae746c289
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 31a5422..e7f42d4 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -132,10 +132,10 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
Sequence< OUString > aExtensions;
for ( int i = 0; i < aTypeProperties.getLength(); i++ )
{
- switch( TKGet( aTypeProperties[ i ].Name ) )
+ if( aTypeProperties[ i ].Name == "Extensions" )
{
- case TK_Extensions : aTypeProperties[ i ].Value >>= aExtensions; break;
- default: break;
+ aTypeProperties[ i ].Value >>= aExtensions;
+ break;
}
}
if ( aExtensions.getLength() )
commit 124f5981d800d9159565d953f82475daf7be68df
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 14 22:37:15 2013 +0200
Simplify PPPOptimizerTokenEnum -> OUString
Change-Id: I8be2a1d603afd26de11e737586590ebb7adcbc42
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 85874fd..0a5bdf6 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -309,14 +309,14 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage )
// -----------------------------------------------------------------------------
-OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken )
+OUString OptimizerDialog::GetSelectedString( OUString const & token )
{
OUString aSelectedItem;
Sequence< sal_Int16 > sSelectedItems;
Sequence< OUString > sItemList;
- if ( ( getControlProperty( TKGet( eToken ), "SelectedItems" ) >>= sSelectedItems ) &&
- ( getControlProperty( TKGet( eToken ), "StringItemList" ) >>= sItemList ) )
+ if ( ( getControlProperty( token, "SelectedItems" ) >>= sSelectedItems ) &&
+ ( getControlProperty( token, "StringItemList" ) >>= sItemList ) )
{
if ( sSelectedItems.getLength() == 1 )
{
@@ -624,7 +624,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break;
case TK_Button0Pg0 : // delete configuration
{
- OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( TK_ListBox0Pg0 ) );
+ OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( "ListBox0Pg0" ) );
if ( !aSelectedItem.isEmpty() )
{
std::vector< OptimizerSettings >::iterator aIter( mrOptimizerDialog.GetOptimizerSettingsByName( aSelectedItem ) );
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index ff711ba..cdb500a 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -22,7 +22,6 @@
#include "optimizerdialog.hrc"
#include <vector>
#include "unodialog.hxx"
-#include "pppoptimizertoken.hxx"
#include "optimizationstats.hxx"
#include "configurationaccess.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -122,7 +121,7 @@ public :
void SwitchPage( sal_Int16 nNewStep );
void UpdateControlStates( sal_Int16 nStep = -1 );
- OUString GetSelectedString( PPPOptimizerTokenEnum eListBox );
+ OUString GetSelectedString( OUString const & token );
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
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 mxContext; };
commit cd10abe0ba3b7c6fa5657359506a5d8dd6076dd2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 14 22:21:08 2013 +0200
Simplify PPPOptimizerTokenEnum -> OUString
Change-Id: I88176f00c5fb356d63ecfdd291c006e88606a604
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 817e83b..527aff2 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -162,15 +162,15 @@ ConfigurationAccess::~ConfigurationAccess()
{
}
-OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken )
+OUString ConfigurationAccess::getPath( OUString const & token )
{
OUString aPath;
try
{
static const OUString sProtocol( "vnd.sun.star.expand:" );
Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW );
- if ( xSet->hasByName( TKGet( eToken ) ) )
- xSet->getByName( TKGet( eToken ) ) >>= aPath;
+ if ( xSet->hasByName( token ) )
+ xSet->getByName( token ) >>= aPath;
if ( aPath.match( sProtocol, 0 ) )
{
OUString aTmp( aPath.copy( 20 ) );
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 08785cf..214cc928 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -87,7 +87,7 @@ class ConfigurationAccess
~ConfigurationAccess();
void SaveConfiguration();
- OUString getPath( const PPPOptimizerTokenEnum );
+ OUString getPath( OUString const & token );
OUString getString( const PPPOptimizerTokenEnum ) const;
// access to current OptimizerSettings (stored in the first entry of maSettings)
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index e708543..85874fd 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -118,7 +118,7 @@ void OptimizerDialog::InitRoadmap()
InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
- OUString sBitmapPath( getPath( TK_BitmapPath ) );
+ OUString sBitmapPath( getPath( "BitmapPath" ) );
OUString sBitmap( "/minimizepresi_80.png" );
OUString sURL( sBitmapPath += sBitmap );
commit 3eb84bcb4580af50c2ded9f48749384b8455258e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 14 22:14:14 2013 +0200
Simplify TKGet(TK_FOO) -> "FOO"
Change-Id: I06e3134aeef27f13969f6d9d7d81b916bc93e8e2
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 2c0e38d..817e83b 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
if ( rSettings.is() )
{
OUString pNames[] = {
- TKGet( TK_Name ),
- TKGet( TK_JPEGCompression ),
- TKGet( TK_JPEGQuality ),
- TKGet( TK_RemoveCropArea ),
- TKGet( TK_ImageResolution ),
- TKGet( TK_EmbedLinkedGraphics ),
- TKGet( TK_OLEOptimization ),
- TKGet( TK_OLEOptimizationType ),
- TKGet( TK_DeleteUnusedMasterPages ),
- TKGet( TK_DeleteHiddenSlides ),
- TKGet( TK_DeleteNotesPages ),
- TKGet( TK_SaveAs ),
-// TKGet( TK_SaveAsURL ),
-// TKGet( TK_FilterName ),
- TKGet( TK_OpenNewDocument ) };
+ "Name",
+ "JPEGCompression",
+ "JPEGQuality",
+ "RemoveCropArea",
+ "ImageResolution",
+ "EmbedLinkedGraphics",
+ "OLEOptimization",
+ "OLEOptimizationType",
+ "DeleteUnusedMasterPages",
+ "DeleteHiddenSlides",
+ "DeleteNotesPages",
+ "SaveAs",
+// "SaveAsURL",
+// "FilterName",
+ "OpenNewDocument" };
Any pValues[] = {
Any( maName ),
@@ -153,7 +153,7 @@ ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContex
LoadStrings();
maSettings.push_back( pDefaultSettings ?
*pDefaultSettings : OptimizerSettings() );
- maSettings.back().maName = TKGet( TK_LastUsedSettings );
+ maSettings.back().maName = "LastUsedSettings";
LoadConfiguration();
maInitialSettings = maSettings;
};
@@ -199,7 +199,7 @@ void ConfigurationAccess::LoadStrings()
Reference< XInterface > xRoot( OpenConfiguration( true ) );
if ( !xRoot.is() )
break;
- Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, TKGet( TK_Strings ) ), UNO_QUERY );
+ Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, "Strings" ), UNO_QUERY );
if ( xSet.is() )
{
const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -233,13 +233,13 @@ void ConfigurationAccess::LoadConfiguration()
Reference< XInterface > xRoot( OpenConfiguration( true ) );
if ( !xRoot.is() )
break;
- Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, TKGet( TK_LastUsedSettings ) ), UNO_QUERY );
+ Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, "LastUsedSettings" ), UNO_QUERY );
if ( xSet.is() )
{
OptimizerSettings& rCurrent( maSettings.front() );
rCurrent.LoadSettingsFromConfiguration( xSet );
}
- xSet = Reference< container::XNameAccess >( GetConfigurationNode( xRoot, TKGet( TK_Settings_Templates ) ), UNO_QUERY );
+ xSet = Reference< container::XNameAccess >( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY );
if ( xSet.is() )
{
const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -247,7 +247,7 @@ void ConfigurationAccess::LoadConfiguration()
{
try
{
- OUString aPath( TKGet( TK_Settings_Templates_ ).concat( aElements[ i ] ) );
+ OUString aPath( "Settings/Templates/" + aElements[ i ] );
Reference< container::XNameAccess > xTemplates( GetConfigurationNode( xRoot, aPath ), UNO_QUERY );
if ( xTemplates.is() )
{
@@ -279,12 +279,12 @@ void ConfigurationAccess::SaveConfiguration()
Reference<util::XChangesBatch> xRoot( OpenConfiguration( false ), UNO_QUERY_THROW );
// storing the last used settings
- Reference< container::XNameReplace > xSet( GetConfigurationNode( xRoot, TKGet( TK_LastUsedSettings ) ), UNO_QUERY_THROW );
+ Reference< container::XNameReplace > xSet( GetConfigurationNode( xRoot, "LastUsedSettings" ), UNO_QUERY_THROW );
OptimizerSettings& rCurrent( maSettings.front() );
rCurrent.SaveSettingsToConfiguration( xSet );
// updating template elements
- xSet = Reference< container::XNameReplace >( GetConfigurationNode( xRoot, TKGet( TK_Settings_Templates ) ), UNO_QUERY_THROW );
+ xSet = Reference< container::XNameReplace >( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY_THROW );
Reference< container::XNameContainer > xNameContainer( xSet, UNO_QUERY_THROW );
const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -294,12 +294,12 @@ void ConfigurationAccess::SaveConfiguration()
for( k = 1; k < maSettings.size(); k++ )
{
OptimizerSettings& rSettings( maSettings[ k ] );
- OUString aElementName( TKGet( TK_Template ).concat( OUString::number( k ) ) );
+ OUString aElementName( "Template" + OUString::number( k ) );
Reference< lang::XSingleServiceFactory > xChildFactory ( xSet, UNO_QUERY_THROW );
Reference< container::XNameReplace > xChild( xChildFactory->createInstance(), UNO_QUERY_THROW );
xNameContainer->insertByName( aElementName, Any( xChild ) );
- OUString aPath( TKGet( TK_Settings_Templates_ ).concat( aElementName ) );
+ OUString aPath( "Settings/Templates/" + aElementName );
Reference< container::XNameReplace > xTemplates( GetConfigurationNode( xRoot, aPath ), UNO_QUERY );
rSettings.SaveSettingsToConfiguration( xTemplates );
}
@@ -468,35 +468,35 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence()
{
Sequence< PropertyValue > aRet( 15 );
OptimizerSettings& rSettings( maSettings.front() );
- aRet[ 0 ].Name = TKGet( TK_JPEGCompression );
+ aRet[ 0 ].Name = "JPEGCompression";
aRet[ 0 ].Value= Any( rSettings.mbJPEGCompression );
- aRet[ 1 ].Name = TKGet( TK_JPEGQuality );
+ aRet[ 1 ].Name = "JPEGQuality";
aRet[ 1 ].Value= Any( rSettings.mnJPEGQuality );
- aRet[ 2 ].Name = TKGet( TK_RemoveCropArea );
+ aRet[ 2 ].Name = "RemoveCropArea";
aRet[ 2 ].Value= Any( rSettings.mbRemoveCropArea );
- aRet[ 3 ].Name = TKGet( TK_ImageResolution );
+ aRet[ 3 ].Name = "ImageResolution";
aRet[ 3 ].Value= Any( rSettings.mnImageResolution );
- aRet[ 4 ].Name = TKGet( TK_EmbedLinkedGraphics );
+ aRet[ 4 ].Name = "EmbedLinkedGraphics";
aRet[ 4 ].Value= Any( rSettings.mbEmbedLinkedGraphics );
- aRet[ 5 ].Name = TKGet( TK_OLEOptimization );
+ aRet[ 5 ].Name = "OLEOptimization";
aRet[ 5 ].Value= Any( rSettings.mbOLEOptimization );
- aRet[ 6 ].Name = TKGet( TK_OLEOptimizationType );
+ aRet[ 6 ].Name = "OLEOptimizationType";
aRet[ 6 ].Value= Any( rSettings.mnOLEOptimizationType );
- aRet[ 7 ].Name = TKGet( TK_DeleteUnusedMasterPages );
+ aRet[ 7 ].Name = "DeleteUnusedMasterPages";
aRet[ 7 ].Value= Any( rSettings.mbDeleteUnusedMasterPages );
- aRet[ 8 ].Name = TKGet( TK_DeleteHiddenSlides );
+ aRet[ 8 ].Name = "DeleteHiddenSlides";
aRet[ 8 ].Value= Any( rSettings.mbDeleteHiddenSlides );
- aRet[ 9 ].Name = TKGet( TK_DeleteNotesPages );
+ aRet[ 9 ].Name = "DeleteNotesPages";
aRet[ 9 ].Value= Any( rSettings.mbDeleteNotesPages );
- aRet[ 10].Name = TKGet( TK_CustomShowName );
+ aRet[ 10].Name = "CustomShowName";
aRet[ 10].Value= Any( rSettings.maCustomShowName );
- aRet[ 11].Name = TKGet( TK_SaveAsURL );
+ aRet[ 11].Name = "SaveAsURL";
aRet[ 11].Value= Any( rSettings.maSaveAsURL );
- aRet[ 12].Name = TKGet( TK_FilterName );
+ aRet[ 12].Name = "FilterName";
aRet[ 12].Value= Any( rSettings.maFilterName );
- aRet[ 13].Name = TKGet( TK_OpenNewDocument );
+ aRet[ 13].Name = "OpenNewDocument";
aRet[ 13].Value= Any( rSettings.mbOpenNewDocument );
- aRet[ 14].Name = TKGet( TK_EstimatedFileSize );
+ aRet[ 14].Name = "EstimatedFileSize";
aRet[ 14].Value= Any( rSettings.mnEstimatedFileSize );
return aRet;
}
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index b488ed8..abd9586 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -93,16 +93,16 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference
{
Reference< XGraphic > xGraphic;
Reference< XPropertySet > xShapePropertySet( rxShape, UNO_QUERY_THROW );
- if ( xShapePropertySet->getPropertyValue( TKGet( TK_Graphic ) ) >>= xGraphic )
+ if ( xShapePropertySet->getPropertyValue( "Graphic" ) >>= xGraphic )
{
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
GraphicCollector::GraphicUser aUser;
aUser.mxShape = rxShape;
aUser.mbFillBitmap = sal_False;
- xShapePropertySet->getPropertyValue( TKGet( TK_GraphicURL ) ) >>= aUser.maGraphicURL;
- xShapePropertySet->getPropertyValue( TKGet( TK_GraphicStreamURL ) ) >>= aUser.maGraphicStreamURL;
- xShapePropertySet->getPropertyValue( TKGet( TK_GraphicCrop ) ) >>= aGraphicCropLogic;
+ xShapePropertySet->getPropertyValue( "GraphicURL" ) >>= aUser.maGraphicURL;
+ xShapePropertySet->getPropertyValue( "GraphicStreamURL" ) >>= aUser.maGraphicStreamURL;
+ xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic;
awt::Size aLogicalSize( rxShape->getSize() );
// calculating the logical size, as if there were no cropping
@@ -133,12 +133,12 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
try
{
FillStyle eFillStyle;
- if ( rxPropertySet->getPropertyValue( TKGet( TK_FillStyle ) ) >>= eFillStyle )
+ if ( rxPropertySet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
Reference< XBitmap > xFillBitmap;
- if ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmap ) ) >>= xFillBitmap )
+ if ( rxPropertySet->getPropertyValue( "FillBitmap" ) >>= xFillBitmap )
{
Reference< XGraphic > xGraphic( xFillBitmap, UNO_QUERY_THROW );
if ( xGraphic.is() )
@@ -147,18 +147,18 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
Reference< XPropertySetInfo > axPropSetInfo( rxPropertySet->getPropertySetInfo() );
if ( axPropSetInfo.is() )
{
- if ( axPropSetInfo->hasPropertyByName( TKGet( TK_FillBitmapMode ) ) )
+ if ( axPropSetInfo->hasPropertyByName( "FillBitmapMode" ) )
{
BitmapMode eBitmapMode;
- if ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapMode ) ) >>= eBitmapMode )
+ if ( rxPropertySet->getPropertyValue( "FillBitmapMode" ) >>= eBitmapMode )
{
if ( ( eBitmapMode == BitmapMode_REPEAT ) || ( eBitmapMode == BitmapMode_NO_REPEAT ) )
{
sal_Bool bLogicalSize = sal_False;
awt::Size aSize( 0, 0 );
- if ( ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapLogicalSize ) ) >>= bLogicalSize )
- && ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapSizeX ) ) >>= aSize.Width )
- && ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapSizeY ) ) >>= aSize.Height ) )
+ if ( ( rxPropertySet->getPropertyValue( "FillBitmapLogicalSize" ) >>= bLogicalSize )
+ && ( rxPropertySet->getPropertyValue( "FillBitmapSizeX" ) >>= aSize.Width )
+ && ( rxPropertySet->getPropertyValue( "FillBitmapSizeY" ) >>= aSize.Height ) )
{
if ( bLogicalSize )
{
@@ -183,7 +183,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
}
GraphicCollector::GraphicUser aUser;
aUser.mxPropertySet = rxPropertySet;
- rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapURL ) ) >>= aUser.maGraphicURL;
+ rxPropertySet->getPropertyValue( "FillBitmapURL" ) >>= aUser.maGraphicURL;
aUser.mbFillBitmap = sal_True;
aUser.maLogicalSize = aLogicalSize;
aUser.mxPagePropertySet = rxPagePropertySet;
@@ -204,11 +204,11 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, c
{
awt::Size aLogicalSize( 28000, 21000 );
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
- xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
- xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
+ xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
+ xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
Reference< XPropertySet > xBackgroundPropSet;
- if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
+ if ( xPropertySet->getPropertyValue( "Background" ) >>= xBackgroundPropSet )
ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
}
catch( Exception& )
@@ -252,12 +252,12 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
{
awt::Size aSize100thMM( 0, 0 );
Reference< XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW );
- if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Size100thMM ) ) >>= aSize100thMM )
+ if ( xGraphicPropertySet->getPropertyValue( "Size100thMM" ) >>= aSize100thMM )
{
if ( !aSize100thMM.Width && !aSize100thMM.Height )
{ // MAPMODE_PIXEL USED :-(
awt::Size aSourceSizePixel( 0, 0 );
- if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel )
+ if ( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>= aSourceSizePixel )
{
const DeviceInfo& rDeviceInfo( GraphicCollector::GetDeviceInfo( rxMSF ) );
if ( rDeviceInfo.PixelPerMeterX && rDeviceInfo.PixelPerMeterY )
@@ -364,7 +364,7 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const
Reference< XPropertySet > xEmptyPagePropSet;
Reference< XPropertySet > xShapePropertySet( xShape, UNO_QUERY_THROW );
FillStyle eFillStyle;
- if ( xShapePropertySet->getPropertyValue( TKGet( TK_FillStyle ) ) >>= eFillStyle )
+ if ( xShapePropertySet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
@@ -385,14 +385,14 @@ void ImpCountBackgroundGraphic(
{
awt::Size aLogicalSize( 28000, 21000 );
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
- xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
- xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
+ xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
+ xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
Reference< XPropertySet > xBackgroundPropSet;
- if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
+ if ( xPropertySet->getPropertyValue( "Background" ) >>= xBackgroundPropSet )
{
FillStyle eFillStyle;
- if ( xBackgroundPropSet->getPropertyValue( TKGet( TK_FillStyle ) ) >>= eFillStyle )
+ if ( xBackgroundPropSet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 86828a4..2925053 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -185,13 +185,13 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati
if ( nOLEOptimizationType == 1 )
{
sal_Bool bIsInternal = sal_True;
- xPropSet->getPropertyValue( TKGet( TK_IsInternal ) ) >>= bIsInternal;
+ xPropSet->getPropertyValue( "IsInternal" ) >>= bIsInternal;
bConvertOLE = !bIsInternal;
}
if ( bConvertOLE )
{
Reference< XGraphic > xGraphic;
- if ( xPropSet->getPropertyValue( TKGet( TK_Graphic ) ) >>= xGraphic )
+ if ( xPropSet->getPropertyValue( "Graphic" ) >>= xGraphic )
{
const OUString sGraphicShape( "com.sun.star.drawing.GraphicObjectShape" );
Reference< XMultiServiceFactory > xFact( rxModel, UNO_QUERY_THROW );
@@ -200,9 +200,9 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati
xShape2->setPosition( xShape->getPosition() );
xShape2->setSize( xShape->getSize() );
Reference< XPropertySet > xPropSet2( xShape2, UNO_QUERY_THROW );
- xPropSet2->setPropertyValue( TKGet( TK_Graphic ), Any( xGraphic ) );
+ xPropSet2->setPropertyValue( "Graphic", Any( xGraphic ) );
xShapes->remove( xShape );
- xPropSet2->setPropertyValue( TKGet( TK_ZOrder ), Any( j ) );
+ xPropSet2->setPropertyValue( "ZOrder", Any( j ) );
}
}
}
@@ -222,29 +222,29 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
if ( rxGraphicProvider.is() && rxOutputStream.is() )
{
Sequence< PropertyValue > aFilterData( 8 );
- aFilterData[ 0 ].Name = TKGet( TK_ImageResolution );
+ aFilterData[ 0 ].Name = "ImageResolution";
aFilterData[ 0 ].Value <<= nImageResolution;
- aFilterData[ 1 ].Name = TKGet( TK_ColorMode ); // todo: jpeg color mode (0->true color, 1->greyscale)
+ aFilterData[ 1 ].Name = "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 = "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 = "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 = "Interlaced"; // interlaced is turned off if we export to png
aFilterData[ 4 ].Value <<= (sal_Int32)0;
- aFilterData[ 5 ].Name = TKGet( TK_LogicalSize );
+ aFilterData[ 5 ].Name = "LogicalSize";
aFilterData[ 5 ].Value <<= rLogicalSize;
- aFilterData[ 6 ].Name = TKGet( TK_RemoveCropArea );
+ aFilterData[ 6 ].Name = "RemoveCropArea";
aFilterData[ 6 ].Value <<= bRemoveCropping;
- aFilterData[ 7 ].Name = TKGet( TK_GraphicCropLogic );
+ aFilterData[ 7 ].Name = "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 = "MimeType"; // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
aArgs[ 0 ].Value <<= rDestMimeType;
- aArgs[ 1 ].Name = TKGet( TK_OutputStream );
+ aArgs[ 1 ].Name = "OutputStream";
aArgs[ 1 ].Value <<= rxOutputStream;
- aArgs[ 2 ].Name = TKGet( TK_FilterData );
+ aArgs[ 2 ].Name = "FilterData";
aArgs[ 2 ].Value <<= aFilterData;
rxGraphicProvider->storeGraphic( rxGraphic, aArgs );
@@ -264,7 +264,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
{
OUString aSourceMimeType;
Reference< XPropertySet > xGraphicPropertySet( xGraphic, UNO_QUERY_THROW );
- if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_MimeType ) ) >>= aSourceMimeType )
+ if ( xGraphicPropertySet->getPropertyValue( "MimeType" ) >>= aSourceMimeType )
{
sal_Int8 nGraphicType( xGraphic->getType() );
if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL )
@@ -276,10 +276,10 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
awt::Size aSourceSizePixel( 0, 0 );
text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
- if ( ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel ) &&
- ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Transparent ) ) >>= bTransparent ) &&
- ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Alpha ) ) >>= bAlpha ) &&
- ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Animated ) ) >>= bAnimated ) )
+ if ( ( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>= aSourceSizePixel ) &&
+ ( xGraphicPropertySet->getPropertyValue( "Transparent" ) >>= bTransparent ) &&
+ ( xGraphicPropertySet->getPropertyValue( "Alpha" ) >>= bAlpha ) &&
+ ( xGraphicPropertySet->getPropertyValue( "Animated" ) >>= bAnimated ) )
{
awt::Size aDestSizePixel( aSourceSizePixel );
if ( !bAnimated )
@@ -348,7 +348,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
xSeekable->seek( 0 );
Sequence< PropertyValue > aArgs( 1 );
- aArgs[ 0 ].Name = TKGet( TK_InputStream );
+ aArgs[ 0 ].Name = "InputStream";
aArgs[ 0 ].Value <<= xInputStream;
xNewGraphic = xGraphicProvider->queryGraphic( aArgs );
}
@@ -367,7 +367,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
xSeekable->seek( 0 );
Sequence< PropertyValue > aArgs( 1 );
- aArgs[ 0 ].Name = TKGet( TK_InputStream );
+ aArgs[ 0 ].Name = "InputStream";
aArgs[ 0 ].Value <<= xInputStream;
xNewGraphic = xGraphicProvider->queryGraphic( aArgs );
}
@@ -403,13 +403,13 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
if ( aGraphicIter->maUser[ 0 ].mbFillBitmap && aGraphicIter->maUser[ 0 ].mxPropertySet.is() )
{
Reference< XBitmap > xFillBitmap;
- if ( aGraphicIter->maUser[ 0 ].mxPropertySet->getPropertyValue( TKGet( TK_FillBitmap ) ) >>= xFillBitmap )
+ if ( aGraphicIter->maUser[ 0 ].mxPropertySet->getPropertyValue( "FillBitmap" ) >>= xFillBitmap )
xGraphic = Reference< XGraphic >( xFillBitmap, UNO_QUERY_THROW );
}
else if ( aGraphicIter->maUser[ 0 ].mxShape.is() )
{
Reference< XPropertySet > xShapePropertySet( aGraphicIter->maUser[ 0 ].mxShape, UNO_QUERY_THROW );
- xShapePropertySet->getPropertyValue( TKGet( TK_Graphic ) ) >>= xGraphic;
+ xShapePropertySet->getPropertyValue( "Graphic" ) >>= xGraphic;
}
if ( xGraphic.is() )
{
@@ -426,8 +426,8 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
{
OUString sEmptyGraphicURL;
Reference< XPropertySet > xShapePropertySet( aGraphicUserIter->mxShape, UNO_QUERY_THROW );
- xShapePropertySet->setPropertyValue( TKGet( TK_GraphicURL ), Any( sEmptyGraphicURL ) );
- xShapePropertySet->setPropertyValue( TKGet( TK_Graphic ), Any( xNewGraphic ) );
+ xShapePropertySet->setPropertyValue( "GraphicURL", Any( sEmptyGraphicURL ) );
+ xShapePropertySet->setPropertyValue( "Graphic", Any( xNewGraphic ) );
if ( aGraphicUserIter->maGraphicCropLogic.Left || aGraphicUserIter->maGraphicCropLogic.Top
|| aGraphicUserIter->maGraphicCropLogic.Right || aGraphicUserIter->maGraphicCropLogic.Bottom )
@@ -441,7 +441,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
aGraphicCropLogic.Right = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Right * ((double)aNewSize.Width / (double)aSize100thMM.Width));
aGraphicCropLogic.Bottom = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Bottom * ((double)aNewSize.Height / (double)aSize100thMM.Height));
}
- xShapePropertySet->setPropertyValue( TKGet( TK_GraphicCrop ), Any( aGraphicCropLogic ) );
+ xShapePropertySet->setPropertyValue( "GraphicCrop", Any( aGraphicCropLogic ) );
}
}
else if ( aGraphicUserIter->mxPropertySet.is() )
@@ -453,20 +453,20 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
sal_Bool bLogicalSize;
Reference< XPropertySet >& rxPropertySet( aGraphicUserIter->mxPropertySet );
- rxPropertySet->setPropertyValue( TKGet( TK_FillBitmap ), Any( xFillBitmap ) );
- if ( ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapLogicalSize ) ) >>= bLogicalSize )
- && ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapSizeX ) ) >>= aSize.Width )
- && ( rxPropertySet->getPropertyValue( TKGet( TK_FillBitmapSizeY ) ) >>= aSize.Height ) )
+ rxPropertySet->setPropertyValue( "FillBitmap", Any( xFillBitmap ) );
+ if ( ( rxPropertySet->getPropertyValue( "FillBitmapLogicalSize" ) >>= bLogicalSize )
+ && ( rxPropertySet->getPropertyValue( "FillBitmapSizeX" ) >>= aSize.Width )
+ && ( rxPropertySet->getPropertyValue( "FillBitmapSizeY" ) >>= aSize.Height ) )
{
if ( !aSize.Width || !aSize.Height )
{
- rxPropertySet->setPropertyValue( TKGet( TK_FillBitmapLogicalSize ), Any( sal_True ) );
- rxPropertySet->setPropertyValue( TKGet( TK_FillBitmapSizeX ), Any( aGraphicUserIter->maLogicalSize.Width ) );
- rxPropertySet->setPropertyValue( TKGet( TK_FillBitmapSizeY ), Any( aGraphicUserIter->maLogicalSize.Height ) );
+ rxPropertySet->setPropertyValue( "FillBitmapLogicalSize", Any( sal_True ) );
+ rxPropertySet->setPropertyValue( "FillBitmapSizeX", Any( aGraphicUserIter->maLogicalSize.Width ) );
+ rxPropertySet->setPropertyValue( "FillBitmapSizeY", Any( aGraphicUserIter->maLogicalSize.Height ) );
}
}
if ( aGraphicUserIter->mxPagePropertySet.is() )
- aGraphicUserIter->mxPagePropertySet->setPropertyValue( TKGet( TK_Background ), Any( rxPropertySet ) );
+ aGraphicUserIter->mxPagePropertySet->setPropertyValue( "Background", Any( rxPropertySet ) );
}
}
++aGraphicUserIter;
@@ -533,7 +533,7 @@ sal_Bool ImpOptimizer::Optimize()
if ( mbDeleteUnusedMasterPages )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
ImpDeleteUnusedMasterPages( mxModel );
}
@@ -541,14 +541,14 @@ sal_Bool ImpOptimizer::Optimize()
if ( mbDeleteHiddenSlides )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
ImpDeleteHiddenSlides( mxModel );
}
if ( mbDeleteNotesPages )
{
- SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
DispatchStatus();
ImpDeleteNotesPages( mxModel );
}
@@ -556,7 +556,7 @@ sal_Bool ImpOptimizer::Optimize()
if ( mbOLEOptimization )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_CREATING_OLE_REPLACEMENTS ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_CREATING_OLE_REPLACEMENTS") ) );
DispatchStatus();
ImpConvertOLE( mxModel, mnOLEOptimizationType );
}
@@ -564,7 +564,7 @@ sal_Bool ImpOptimizer::Optimize()
if ( mbJPEGCompression || mbRemoveCropArea || mnImageResolution )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 50 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_OPTIMIZING_GRAPHICS ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_OPTIMIZING_GRAPHICS") ) );
DispatchStatus();
std::vector< GraphicCollector::GraphicEntity > aGraphicList;
@@ -656,7 +656,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_DUPLICATING_PRESENTATION") ) );
DispatchStatus();
Reference< XStorable >xStorable( mxModel, UNO_QUERY );
@@ -670,7 +670,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
int nLength = aArguments.getLength();
aArguments.realloc( nLength + 1 );
- aArguments[ nLength ].Name = TKGet( TK_FilterName );
+ aArguments[ nLength ].Name = "FilterName";
aArguments[ nLength ].Value <<= maFilterName;
}
xStorable->storeToURL( maSaveAsURL, aArguments );
@@ -678,18 +678,18 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
nSourceSize = PPPOptimizer::GetFileSize( maSaveAsURL );
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 30 ) ) );
- SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
+ SetStatusValue( TK_Status, Any( OUString("STR_DUPLICATING_PRESENTATION") ) );
DispatchStatus();
Reference< XDesktop2 > xDesktop = Desktop::create( mxContext );
- xSelf = xDesktop->findFrame( TKGet( TK__blank ), FrameSearchFlag::CREATE );
+ xSelf = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE );
Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY );
Sequence< PropertyValue > aLoadProps( 1 );
- aLoadProps[ 0 ].Name = TKGet( TK_Hidden );
+ aLoadProps[ 0 ].Name = "Hidden";
aLoadProps[ 0 ].Value <<= (sal_Bool)( sal_True );
mxModel = Reference< XModel >( xComponentLoader->loadComponentFromURL(
- maSaveAsURL, TKGet( TK__self ), 0, aLoadProps ), UNO_QUERY );
+ maSaveAsURL, "_self", 0, aLoadProps ), UNO_QUERY );
}
}
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 8a7702a..dabf17b 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -62,14 +62,14 @@ OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString&
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 ) };
+ "Height",
+ "Label",
+ "MultiLine",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( nHeight ),
@@ -101,13 +101,13 @@ OUString InsertImage(
sal_Bool bScale )
{
OUString pNames[] = {
- TKGet( TK_Border ),
- TKGet( TK_Height ),
- TKGet( TK_ImageURL ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_ScaleImage ),
- TKGet( TK_Width ) };
+ "Border",
+ "Height",
+ "ImageURL",
+ "PositionX",
+ "PositionY",
+ "ScaleImage",
+ "Width" };
Any pValues[] = {
Any( sal_Int16( 0 ) ),
@@ -131,14 +131,14 @@ OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString&
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{
OUString pNames[] = {
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_Label ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "Enabled",
+ "Height",
+ "Label",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -165,15 +165,15 @@ OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rC
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 ) };
+ "Enabled",
+ "Height",
+ "Label",
+ "PositionX",
+ "PositionY",
+ "PushButtonType",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -217,13 +217,13 @@ void InformationDialog::InitDialog()
// setting the dialog properties
OUString pNames[] = {
- TKGet( TK_Closeable ),
- TKGet( TK_Height ),
- TKGet( TK_Moveable ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Title ),
- TKGet( TK_Width ) };
+ "Closeable",
+ "Height",
+ "Moveable",
+ "PositionX",
+ "PositionY",
+ "Title",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -304,11 +304,11 @@ void InformationDialog::InitDialog()
5, 5, 25, 25, sal_False );
InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
if ( !maSaveAsURL.isEmpty() )
- InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
+ InsertCheckBox( *this, "OpenNewDocument", xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
InsertButton( *this, OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
sal_Bool bOpenNewDocument = mrbOpenNewDocument;
- setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) );
+ setControlProperty( "OpenNewDocument", "State", Any( (sal_Int16)bOpenNewDocument ) );
}
// -----------------------------------------------------------------------------
@@ -348,7 +348,7 @@ sal_Bool InformationDialog::execute()
if ( !maSaveAsURL.isEmpty() )
{
sal_Int16 nInt16 = 0;
- Any aAny( getControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ) ) );
+ Any aAny( getControlProperty( "OpenNewDocument", "State" ) );
if ( aAny >>= nInt16 )
{
sal_Bool bOpenNewDocument = static_cast< sal_Bool >( nInt16 );
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 1a828e1..e708543 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -54,13 +54,13 @@ void OptimizerDialog::InitDialog()
{
// setting the dialog properties
OUString pNames[] = {
- TKGet( TK_Closeable ),
- TKGet( TK_Height ),
- TKGet( TK_Moveable ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Title ),
- TKGet( TK_Width ) };
+ "Closeable",
+ "Height",
+ "Moveable",
+ "PositionX",
+ "PositionY",
+ "Title",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -86,12 +86,12 @@ void OptimizerDialog::InitRoadmap()
try
{
OUString pNames[] = {
- TKGet( TK_Height ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "Height",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_Int32( DIALOG_HEIGHT - 26 ) ),
@@ -107,11 +107,11 @@ void OptimizerDialog::InitRoadmap()
Sequence< Any > aValues( pValues, nCount );
mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ),
- TKGet( TK_rdmNavi ), aNames, aValues );
+ "rdmNavi", aNames, aValues );
Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet( TK_rdmNavi ) ) );
- mxRoadmapControl = mxDialog->getControl( TKGet( TK_rdmNavi ) );
+ xPropertySet->setPropertyValue( "Name", Any( OUString("rdmNavi") ) );
+ mxRoadmapControl = mxDialog->getControl( "rdmNavi" );
InsertRoadmapItem( 0, sal_True, getString( STR_INTRODUCTION ), ITEM_ID_INTRODUCTION );
InsertRoadmapItem( 1, sal_True, getString( STR_SLIDES ), ITEM_ID_SLIDES );
InsertRoadmapItem( 2, sal_True, getString( STR_IMAGE_OPTIMIZATION ), ITEM_ID_GRAPHIC_OPTIMIZATION );
@@ -122,11 +122,11 @@ void OptimizerDialog::InitRoadmap()
OUString sBitmap( "/minimizepresi_80.png" );
OUString sURL( sBitmapPath += sBitmap );
- xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) );
- xPropertySet->setPropertyValue( TKGet( TK_Activated ), Any( (sal_Bool)sal_True ) );
- xPropertySet->setPropertyValue( TKGet( TK_Complete ), Any( (sal_Bool)sal_True ) );
- xPropertySet->setPropertyValue( TKGet( TK_CurrentItemID ), Any( (sal_Int16)ITEM_ID_INTRODUCTION ) );
- xPropertySet->setPropertyValue( TKGet( TK_Text ), Any( getString( STR_STEPS ) ) );
+ xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) );
+ xPropertySet->setPropertyValue( "Activated", Any( (sal_Bool)sal_True ) );
+ xPropertySet->setPropertyValue( "Complete", Any( (sal_Bool)sal_True ) );
+ xPropertySet->setPropertyValue( "CurrentItemID", Any( (sal_Int16)ITEM_ID_INTRODUCTION ) );
+ xPropertySet->setPropertyValue( "Text", Any( getString( STR_STEPS ) ) );
}
catch( Exception& )
{
@@ -143,9 +143,9 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool
Reference< XIndexContainer > aIndexContainerRoadmap( mxRoadmapControlModel, UNO_QUERY_THROW );
Reference< XInterface > xRoadmapItem( xSFRoadmap->createInstance(), UNO_QUERY_THROW );
Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( TKGet( TK_Label ), Any( rLabel ) );
- xPropertySet->setPropertyValue( TKGet( TK_Enabled ), Any( bEnabled ) );
- xPropertySet->setPropertyValue( TKGet( TK_ID ), Any( nItemID ) );
+ xPropertySet->setPropertyValue( "Label", Any( rLabel ) );
+ xPropertySet->setPropertyValue( "Enabled", Any( bEnabled ) );
+ xPropertySet->setPropertyValue( "ID", Any( nItemID ) );
aIndexContainerRoadmap->insertByIndex( nIndex, Any( xRoadmapItem ) );
}
catch( Exception& )
@@ -165,13 +165,13 @@ void OptimizerDialog::UpdateConfiguration()
Sequence< OUString > aStringItemList;
// page0
- aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) );
+ aAny = getControlProperty( "ListBox0Pg0", "SelectedItems" );
if ( aAny >>= aSelectedItems )
{
if ( aSelectedItems.getLength() )
{
sal_Int16 nSelectedItem = aSelectedItems[ 0 ];
- aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_StringItemList ) );
+ aAny = getControlProperty( "ListBox0Pg0", "StringItemList" );
if ( aAny >>= aStringItemList )
{
if ( aStringItemList.getLength() > nSelectedItem )
@@ -180,18 +180,18 @@ void OptimizerDialog::UpdateConfiguration()
}
}
- aAny = getControlProperty( TKGet( TK_CheckBox3Pg3 ), TKGet( TK_State ) );
+ aAny = getControlProperty( "CheckBox3Pg3", "State" );
if ( aAny >>= nInt16 )
{
if ( nInt16 )
{
- aAny = getControlProperty( TKGet( TK_ListBox0Pg3 ), TKGet( TK_SelectedItems ) );
+ aAny = getControlProperty( "ListBox0Pg3", "SelectedItems" );
if ( aAny >>= aSelectedItems )
{
if ( aSelectedItems.getLength() )
{
sal_Int16 nSelectedItem = aSelectedItems[ 0 ];
- aAny = getControlProperty( TKGet( TK_ListBox0Pg3 ), TKGet( TK_StringItemList ) );
+ aAny = getControlProperty( "ListBox0Pg3", "StringItemList" );
if ( aAny >>= aStringItemList )
{
if ( aStringItemList.getLength() > nSelectedItem )
@@ -268,16 +268,16 @@ void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
{
sal_Int16 nOldStep = mnCurrentStep;
if ( nNewStep == 0 )
- disableControl( TKGet( TK_btnNavBack ) );
+ disableControl( "btnNavBack" );
else if ( nOldStep == 0 )
- enableControl( TKGet( TK_btnNavBack ) );
+ enableControl( "btnNavBack" );
if ( nNewStep == MAX_STEP )
- disableControl( TKGet( TK_btnNavNext ) );
+ disableControl( "btnNavNext" );
else if ( nOldStep == MAX_STEP )
- enableControl( TKGet( TK_btnNavNext ) );
+ enableControl( "btnNavNext" );
- setControlProperty( TKGet( TK_rdmNavi ), TKGet( TK_CurrentItemID ), Any( nNewStep ) );
+ setControlProperty( "rdmNavi", "CurrentItemID", Any( nNewStep ) );
DeactivatePage( nOldStep );
UpdateControlStates( nNewStep );
@@ -315,8 +315,8 @@ OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken
Sequence< sal_Int16 > sSelectedItems;
Sequence< OUString > sItemList;
- if ( ( getControlProperty( TKGet( eToken ), TKGet( TK_SelectedItems ) ) >>= sSelectedItems ) &&
- ( getControlProperty( TKGet( eToken ), TKGet( TK_StringItemList ) ) >>= sItemList ) )
+ if ( ( getControlProperty( TKGet( eToken ), "SelectedItems" ) >>= sSelectedItems ) &&
+ ( getControlProperty( TKGet( eToken ), "StringItemList" ) >>= sItemList ) )
{
if ( sSelectedItems.getLength() == 1 )
{
@@ -341,8 +341,8 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su
OUString sStatus;
if ( *pVal >>= sStatus )
{
- setControlProperty( TKGet( TK_FixedText1Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) );
- setControlProperty( TKGet( TK_FixedText1Pg4 ), TKGet( TK_Label ), Any( getString( TKGet( sStatus ) ) ) );
+ setControlProperty( "FixedText1Pg4", "Enabled", Any( sal_True ) );
+ setControlProperty( "FixedText1Pg4", "Label", Any( getString( TKGet( sStatus ) ) ) );
}
}
pVal = maStats.GetStatusValue( TK_Progress );
@@ -350,7 +350,7 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su
{
sal_Int32 nProgress = 0;
if ( *pVal >>= nProgress )
- setControlProperty( TKGet( TK_Progress ), TKGet( TK_ProgressValue ), Any( nProgress ) );
+ setControlProperty( "Progress", "ProgressValue", Any( nProgress ) );
}
pVal = maStats.GetStatusValue( TK_OpenNewDocument );
if ( pVal )
@@ -374,7 +374,7 @@ void ItemListener::itemStateChanged( const ItemEvent& Event )
if ( aSource >>= xControl )
{
Reference< XPropertySet > xPropertySet( xControl->getModel(), UNO_QUERY_THROW );
- xPropertySet->getPropertyValue( TKGet( TK_Name ) ) >>= aControlName;
+ xPropertySet->getPropertyValue( "Name" ) >>= aControlName;
PPPOptimizerTokenEnum eControl( TKGet( aControlName ) );
switch( eControl )
{
@@ -385,52 +385,52 @@ void ItemListener::itemStateChanged( const ItemEvent& Event )
break;
case TK_CheckBox1Pg1 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_RemoveCropArea, Any( nState != 0 ) );
}
break;
case TK_CheckBox2Pg1 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_EmbedLinkedGraphics, Any( nState != 0 ) );
}
break;
case TK_CheckBox0Pg2 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
{
mrOptimizerDialog.SetConfigProperty( TK_OLEOptimization, Any( nState != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_RadioButton0Pg2 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_RadioButton1Pg2 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
+ mrOptimizerDialog.setControlProperty( "RadioButton0Pg2", "Enabled", Any( nState != 0 ) );
+ mrOptimizerDialog.setControlProperty( "RadioButton1Pg2", "Enabled", Any( nState != 0 ) );
}
}
break;
case TK_RadioButton0Pg1 :
{
sal_Int16 nInt16 = 0;
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nInt16 )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nInt16 )
{
nInt16 ^= 1;
mrOptimizerDialog.SetConfigProperty( TK_JPEGCompression, Any( nInt16 != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText1Pg1 ), TKGet( TK_Enabled ), Any( nInt16 != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_Enabled ), Any( nInt16 != 0 ) );
+ mrOptimizerDialog.setControlProperty( "FixedText1Pg1", "Enabled", Any( nInt16 != 0 ) );
+ mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "Enabled", Any( nInt16 != 0 ) );
}
}
break;
case TK_RadioButton1Pg1 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
{
mrOptimizerDialog.SetConfigProperty( TK_JPEGCompression, Any( nState != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText1Pg1 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
+ mrOptimizerDialog.setControlProperty( "FixedText1Pg1", "Enabled", Any( nState != 0 ) );
+ mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "Enabled", Any( nState != 0 ) );
}
}
break;
case TK_RadioButton0Pg2 :
{
sal_Int16 nInt16;
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nInt16 )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nInt16 )
{
nInt16 ^= 1;
mrOptimizerDialog.SetConfigProperty( TK_OLEOptimizationType, Any( nInt16 ) );
@@ -439,44 +439,44 @@ void ItemListener::itemStateChanged( const ItemEvent& Event )
break;
case TK_RadioButton1Pg2 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_OLEOptimizationType, Any( nState ) );
}
break;
case TK_CheckBox0Pg3 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_DeleteUnusedMasterPages, Any( nState != 0 ) );
}
break;
case TK_CheckBox1Pg3 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_DeleteNotesPages, Any( nState != 0 ) );
}
break;
case TK_CheckBox2Pg3 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_DeleteHiddenSlides, Any( nState != 0 ) );
}
break;
case TK_CheckBox3Pg3 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
- mrOptimizerDialog.setControlProperty( TKGet( TK_ListBox0Pg3 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
+ mrOptimizerDialog.setControlProperty( "ListBox0Pg3", "Enabled", Any( nState != 0 ) );
}
break;
case TK_CheckBox1Pg4 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
- mrOptimizerDialog.setControlProperty( TKGet( TK_ComboBox0Pg4 ), TKGet( TK_Enabled ), Any( nState != 0 ) );
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
+ mrOptimizerDialog.setControlProperty( "ComboBox0Pg4", "Enabled", Any( nState != 0 ) );
}
break;
case TK_RadioButton0Pg4 :
case TK_RadioButton1Pg4 :
{
- if ( xPropertySet->getPropertyValue( TKGet( TK_State ) ) >>= nState )
+ if ( xPropertySet->getPropertyValue( "State" ) >>= nState )
mrOptimizerDialog.SetConfigProperty( TK_SaveAs, Any( eControl == TK_RadioButton1Pg4 ? nState != 0 : nState == 0 ) );
}
break;
@@ -510,16 +510,16 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
mrOptimizerDialog.SwitchPage( ITEM_ID_SUMMARY );
mrOptimizerDialog.DisablePage( ITEM_ID_SUMMARY );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavBack ), TKGet( TK_Enabled ), Any( sal_False ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavNext ), TKGet( TK_Enabled ), Any( sal_False ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavFinish ), TKGet( TK_Enabled ), Any( sal_False ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_False ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText0Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) );
+ mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( sal_False ) );
+ mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( sal_False ) );
+ mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( sal_False ) );
+ mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( sal_False ) );
+ mrOptimizerDialog.setControlProperty( "FixedText0Pg4", "Enabled", Any( sal_True ) );
// 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;
+ mrOptimizerDialog.getControlProperty( "RadioButton1Pg4", "State" ) >>= nInt16;
if ( nInt16 )
{
OUString aSaveAsURL;
@@ -574,8 +574,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
{ // now check if we have to store a session template
nInt16 = 0;
OUString aSettingsName;
- mrOptimizerDialog.getControlProperty( TKGet( TK_CheckBox1Pg4 ), TKGet( TK_State ) ) >>= nInt16;
- mrOptimizerDialog.getControlProperty( TKGet( TK_ComboBox0Pg4 ), TKGet( TK_Text ) ) >>= aSettingsName;
+ mrOptimizerDialog.getControlProperty( "CheckBox1Pg4", "State" ) >>= nInt16;
+ mrOptimizerDialog.getControlProperty( "ComboBox0Pg4", "Text" ) >>= aSettingsName;
if ( nInt16 && !aSettingsName.isEmpty() )
{
std::vector< OptimizerSettings >::iterator aIter( mrOptimizerDialog.GetOptimizerSettingsByName( aSettingsName ) );
@@ -600,11 +600,11 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
aURL.Path = OUString( "optimize" );
Sequence< PropertyValue > lArguments( 3 );
- lArguments[ 0 ].Name = TKGet( TK_Settings );
+ lArguments[ 0 ].Name = "Settings";
lArguments[ 0 ].Value <<= mrOptimizerDialog.GetConfigurationSequence();
- lArguments[ 1 ].Name = TKGet( TK_StatusDispatcher );
+ lArguments[ 1 ].Name = "StatusDispatcher";
lArguments[ 1 ].Value <<= mrOptimizerDialog.GetStatusDispatcher();
- lArguments[ 2 ].Name = TKGet( TK_InformationDialog );
+ lArguments[ 2 ].Name = "InformationDialog";
lArguments[ 2 ].Value <<= mrOptimizerDialog.GetFrame();
xDispatch->dispatch( aURL, lArguments );
@@ -613,10 +613,10 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
}
else
{
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavBack ), TKGet( TK_Enabled ), Any( sal_True ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavNext ), TKGet( TK_Enabled ), Any( sal_False ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavFinish ), TKGet( TK_Enabled ), Any( sal_True ) );
- mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_True ) );
+ mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( sal_True ) );
+ mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( sal_False ) );
+ mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( sal_True ) );
+ mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( sal_True ) );
mrOptimizerDialog.EnablePage( ITEM_ID_SUMMARY );
}
}
@@ -670,7 +670,7 @@ void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */
throw ( com::sun::star::uno::RuntimeException )
{
double fDouble = 0;
- Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ) );
+ Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
if ( aAny >>= fDouble )
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
@@ -685,7 +685,7 @@ void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
OUString aString;
- Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet( TK_Text ) );
+ Any aAny = mrOptimizerDialog.getControlProperty( "ComboBox0Pg1", "Text" );
if ( aAny >>= aString )
{
sal_Int32 nI0, nI1, nI2, nI3, nI4;
@@ -714,13 +714,13 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
double fDouble;
- Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ) );
+ Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
if ( aAny >>= fDouble )
{
fDouble += 9;
if ( fDouble > 100 )
fDouble = 100;
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+ mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( fDouble ) );
mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
}
@@ -728,26 +728,26 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
double fDouble;
- Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ) );
+ Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
if ( aAny >>= fDouble )
{
fDouble -= 9;
if ( fDouble < 0 )
fDouble = 0;
- mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+ mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "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( "FormattedField0Pg1", "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( "FormattedField0Pg1", "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/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index d07b3d3..45aff94 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -51,10 +51,10 @@ using namespace ::com::sun::star::presentation;
void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
{
FontDescriptor aFontDescriptor;
- if ( rOptimizerDialog.getControlProperty( rControl, TKGet( TK_FontDescriptor ) ) >>= aFontDescriptor )
+ if ( rOptimizerDialog.getControlProperty( rControl, "FontDescriptor" ) >>= aFontDescriptor )
{
aFontDescriptor.Weight = FontWeight::BOLD;
- rOptimizerDialog.setControlProperty( rControl, TKGet( TK_FontDescriptor ), Any( aFontDescriptor ) );
+ rOptimizerDialog.setControlProperty( rControl, "FontDescriptor", Any( aFontDescriptor ) );
}
}
@@ -64,12 +64,12 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
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 ) };
+ "Height",
+ "Orientation",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "Width" };
Any pValues[] = {
Any( nHeight ),
@@ -95,15 +95,15 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType )
{
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 ) };
+ "Enabled",
+ "Height",
+ "Label",
+ "PositionX",
+ "PositionY",
+ "PushButtonType",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( bEnabled ),
@@ -132,14 +132,14 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, 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 ) };
+ "Height",
+ "Label",
+ "MultiLine",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( nHeight ),
@@ -169,14 +169,14 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{
OUString pNames[] = {
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_Label ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "Enabled",
+ "Height",
+ "Label",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -206,17 +206,17 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex )
{
OUString pNames[] = {
- TKGet( TK_EffectiveMax ),
- TKGet( TK_EffectiveMin ),
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Repeat ),
- TKGet( TK_Spin ),
- TKGet( TK_Step ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "EffectiveMax",
+ "EffectiveMin",
+ "Enabled",
+ "Height",
+ "PositionX",
+ "PositionY",
+ "Repeat",
+ "Spin",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( fEffectiveMax ),
@@ -254,16 +254,16 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{
OUString pNames[] = {
- TKGet( TK_Dropdown ),
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_LineCount ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_StringItemList ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "Dropdown",
+ "Enabled",
+ "Height",
+ "LineCount",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "StringItemList",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -294,14 +294,14 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
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 ) };
+ "Height",
+ "Label",
+ "MultiLine",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( nHeight ),
@@ -331,17 +331,17 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{
OUString pNames[] = {
- TKGet( TK_Dropdown ),
- TKGet( TK_Enabled ),
- TKGet( TK_Height ),
- TKGet( TK_LineCount ),
- TKGet( TK_MultiSelection ),
- TKGet( TK_PositionX ),
- TKGet( TK_PositionY ),
- TKGet( TK_Step ),
- TKGet( TK_StringItemList ),
- TKGet( TK_TabIndex ),
- TKGet( TK_Width ) };
+ "Dropdown",
+ "Enabled",
+ "Height",
+ "LineCount",
+ "MultiSelection",
+ "PositionX",
+ "PositionY",
+ "Step",
+ "StringItemList",
+ "TabIndex",
+ "Width" };
Any pValues[] = {
Any( sal_True ),
@@ -376,15 +376,15 @@ void OptimizerDialog::InitNavigationBar()
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 );
+ InsertSeparator( *this, "lnNavSep1", 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 );
+ InsertSeparator( *this, "lnNavSep2", 1, 85, 0, 1, BUTTON_POS_Y - 6 );
- InsertButton( *this, TKGet( TK_btnNavBack ), mxActionListener, nBackPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_False, STR_BACK, PushButtonType_STANDARD );
- InsertButton( *this, TKGet( TK_btnNavNext ), mxActionListener, nNextPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_NEXT, PushButtonType_STANDARD );
- InsertButton( *this, TKGet( TK_btnNavFinish ), mxActionListener, nFinishPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_FINISH, PushButtonType_STANDARD );
- InsertButton( *this, TKGet( TK_btnNavCancel ), mxActionListener, nCancelPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_CANCEL, PushButtonType_STANDARD );
+ InsertButton( *this, "btnNavBack", mxActionListener, nBackPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_False, STR_BACK, PushButtonType_STANDARD );
+ InsertButton( *this, "btnNavNext", mxActionListener, nNextPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_NEXT, PushButtonType_STANDARD );
+ InsertButton( *this, "btnNavFinish", mxActionListener, nFinishPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_FINISH, PushButtonType_STANDARD );
+ InsertButton( *this, "btnNavCancel", mxActionListener, nCancelPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_CANCEL, PushButtonType_STANDARD );
- setControlProperty( TKGet( TK_btnNavNext ), TKGet( TK_DefaultButton ), Any( sal_True ) );
+ setControlProperty( "btnNavNext", "DefaultButton", Any( sal_True ) );
}
// -----------------------------------------------------------------------------
@@ -417,20 +417,20 @@ void OptimizerDialog::UpdateControlStatesPage0()
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 ) );
- setControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ), Any( aSelectedItems ) );
- setControlProperty( TKGet( TK_Button0Pg0 ), TKGet( TK_Enabled ), Any( bRemoveButtonEnabled ) );
+ setControlProperty( "ListBox0Pg0", "StringItemList", Any( aItemList ) );
+ setControlProperty( "ListBox0Pg0", "SelectedItems", Any( aSelectedItems ) );
+ setControlProperty( "Button0Pg0", "Enabled", Any( bRemoveButtonEnabled ) );
}
void OptimizerDialog::InitPage0()
{
Sequence< OUString > aItemList;
std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg0 ), getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText1Pg0 ), getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, sal_True, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator1Pg0 ), 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) );
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText2Pg0 ), getString( STR_CHOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH - 12, 8, sal_True, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertListBox( *this, TKGet( TK_ListBox0Pg0 ), mxActionListenerListBox0Pg0, sal_True, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12, mnTabIndex++ ) );
- aControlList.push_back( InsertButton( *this, TKGet( TK_Button0Pg0 ), mxActionListener, OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT - 49, 40, 14, mnTabIndex++, sal_True, STR_REMOVE, PushButtonType_STANDARD ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText0Pg0", getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText1Pg0", getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, sal_True, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertSeparator( *this, "Separator1Pg0", 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText2Pg0", getString( STR_CHOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH - 12, 8, sal_True, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertListBox( *this, "ListBox0Pg0", mxActionListenerListBox0Pg0, sal_True, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12, mnTabIndex++ ) );
+ aControlList.push_back( InsertButton( *this, "Button0Pg0", mxActionListener, OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT - 49, 40, 14, mnTabIndex++, sal_True, STR_REMOVE, PushButtonType_STANDARD ) );
maControlPages.push_back( aControlList );
DeactivatePage( 0 );
UpdateControlStatesPage0();
@@ -444,9 +444,9 @@ void OptimizerDialog::UpdateControlStatesPage1()
sal_Bool bDeleteHiddenSlides( GetConfigProperty( TK_DeleteHiddenSlides, sal_False ) );
sal_Bool bDeleteNotesPages( GetConfigProperty( TK_DeleteNotesPages, sal_False ) );
- setControlProperty( TKGet( TK_CheckBox0Pg3 ), TKGet( TK_State ), Any( (sal_Int16)bDeleteUnusedMasterPages ) );
- setControlProperty( TKGet( TK_CheckBox1Pg3 ), TKGet( TK_State ), Any( (sal_Int16)bDeleteNotesPages ) );
- setControlProperty( TKGet( TK_CheckBox2Pg3 ), TKGet( TK_State ), Any( (sal_Int16)bDeleteHiddenSlides ) );
+ setControlProperty( "CheckBox0Pg3", "State", Any( (sal_Int16)bDeleteUnusedMasterPages ) );
+ setControlProperty( "CheckBox1Pg3", "State", Any( (sal_Int16)bDeleteNotesPages ) );
+ setControlProperty( "CheckBox2Pg3", "State", Any( (sal_Int16)bDeleteHiddenSlides ) );
}
void OptimizerDialog::InitPage1()
{
@@ -460,18 +460,18 @@ void OptimizerDialog::InitPage1()
aCustomShowList = aXCont->getElementNames();
}
std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg3 ), getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg3 ), mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox2Pg3 ), mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox3Pg3 ), mxItemListener, getString( STR_CUSTOM_SHOW ), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( InsertListBox( *this, TKGet( TK_ListBox0Pg3 ), mxActionListener, sal_True, aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox1Pg3 ), mxItemListener, getString( STR_DELETE_NOTES_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 70, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText0Pg3", getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg3", mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox2Pg3", mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox3Pg3", mxItemListener, getString( STR_CUSTOM_SHOW ), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertListBox( *this, "ListBox0Pg3", mxActionListener, sal_True, aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox1Pg3", mxItemListener, getString( STR_DELETE_NOTES_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 70, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 1 );
- setControlProperty( TKGet( TK_CheckBox3Pg3 ), TKGet( TK_State ), Any( sal_False ) );
- setControlProperty( TKGet( TK_CheckBox3Pg3 ), TKGet( TK_Enabled ), Any( aCustomShowList.getLength() != 0 ) );
- setControlProperty( TKGet( TK_ListBox0Pg3 ), TKGet( TK_Enabled ), Any( sal_False ) );
+ setControlProperty( "CheckBox3Pg3", "State", Any( sal_False ) );
+ setControlProperty( "CheckBox3Pg3", "Enabled", Any( aCustomShowList.getLength() != 0 ) );
+ setControlProperty( "ListBox0Pg3", "Enabled", Any( sal_False ) );
UpdateControlStatesPage1();
}
@@ -507,14 +507,14 @@ void OptimizerDialog::UpdateControlStatesPage2()
if ( aResolutionText.isEmpty() )
aResolutionText = OUString::number( nImageResolution );
- setControlProperty( TKGet( TK_RadioButton0Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_True ) ) );
- setControlProperty( TKGet( TK_RadioButton1Pg1 ), TKGet( TK_State ), Any( (sal_Int16)( bJPEGCompression != sal_False ) ) );
- setControlProperty( TKGet( TK_FixedText1Pg1 ), TKGet( TK_Enabled ), Any( bJPEGCompression ) );
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_Enabled ), Any( bJPEGCompression ) );
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( (double)nJPEGQuality ) );
- setControlProperty( TKGet( TK_CheckBox1Pg1 ), TKGet( TK_State ), Any( (sal_Int16)bRemoveCropArea ) );
- setControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet( TK_Text ), Any( aResolutionText ) );
- setControlProperty( TKGet( TK_CheckBox2Pg1 ), TKGet( TK_State ), Any( (sal_Int16)bEmbedLinkedGraphics ) );
+ setControlProperty( "RadioButton0Pg1", "State", Any( (sal_Int16)( bJPEGCompression != sal_True ) ) );
+ setControlProperty( "RadioButton1Pg1", "State", Any( (sal_Int16)( bJPEGCompression != sal_False ) ) );
+ setControlProperty( "FixedText1Pg1", "Enabled", Any( bJPEGCompression ) );
+ setControlProperty( "FormattedField0Pg1", "Enabled", Any( bJPEGCompression ) );
+ setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( (double)nJPEGQuality ) );
+ setControlProperty( "CheckBox1Pg1", "State", Any( (sal_Int16)bRemoveCropArea ) );
+ setControlProperty( "ComboBox0Pg1", "Text", Any( aResolutionText ) );
+ setControlProperty( "CheckBox2Pg1", "State", Any( (sal_Int16)bEmbedLinkedGraphics ) );
}
void OptimizerDialog::InitPage2()
{
@@ -527,15 +527,15 @@ void OptimizerDialog::InitPage2()
aResolutionItemList[ 3 ] = getString( STR_IMAGE_RESOLUTION_3 ).getToken( 1, ';', nI3 );
std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg1 ), getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg1 ), mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton1Pg1 ), mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText1Pg1 ), getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, sal_False, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertFormattedField( *this, TKGet( TK_FormattedField0Pg1 ), mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X + 106, PAGE_POS_Y + 38, 50, 0, 100, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText2Pg1 ), getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, sal_False, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertComboBox( *this, TKGet( TK_ComboBox0Pg1 ), mxTextListenerComboBox0Pg1, sal_True, aResolutionItemList, PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox1Pg1 ), mxItemListener, getString( STR_REMOVE_CROP_AREA ), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox2Pg1 ), mxItemListener, getString( STR_EMBED_LINKED_GRAPHICS ), PAGE_POS_X + 6, PAGE_POS_Y + 82, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1", getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+ aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, sal_False, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertFormattedField( *this, "FormattedField0Pg1", mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X + 106, PAGE_POS_Y + 38, 50, 0, 100, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1", getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, sal_False, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertComboBox( *this, "ComboBox0Pg1", mxTextListenerComboBox0Pg1, sal_True, aResolutionItemList, PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox1Pg1", mxItemListener, getString( STR_REMOVE_CROP_AREA ), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox2Pg1", mxItemListener, getString( STR_EMBED_LINKED_GRAPHICS ), PAGE_POS_X + 6, PAGE_POS_Y + 82, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 2 );
UpdateControlStatesPage2();
@@ -548,11 +548,11 @@ void OptimizerDialog::UpdateControlStatesPage3()
sal_Bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, sal_False ) );
sal_Int16 nOLEOptimizationType( GetConfigProperty( TK_OLEOptimizationType, (sal_Int16)0 ) );
- setControlProperty( TKGet( TK_CheckBox0Pg2 ), TKGet( TK_State ), Any( (sal_Int16)bConvertOLEObjects ) );
- setControlProperty( TKGet( TK_RadioButton0Pg2 ), TKGet( TK_Enabled ), Any( bConvertOLEObjects ) );
- setControlProperty( TKGet( TK_RadioButton0Pg2 ), TKGet( TK_State ), Any( (sal_Int16)( nOLEOptimizationType == 0 ) ) );
- setControlProperty( TKGet( TK_RadioButton1Pg2 ), TKGet( TK_Enabled ), Any( bConvertOLEObjects ) );
- setControlProperty( TKGet( TK_RadioButton1Pg2 ), TKGet( TK_State ), Any( (sal_Int16)( nOLEOptimizationType == 1 ) ) );
+ setControlProperty( "CheckBox0Pg2", "State", Any( (sal_Int16)bConvertOLEObjects ) );
+ setControlProperty( "RadioButton0Pg2", "Enabled", Any( bConvertOLEObjects ) );
+ setControlProperty( "RadioButton0Pg2", "State", Any( (sal_Int16)( nOLEOptimizationType == 0 ) ) );
+ setControlProperty( "RadioButton1Pg2", "Enabled", Any( bConvertOLEObjects ) );
+ setControlProperty( "RadioButton1Pg2", "State", Any( (sal_Int16)( nOLEOptimizationType == 1 ) ) );
}
void OptimizerDialog::InitPage3()
{
@@ -573,11 +573,11 @@ void OptimizerDialog::InitPage3()
}
std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg2 ), getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg2 ), mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg2 ), mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton1Pg2 ), mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText1Pg2 ), nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, sal_True, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2", getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+ aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg2", mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, sal_True, sal_False, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 3 );
UpdateControlStatesPage3();
@@ -606,15 +606,15 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_Bool bSaveAs( GetConfigProperty( TK_SaveAs, sal_True ) );
if ( mbIsReadonly )
{
- setControlProperty( TKGet( TK_RadioButton0Pg4 ), TKGet( TK_State ), Any( (sal_Int16)( sal_False ) ) );
- setControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ), Any( (sal_Int16)( sal_True ) ) );
+ setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( sal_False ) ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list