This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new cf91b95bba Fixed typo, Cleanup
cf91b95bba is described below
commit cf91b95bba25eaa8518e00d0efc300966efd999d
Author: mseidel <[email protected]>
AuthorDate: Tue May 20 20:35:14 2025 +0200
Fixed typo, Cleanup
(cherry picked from commit e1f21a75e902abd525fc1025e6a6b5d6bd46bd17)
---
.../openoffice/Office/UI/DrawImpressCommands.xcu | 2 +-
.../sdext/source/minimizer/configurationaccess.cxx | 125 ++++++-----
main/sdext/source/minimizer/impoptimizer.cxx | 60 ++---
main/sdext/source/minimizer/minimizer.hrc | 2 +-
main/sdext/source/minimizer/minimizer.src | 4 +-
main/sdext/source/minimizer/optimizerdialog.cxx | 220 +++++++++---------
main/sdext/source/minimizer/optimizerdialog.hrc | 1 -
.../source/minimizer/optimizerdialogcontrols.cxx | 248 ++++++++++-----------
main/sdext/source/minimizer/pppoptimizertoken.cxx | 26 +--
main/sdext/source/minimizer/pppoptimizertoken.hxx | 18 +-
10 files changed, 351 insertions(+), 355 deletions(-)
diff --git
a/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 4d23cb0671..299c376173 100644
---
a/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++
b/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1264,7 +1264,7 @@
</node>
<node oor:name=".uno:PresentationMinimizer"
oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Minimize
Presentation...</value>
+ <value xml:lang="en-US">Presentation
Minimizer...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/main/sdext/source/minimizer/configurationaccess.cxx
b/main/sdext/source/minimizer/configurationaccess.cxx
index 1783708a1c..2690618b1d 100644
--- a/main/sdext/source/minimizer/configurationaccess.cxx
+++ b/main/sdext/source/minimizer/configurationaccess.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -45,58 +43,57 @@ using namespace ::com::sun::star::container;
using rtl::OUString;
using rtl::OUStringBuffer;
-
#include <rtl/instance.hxx>
typedef std::map < sal_Int32, rtl::OUString > StringResourceMap;
struct StaticResourceMap
- : public rtl::StaticWithInit< StringResourceMap, StaticResourceMap >
+ : public rtl::StaticWithInit< StringResourceMap, StaticResourceMap >
{
- StringResourceMap &
- operator()() const;
+ StringResourceMap &
+ operator()() const;
};
StringResourceMap &
StaticResourceMap::operator()() const
{
- static StringResourceMap aMap;
- return aMap;
+ static StringResourceMap aMap;
+ return aMap;
}
static const OUString& GetConfigurationProviderServiceName (void)
{
- static const OUString sConfigurationProviderServiceName (
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider"));
- return sConfigurationProviderServiceName;
+ static const OUString sConfigurationProviderServiceName (
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationProvider"));
+ return sConfigurationProviderServiceName;
}
static const OUString& GetPathToConfigurationRoot (void)
{
- static const OUString sPathToConfigurationRoot (
-
RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Impress/PresentationMinimizer"));
- return sPathToConfigurationRoot;
+ static const OUString sPathToConfigurationRoot (
+
RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Impress/PresentationMinimizer"));
+ return sPathToConfigurationRoot;
}
static OUString lcl_loadString(
- const Reference< resource::XResourceBundle > xResourceBundle,
- sal_Int32 nResourceId )
+ const Reference< resource::XResourceBundle > xResourceBundle,
+ sal_Int32 nResourceId )
{
- OUString sString;
- OUStringBuffer sKey;
- sKey.appendAscii( RTL_CONSTASCII_STRINGPARAM( "string:" ) );
- sKey.append( nResourceId );
-
- try
- {
- OSL_VERIFY( xResourceBundle->getByName( sKey.makeStringAndClear() )
>>= sString );
- }
- catch( const uno::Exception& )
- {
- OSL_ENSURE( false, "OptimizerSettings: missing resource!" );
- }
-
- return sString;
+ OUString sString;
+ OUStringBuffer sKey;
+ sKey.appendAscii( RTL_CONSTASCII_STRINGPARAM( "string:" ) );
+ sKey.append( nResourceId );
+
+ try
+ {
+ OSL_VERIFY( xResourceBundle->getByName(
sKey.makeStringAndClear() ) >>= sString );
+ }
+ catch( const uno::Exception& )
+ {
+ OSL_ENSURE( false, "OptimizerSettings: missing resource!" );
+ }
+
+ return sString;
}
void OptimizerSettings::LoadSettingsFromConfiguration( const Reference<
XNameAccess >& rSettings )
@@ -223,22 +220,22 @@ ConfigurationAccess::~ConfigurationAccess()
rtl::OUString ConfigurationAccess::getString( sal_Int32 nResId )
{
- const StringResourceMap &aStrings = StaticResourceMap::get();
+ const StringResourceMap &aStrings = StaticResourceMap::get();
StringResourceMap::const_iterator aIter( aStrings.find( nResId ) );
return aIter != aStrings.end() ? ((*aIter).second) : rtl::OUString();
}
void ConfigurationAccess::LoadStrings()
{
- static bool bLoaded = false;
- if ( bLoaded )
- return;
- else
- bLoaded = true;
+ static bool bLoaded = false;
+ if ( bLoaded )
+ return;
+ else
+ bLoaded = true;
try
{
- Reference< resource::XResourceBundleLoader > xResourceBundleLoader(
+ Reference< resource::XResourceBundleLoader >
xResourceBundleLoader(
m_xContext->getValueByName(
OUString( RTL_CONSTASCII_USTRINGPARAM(
"/singletons/com.sun.star.resource.OfficeResourceLoader" )
) ),
@@ -259,7 +256,7 @@ void ConfigurationAccess::LoadStrings()
aStrings[ STR_CANCEL ] = lcl_loadString(
xResourceBundle, STR_CANCEL );
aStrings[ STR_INTRODUCTION ] = lcl_loadString(
xResourceBundle, STR_INTRODUCTION );
aStrings[ STR_INTRODUCTION_T ] = lcl_loadString(
xResourceBundle, STR_INTRODUCTION_T );
- aStrings[ STR_CHOSE_SETTINGS ] = lcl_loadString(
xResourceBundle, STR_CHOSE_SETTINGS );
+ aStrings[ STR_CHOOSE_SETTINGS ] = lcl_loadString(
xResourceBundle, STR_CHOOSE_SETTINGS );
aStrings[ STR_REMOVE ] = lcl_loadString(
xResourceBundle, STR_REMOVE );
aStrings[ STR_GRAPHIC_OPTIMIZATION ] = lcl_loadString(
xResourceBundle, STR_GRAPHIC_OPTIMIZATION );
aStrings[ STR_IMAGE_OPTIMIZATION ] = lcl_loadString(
xResourceBundle, STR_IMAGE_OPTIMIZATION );
@@ -331,7 +328,7 @@ 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, TKGet( TK_LastUsedSettings ) ), UNO_QUERY );
if ( xSet.is() )
{
OptimizerSettings& rCurrent( maSettings.front()
);
@@ -401,7 +398,7 @@ void ConfigurationAccess::SaveConfiguration()
Reference< container::XNameReplace >
xTemplates( GetConfigurationNode( xRoot, aPath ), UNO_QUERY );
rSettings.SaveSettingsToConfiguration(
xTemplates );
}
- xRoot->commitChanges();
+ xRoot->commitChanges();
}
while( false );
}
@@ -416,13 +413,13 @@ Reference< XInterface >
ConfigurationAccess::OpenConfiguration( bool bReadOnly )
Reference< XInterface > xRoot;
try
{
- Reference< lang::XMultiServiceFactory > xProvider(
m_xContext->getServiceManager()->createInstanceWithContext(
GetConfigurationProviderServiceName(), m_xContext ), UNO_QUERY );
- if ( xProvider.is() )
- {
+ Reference< lang::XMultiServiceFactory > xProvider(
m_xContext->getServiceManager()->createInstanceWithContext(
GetConfigurationProviderServiceName(), m_xContext ), UNO_QUERY );
+ if ( xProvider.is() )
+ {
Sequence< Any > aCreationArguments( 2 );
aCreationArguments[0] = makeAny( PropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
- makeAny( GetPathToConfigurationRoot() ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
+ makeAny( GetPathToConfigurationRoot() ),
PropertyState_DIRECT_VALUE ) );
aCreationArguments[1] = makeAny(beans::PropertyValue(
OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0,
makeAny( true ),
@@ -437,7 +434,7 @@ Reference< XInterface >
ConfigurationAccess::OpenConfiguration( bool bReadOnly )
xRoot = xProvider->createInstanceWithArguments(
sAccessService, aCreationArguments );
- }
+ }
}
catch ( Exception& /* rException */ )
{
@@ -446,12 +443,12 @@ Reference< XInterface >
ConfigurationAccess::OpenConfiguration( bool bReadOnly )
}
Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
- const Reference< XInterface >& xRoot,
- const OUString& sPathToNode )
+ const Reference< XInterface >& xRoot,
+ const OUString& sPathToNode )
{
- Reference< XInterface > xNode;
- try
- {
+ Reference< XInterface > xNode;
+ try
+ {
if ( !sPathToNode.getLength() )
xNode = xRoot;
else
@@ -462,16 +459,16 @@ Reference< XInterface >
ConfigurationAccess::GetConfigurationNode(
xHierarchy->getByHierarchicalName( sPathToNode
) >>= xNode;
}
}
- }
- catch ( Exception& rException )
- {
- OSL_TRACE ("caught exception while getting configuration node %s: %s",
+ }
+ catch ( Exception& rException )
+ {
+ OSL_TRACE ("caught exception while getting configuration node
%s: %s",
::rtl::OUStringToOString(sPathToNode,
RTL_TEXTENCODING_UTF8).getStr(),
::rtl::OUStringToOString(rException.Message,
RTL_TEXTENCODING_UTF8).getStr());
- }
- return xNode;
+ }
+ return xNode;
}
com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const
PPPOptimizerTokenEnum ePropertyToken ) const
@@ -613,3 +610,5 @@ std::vector< OptimizerSettings >::iterator
ConfigurationAccess::GetOptimizerSett
}
return aIter;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/minimizer/impoptimizer.cxx
b/main/sdext/source/minimizer/impoptimizer.cxx
index c9faa80e52..5bf66b9014 100644
--- a/main/sdext/source/minimizer/impoptimizer.cxx
+++ b/main/sdext/source/minimizer/impoptimizer.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -119,7 +117,7 @@ void ImpDeleteUnusedMasterPages( const Reference< XModel >&
rxModel )
}
}
-void ImpDeleteHiddenSlides( const Reference< XModel >& rxModel )
+void ImpDeleteHiddenSlides( const Reference< XModel >& rxModel )
{
try
{
@@ -231,7 +229,7 @@ void ImpCompressGraphic( Reference< XGraphicProvider >&
rxGraphicProvider, const
Sequence< PropertyValue > aFilterData( 8 );
aFilterData[ 0 ].Name = TKGet( TK_ImageResolution );
aFilterData[ 0 ].Value <<= nImageResolution;
- aFilterData[ 1 ].Name = TKGet( TK_ColorMode );
// todo: jpeg color mode (0->true color, 1->greyscale)
+ aFilterData[ 1 ].Name = TKGet( TK_ColorMode );
// todo: jpeg color mode (0->true color, 1->grayscale)
aFilterData[ 1 ].Value <<= (sal_Int32)0;
aFilterData[ 2 ].Name = TKGet( TK_Quality );
// quality that is used if we export to jpeg
aFilterData[ 2 ].Value <<= nJPEGQuality;
@@ -245,7 +243,7 @@ void ImpCompressGraphic( Reference< XGraphicProvider >&
rxGraphicProvider, const
aFilterData[ 6 ].Value <<= bRemoveCropping;
aFilterData[ 7 ].Name = TKGet( TK_GraphicCropLogic );
aFilterData[ 7 ].Value <<= rGraphicCropLogic;
-
+
Sequence< PropertyValue > aArgs( 3 );
aArgs[ 0 ].Name = TKGet( TK_MimeType );
// the GraphicProvider is using "MimeType", the GraphicExporter
"MediaType"...
aArgs[ 0 ].Value <<= rDestMimeType;
@@ -290,7 +288,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference<
XComponentContext >&
{
awt::Size aDestSizePixel(
aSourceSizePixel );
if ( !bAnimated )
- {
+ {
sal_Bool bNeedsOptimizing =
sal_False;
sal_Bool bRemoveCropArea(
rGraphicSettings.mbRemoveCropArea );
@@ -438,7 +436,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const
Reference< XComponentCont
if (
aGraphicUserIter->maGraphicCropLogic.Left ||
aGraphicUserIter->maGraphicCropLogic.Top
||
aGraphicUserIter->maGraphicCropLogic.Right ||
aGraphicUserIter->maGraphicCropLogic.Bottom )
- { //
removing crop area was not possible or should't been applied
+ { //
removing crop area was not possible or shouldn't be applied
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
if (
!aGraphicSettings.mbRemoveCropArea )
{
@@ -480,7 +478,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const
Reference< XComponentCont
}
}
}
- }
+ }
aGraphicIter++;
}
}
@@ -495,7 +493,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const
Reference< XComponentCont
ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext,
const Reference< XModel >& rxModel ) :
mxContext ( rxContext ),
- mxModel ( rxModel ),
+ mxModel ( rxModel ),
mbJPEGCompression ( sal_False ),
mnJPEGQuality ( 90 ),
mbRemoveCropArea ( sal_False ),
@@ -508,17 +506,17 @@ ImpOptimizer::ImpOptimizer( const Reference<
XComponentContext >& rxContext, con
mbDeleteNotesPages ( sal_False ),
mbOpenNewDocument ( sal_True )
{
- OSL_TRACE("ImpOptimizer::ImpOptimizer");
- Reference< XController > xController( mxModel->getCurrentController() );
- if (xController.is() )
- mxFrame.set( xController->getFrame() );
+ OSL_TRACE("ImpOptimizer::ImpOptimizer");
+ Reference< XController > xController( mxModel->getCurrentController() );
+ if (xController.is() )
+ mxFrame.set( xController->getFrame() );
}
//
-----------------------------------------------------------------------------
ImpOptimizer::~ImpOptimizer()
{
- OSL_TRACE("ImpOptimizer::~ImpOptimizer");
+ OSL_TRACE("ImpOptimizer::~ImpOptimizer");
}
//
-----------------------------------------------------------------------------
@@ -527,10 +525,10 @@ void ImpOptimizer::DispatchStatus()
{
if ( mxStatusListener.is() )
{
- FeatureStateEvent aState;
- aState.IsEnabled = sal_True;
- aState.State <<= GetStatusSequence();
- mxStatusListener->statusChanged( aState );
+ FeatureStateEvent aState;
+ aState.IsEnabled = sal_True;
+ aState.State <<= GetStatusSequence();
+ mxStatusListener->statusChanged( aState );
}
}
@@ -600,7 +598,7 @@ static void DispatchURL( Reference< XComponentContext >
xMSF, OUString sURL, Ref
xURLTransformer->parseStrict( aUrl );
Sequence< PropertyValue > aArgs;
Reference< XDispatchProvider > xDispatchProvider( xFrame,
UNO_QUERY_THROW );
- Reference< XDispatch > xDispatch =
xDispatchProvider->queryDispatch( aUrl, OUString(), 0 ); // "_self"
+ Reference< XDispatch > xDispatch =
xDispatchProvider->queryDispatch( aUrl, OUString(), 0 ); // "_self"
if ( xDispatch.is() )
xDispatch->dispatch( aUrl, aArgs );
}
@@ -613,12 +611,12 @@ static void DispatchURL( Reference< XComponentContext >
xMSF, OUString sURL, Ref
sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
- OSL_TRACE("ImpOptimizer::Optimize");
+ OSL_TRACE("ImpOptimizer::Optimize");
sal_Bool bRet = sal_True;
if ( mxModel.is() )
{
- Reference< XWindowPeer > xParentWindow;
+ Reference< XWindowPeer > xParentWindow;
sal_Int64 nEstimatedFileSize = 0;
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 0 )
) );
DispatchStatus();
@@ -669,7 +667,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence<
PropertyValue >& rArguments )
Reference< XFrame > xSelf;
if ( maSaveAsURL.getLength() )
{
-
+
SetStatusValue( TK_Progress, Any( static_cast<
sal_Int32 >( 10 ) ) );
SetStatusValue( TK_Status, Any(
ConfigurationAccess::getString( STR_DUPLICATING_PRESENTATION ) ) );
DispatchStatus();
@@ -717,7 +715,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence<
PropertyValue >& rArguments )
mxModel->lockControllers();
bRet = ImplOptimize();
mxModel->unlockControllers();
-
+
// clearing undo stack:
Reference< XFrame > xFrame( mxFrame );
if ( xFrame.is() )
@@ -739,13 +737,13 @@ sal_Bool ImpOptimizer::Optimize( const Sequence<
PropertyValue >& rArguments )
if ( xParentWindow.is() )
{
InformationDialog aInformationDialog(
- mxContext, xParentWindow, maSaveAsURL, mbOpenNewDocument,
- nSourceSize, nDestSize, nEstimatedFileSize );
+ mxContext, xParentWindow, maSaveAsURL,
mbOpenNewDocument,
+ nSourceSize, nDestSize, nEstimatedFileSize );
aInformationDialog.execute();
SetStatusValue( TK_OpenNewDocument, Any(
mbOpenNewDocument ) );
DispatchStatus();
}
-
+
if ( maSaveAsURL.getLength() )
{
if ( mbOpenNewDocument && xSelf.is() )
@@ -770,3 +768,5 @@ sal_Bool ImpOptimizer::Optimize( const Sequence<
PropertyValue >& rArguments )
bRet = sal_False;
return bRet;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/minimizer/minimizer.hrc
b/main/sdext/source/minimizer/minimizer.hrc
index 4aa7426b65..0b264e494c 100644
--- a/main/sdext/source/minimizer/minimizer.hrc
+++ b/main/sdext/source/minimizer/minimizer.hrc
@@ -36,7 +36,7 @@
#define STR_CANCEL MINIMIZER_RES_STR_START + 7
#define STR_INTRODUCTION MINIMIZER_RES_STR_START + 8
#define STR_INTRODUCTION_T MINIMIZER_RES_STR_START + 9
-#define STR_CHOSE_SETTINGS MINIMIZER_RES_STR_START + 10
+#define STR_CHOOSE_SETTINGS MINIMIZER_RES_STR_START + 10
#define STR_REMOVE MINIMIZER_RES_STR_START + 11
#define STR_GRAPHIC_OPTIMIZATION MINIMIZER_RES_STR_START + 12
#define STR_IMAGE_OPTIMIZATION MINIMIZER_RES_STR_START + 13
diff --git a/main/sdext/source/minimizer/minimizer.src
b/main/sdext/source/minimizer/minimizer.src
index 4a66734e3b..3b73a77421 100644
--- a/main/sdext/source/minimizer/minimizer.src
+++ b/main/sdext/source/minimizer/minimizer.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "minimizer.hrc"
Bitmap IMAGE_MINIMIZER_ROADMAP
@@ -88,7 +86,7 @@ String STR_INTRODUCTION_T
"the presentation." ;
};
-String STR_CHOSE_SETTINGS
+String STR_CHOOSE_SETTINGS
{
Text [ en-US ] = "~Choose settings for Presentation Minimizer" ;
};
diff --git a/main/sdext/source/minimizer/optimizerdialog.cxx
b/main/sdext/source/minimizer/optimizerdialog.cxx
index b28aaa0463..2aa6d1c1fb 100644
--- a/main/sdext/source/minimizer/optimizerdialog.cxx
+++ b/main/sdext/source/minimizer/optimizerdialog.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -40,9 +38,9 @@
#include "minimizer.hrc"
#include "helpid.hrc"
-#define URL_GRAPHIC_REPO "private:graphicrepository"
-#define IMAGE_ROADMAP URL_GRAPHIC_REPO
"/minimizer/minimizepresi_80.png"
-#define IMAGE_ROADMAP_HC URL_GRAPHIC_REPO
"/minimizer/minimizepresi_80_h.png"
+#define URL_GRAPHIC_REPO "private:graphicrepository"
+#define IMAGE_ROADMAP URL_GRAPHIC_REPO
"/minimizer/minimizepresi_80.png"
+#define IMAGE_ROADMAP_HC URL_GRAPHIC_REPO
"/minimizer/minimizepresi_80_h.png"
// -------------------
// - OPTIMIZERDIALOG -
@@ -71,7 +69,7 @@ void OptimizerDialog::InitDialog()
OUString pNames[] = {
TKGet( TK_Closeable ),
TKGet( TK_Height ),
- TKGet( TK_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_Moveable ),
TKGet( TK_PositionX ),
TKGet( TK_PositionY ),
@@ -81,19 +79,19 @@ void OptimizerDialog::InitDialog()
Any pValues[] = {
Any( sal_True ),
Any( sal_Int32( DIALOG_HEIGHT ) ),
- Any( HID( HID_SDEXT_MINIMIZER_WIZ_DLG ) ),
+ Any( HID( HID_SDEXT_MINIMIZER_WIZ_DLG ) ),
Any( sal_True ),
Any( sal_Int32( 200 ) ),
Any( sal_Int32( 52 ) ),
Any( getString( STR_PRESENTATION_MINIMIZER ) ),
Any( sal_Int32( OD_DIALOG_WIDTH ) ) };
-
+
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
Sequence< rtl::OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues, nCount );
- mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
+ mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
}
//
-----------------------------------------------------------------------------
@@ -123,11 +121,11 @@ void OptimizerDialog::InitRoadmap()
Sequence< rtl::OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues,
nCount );
- mxRoadmapControlModel = insertControlModel( OUString(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ),
+ mxRoadmapControlModel = insertControlModel( OUString(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ),
TKGet( TK_rdmNavi ), aNames, aValues
);
Reference< XPropertySet > xPropertySet( mxRoadmapControlModel,
UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet(
TK_rdmNavi ) ) );
+ xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet(
TK_rdmNavi ) ) );
mxRoadmapControl = mxDialogControlContainer->getControl( TKGet(
TK_rdmNavi ) );
InsertRoadmapItem( 0, sal_True, getString( STR_INTRODUCTION ),
ITEM_ID_INTRODUCTION );
InsertRoadmapItem( 1, sal_True, getString( STR_SLIDES ),
ITEM_ID_SLIDES );
@@ -136,9 +134,9 @@ void OptimizerDialog::InitRoadmap()
InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ),
ITEM_ID_SUMMARY );
rtl::OUString sBitmap(
- isHighContrast() ?
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGE_ROADMAP_HC ) ) :
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGE_ROADMAP ) ) );
+ isHighContrast() ?
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
IMAGE_ROADMAP_HC ) ) :
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
IMAGE_ROADMAP ) ) );
xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any(
sBitmap ) );
xPropertySet->setPropertyValue( TKGet( TK_Activated ), Any(
(sal_Bool)sal_True ) );
@@ -148,7 +146,7 @@ void OptimizerDialog::InitRoadmap()
}
catch( Exception& )
{
- }
+ }
}
//
-----------------------------------------------------------------------------
@@ -182,7 +180,7 @@ void OptimizerDialog::UpdateConfiguration()
Sequence< sal_Int16 > aSelectedItems;
Sequence< OUString > aStringItemList;
-
+
// page0
aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet(
TK_SelectedItems ) );
if ( aAny >>= aSelectedItems )
@@ -225,19 +223,19 @@ void OptimizerDialog::UpdateConfiguration()
//
-----------------------------------------------------------------------------
OptimizerDialog::OptimizerDialog(
- const Reference< XComponentContext > &rxContext,
- const Reference< XFrame > &rxFrame,
- const Reference< XWindowPeer >& rxParent )
- : UnoDialog( rxContext, rxParent )
+ const Reference< XComponentContext > &rxContext,
+ const Reference< XFrame > &rxFrame,
+ const Reference< XWindowPeer >& rxParent )
+ : UnoDialog( rxContext, rxParent )
, ConfigurationAccess( rxContext, NULL )
- , mxFrame( rxFrame )
- , mnCurrentStep( 0 )
- , mnTabIndex( 0 )
+ , mxFrame( rxFrame )
+ , mnCurrentStep( 0 )
+ , mnTabIndex( 0 )
{
- OSL_TRACE("OptimizerDialog::OptimizerDialog");
- OSL_ENSURE( mxFrame.is(), "OptimizerDialog: no XFrame!" );
- Reference< XController > xController( mxFrame->getController() );
- mxModel = xController->getModel();
+ OSL_TRACE("OptimizerDialog::OptimizerDialog");
+ OSL_ENSURE( mxFrame.is(), "OptimizerDialog: no XFrame!" );
+ Reference< XController > xController( mxFrame->getController() );
+ mxModel = xController->getModel();
Reference< XStorable> xStorable( mxModel, UNO_QUERY_THROW );
mbIsReadonly = xStorable->isReadonly();
@@ -256,38 +254,38 @@ OptimizerDialog::OptimizerDialog(
Sequence< PropertyValue > aStatusSequence( aStats.GetStatusSequence() );
UpdateStatus( aStatusSequence );
- centerDialog();
+ centerDialog();
}
//
-----------------------------------------------------------------------------
OptimizerDialog::~OptimizerDialog()
{
- OSL_TRACE("OptimizerDialog::~OptimizerDialog");
+ OSL_TRACE("OptimizerDialog::~OptimizerDialog");
// not saving configuration if the dialog has been finished via cancel
or close window
if ( mbStatus )
SaveConfiguration();
- Reference< XComponent > xComponent( mxDialog, UNO_QUERY );
- if ( xComponent.is() )
- {
- OSL_TRACE("OptimizerDialog::~OptimizerDialog - disposing dialog!");
- xComponent->dispose();
- }
+ Reference< XComponent > xComponent( mxDialog, UNO_QUERY );
+ if ( xComponent.is() )
+ {
+ OSL_TRACE("OptimizerDialog::~OptimizerDialog - disposing
dialog!");
+ xComponent->dispose();
+ }
}
void SAL_CALL OptimizerDialog::statusChanged(
- const ::com::sun::star::frame::FeatureStateEvent& aState )
+ const ::com::sun::star::frame::FeatureStateEvent& aState )
throw (::com::sun::star::uno::RuntimeException)
{
- Sequence< PropertyValue > aArguments;
- if ( ( aState.State >>= aArguments ) && aArguments.getLength() )
- UpdateStatus( aArguments );
+ Sequence< PropertyValue > aArguments;
+ if ( ( aState.State >>= aArguments ) && aArguments.getLength() )
+ UpdateStatus( aArguments );
}
void SAL_CALL OptimizerDialog::disposing(
- const ::com::sun::star::lang::EventObject& /*aSource*/ )
+ const ::com::sun::star::lang::EventObject& /*aSource*/ )
throw (::com::sun::star::uno::RuntimeException)
{}
@@ -314,14 +312,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 );
@@ -555,7 +553,7 @@ void OptimizerDialog::actionPerformed( const ActionEvent&
rEvent )
setControlProperty( TKGet( TK_btnNavCancel ), TKGet(
TK_Enabled ), Any( sal_False ) );
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;
getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet(
TK_State ) ) >>= nInt16;
@@ -632,12 +630,12 @@ void OptimizerDialog::actionPerformed( const ActionEvent&
rEvent )
Sequence< Any > aArgs( 1 );
aArgs[ 0 ] <<= mxFrame;
- Reference < XDispatch > xDispatch(
-
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.presentation.PresentationOptimizer"
) ),
- aArgs, mxContext ),
- UNO_QUERY );
+ Reference < XDispatch > xDispatch(
+
mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
+
"com.sun.star.presentation.PresentationOptimizer" ) ),
+ aArgs, mxContext ),
+ UNO_QUERY );
URL aURL;
aURL.Protocol = OUString(
RTL_CONSTASCII_USTRINGPARAM(
"vnd.com.sun.star.presentation.PresentationOptimizer:" ) );
@@ -684,27 +682,27 @@ void OptimizerDialog::actionPerformed( const ActionEvent&
rEvent )
}
break;
default:
- {
- Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
- if ( xControl.is() )
- {
- OUString aName;
- Reference< XPropertySet > xProps( xControl->getModel(),
UNO_QUERY );
- xProps->getPropertyValue( TKGet( TK_Name ) ) >>= aName;
- if ( TKGet( aName ) == TK_ListBox0Pg0 )
- {
- if ( rEvent.ActionCommand.getLength() )
- {
- std::vector< OptimizerSettings >::iterator aIter(
GetOptimizerSettingsByName( rEvent.ActionCommand ) );
- std::vector< OptimizerSettings >& rList(
GetOptimizerSettings() );
- if ( aIter != rList.end() )
- rList[ 0 ] = *aIter;
- }
- UpdateControlStates();
- }
- }
- }
- break;
+ {
+ Reference< XControl > xControl( rEvent.Source,
UNO_QUERY );
+ if ( xControl.is() )
+ {
+ OUString aName;
+ Reference< XPropertySet > xProps(
xControl->getModel(), UNO_QUERY );
+ xProps->getPropertyValue( TKGet( TK_Name ) )
>>= aName;
+ if ( TKGet( aName ) == TK_ListBox0Pg0 )
+ {
+ if ( rEvent.ActionCommand.getLength() )
+ {
+ std::vector< OptimizerSettings
>::iterator aIter( GetOptimizerSettingsByName( rEvent.ActionCommand ) );
+ std::vector< OptimizerSettings
>& rList( GetOptimizerSettings() );
+ if ( aIter != rList.end() )
+ rList[ 0 ] = *aIter;
+ }
+ UpdateControlStates();
+ }
+ }
+ }
+ break;
}
}
@@ -713,38 +711,38 @@ void OptimizerDialog::actionPerformed( const ActionEvent&
rEvent )
void OptimizerDialog::textChanged( const TextEvent& rEvent )
throw ( com::sun::star::uno::RuntimeException )
{
- Reference< XSpinField > xFormattedField( rEvent.Source, UNO_QUERY );
- if ( xFormattedField.is() )
- {
- double fDouble = 0;
- Any aAny = getControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ) );
- if ( aAny >>= fDouble )
- SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
- return;
- }
-
- Reference< XComboBox > xComboBox( rEvent.Source, UNO_QUERY );
- if ( xComboBox.is() )
- {
- rtl::OUString aString;
- Any aAny = getControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet(
TK_Text ) );
- if ( aAny >>= aString )
- {
- sal_Int32 nI0, nI1, nI2, nI3, nI4;
- nI0 = nI1 = nI2 = nI3 = nI4 = 0;
-
- if ( getString( STR_IMAGE_RESOLUTION_0 ).getToken( 1, ';', nI0 )
== aString )
- aString = getString( STR_IMAGE_RESOLUTION_0 ).getToken( 0,
';', nI4 );
- else if ( getString( STR_IMAGE_RESOLUTION_1 ).getToken( 1, ';',
nI1 ) == aString )
- aString = getString( STR_IMAGE_RESOLUTION_1 ).getToken( 0,
';', nI4 );
- else if ( getString( STR_IMAGE_RESOLUTION_2 ).getToken( 1, ';',
nI2 ) == aString )
- aString = getString( STR_IMAGE_RESOLUTION_2 ).getToken( 0,
';', nI4 );
- else if ( getString( STR_IMAGE_RESOLUTION_3 ).getToken( 1, ';',
nI3 ) == aString )
- aString = getString( STR_IMAGE_RESOLUTION_3 ).getToken( 0,
';', nI4 );
-
- SetConfigProperty( TK_ImageResolution, Any( aString.toInt32() ) );
- }
- }
+ Reference< XSpinField > xFormattedField( rEvent.Source, UNO_QUERY );
+ if ( xFormattedField.is() )
+ {
+ double fDouble = 0;
+ Any aAny = getControlProperty( TKGet( TK_FormattedField0Pg1 ),
TKGet( TK_EffectiveValue ) );
+ if ( aAny >>= fDouble )
+ SetConfigProperty( TK_JPEGQuality, Any(
(sal_Int32)fDouble ) );
+ return;
+ }
+
+ Reference< XComboBox > xComboBox( rEvent.Source, UNO_QUERY );
+ if ( xComboBox.is() )
+ {
+ rtl::OUString aString;
+ Any aAny = getControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet(
TK_Text ) );
+ if ( aAny >>= aString )
+ {
+ sal_Int32 nI0, nI1, nI2, nI3, nI4;
+ nI0 = nI1 = nI2 = nI3 = nI4 = 0;
+
+ if ( getString( STR_IMAGE_RESOLUTION_0 ).getToken( 1,
';', nI0 ) == aString )
+ aString = getString( STR_IMAGE_RESOLUTION_0
).getToken( 0, ';', nI4 );
+ else if ( getString( STR_IMAGE_RESOLUTION_1 ).getToken(
1, ';', nI1 ) == aString )
+ aString = getString( STR_IMAGE_RESOLUTION_1
).getToken( 0, ';', nI4 );
+ else if ( getString( STR_IMAGE_RESOLUTION_2 ).getToken(
1, ';', nI2 ) == aString )
+ aString = getString( STR_IMAGE_RESOLUTION_2
).getToken( 0, ';', nI4 );
+ else if ( getString( STR_IMAGE_RESOLUTION_3 ).getToken(
1, ';', nI3 ) == aString )
+ aString = getString( STR_IMAGE_RESOLUTION_3
).getToken( 0, ';', nI4 );
+
+ SetConfigProperty( TK_ImageResolution, Any(
aString.toInt32() ) );
+ }
+ }
}
//
-----------------------------------------------------------------------------
@@ -759,7 +757,7 @@ void OptimizerDialog::up( const SpinEvent& /* rEvent */ )
fDouble += 9;
if ( fDouble > 100 )
fDouble = 100;
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( fDouble ) );
+ setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( fDouble ) );
SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
}
@@ -774,7 +772,7 @@ void OptimizerDialog::down( const SpinEvent& /* rEvent */ )
fDouble -= 9;
if ( fDouble < 0 )
fDouble = 0;
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( fDouble ) );
+ setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( fDouble ) );
SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
}
}
@@ -782,13 +780,15 @@ void OptimizerDialog::down( const SpinEvent& /* rEvent */
)
void OptimizerDialog::first( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );
+ setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );
SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) );
}
void OptimizerDialog::last( const SpinEvent& /* rEvent */ )
throw ( com::sun::star::uno::RuntimeException )
{
- setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );
+ setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet(
TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );
SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/minimizer/optimizerdialog.hrc
b/main/sdext/source/minimizer/optimizerdialog.hrc
index d23d64d778..2ec1a143e2 100644
--- a/main/sdext/source/minimizer/optimizerdialog.hrc
+++ b/main/sdext/source/minimizer/optimizerdialog.hrc
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _OPTIMIZERDIALOG_HRC
#define _OPTIMIZERDIALOG_HRC
diff --git a/main/sdext/source/minimizer/optimizerdialogcontrols.cxx
b/main/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 5c4b298fa3..843fdcb57a 100644
--- a/main/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/main/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -71,12 +69,12 @@ void OptimizerDialog::ImplSetBold( const rtl::OUString&
rControl )
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertSeparator(
- const OUString& rControlName,
- sal_Int32 nOrientation,
- sal_Int32 nPosX,
- sal_Int32 nPosY,
- sal_Int32 nWidth,
- sal_Int32 nHeight )
+ const OUString& rControlName,
+ sal_Int32 nOrientation,
+ sal_Int32 nPosX,
+ sal_Int32 nPosY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight )
{
OUString pNames[] = {
TKGet( TK_Height ),
@@ -107,21 +105,21 @@ rtl::OUString OptimizerDialog::ImplInsertSeparator(
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertButton(
- const OUString& rControlName,
- const rtl::OUString& rHelpURL,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Int16 nTabIndex,
- sal_Bool bEnabled,
- sal_Int32 nResID,
- sal_Int16 nPushButtonType )
+ const OUString& rControlName,
+ const rtl::OUString& rHelpURL,
+ sal_Int32 nXPos,
+ sal_Int32 nYPos,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Int16 nTabIndex,
+ sal_Bool bEnabled,
+ sal_Int32 nResID,
+ sal_Int16 nPushButtonType )
{
OUString pNames[] = {
TKGet( TK_Enabled ),
TKGet( TK_Height ),
- TKGet( TK_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_Label ),
TKGet( TK_PositionX ),
TKGet( TK_PositionY ),
@@ -131,9 +129,9 @@ rtl::OUString OptimizerDialog::ImplInsertButton(
TKGet( TK_Width ) };
Any pValues[] = {
- Any( bEnabled ),
+ Any( bEnabled ),
Any( nHeight ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( getString( nResID ) ),
Any( nXPos ),
Any( nYPos ),
@@ -155,15 +153,15 @@ rtl::OUString OptimizerDialog::ImplInsertButton(
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertFixedText(
- const rtl::OUString& rControlName,
- const OUString& rLabel,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Bool bMultiLine,
- sal_Bool bBold,
- sal_Int16 nTabIndex )
+ const rtl::OUString& rControlName,
+ const OUString& rLabel,
+ 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 ),
@@ -199,19 +197,19 @@ rtl::OUString OptimizerDialog::ImplInsertFixedText(
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertCheckBox(
- const OUString& rControlName,
- const OUString& rLabel,
- const rtl::OUString& rHelpURL,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Int16 nTabIndex )
+ const OUString& rControlName,
+ const OUString& rLabel,
+ const rtl::OUString& rHelpURL,
+ 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_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_Label ),
TKGet( TK_PositionX ),
TKGet( TK_PositionY ),
@@ -222,7 +220,7 @@ rtl::OUString OptimizerDialog::ImplInsertCheckBox(
Any pValues[] = {
Any( sal_True ),
Any( nHeight ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( rLabel ),
Any( nXPos ),
Any( nYPos ),
@@ -236,28 +234,28 @@ rtl::OUString OptimizerDialog::ImplInsertCheckBox(
Sequence< Any > aValues( pValues, nCount );
Reference< XCheckBox > xCheckBox( insertCheckBox( rControlName, aNames,
aValues ) );
- xCheckBox->addItemListener( this );
+ xCheckBox->addItemListener( this );
return rControlName;
}
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertFormattedField(
- const OUString& rControlName,
- const rtl::OUString& rHelpURL,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- double fEffectiveMin,
- double fEffectiveMax,
- sal_Int16 nTabIndex )
+ const OUString& rControlName,
+ const rtl::OUString& rHelpURL,
+ sal_Int32 nXPos,
+ sal_Int32 nYPos,
+ sal_Int32 nWidth,
+ double fEffectiveMin,
+ double fEffectiveMax,
+ sal_Int16 nTabIndex )
{
OUString pNames[] = {
TKGet( TK_EffectiveMax ),
TKGet( TK_EffectiveMin ),
TKGet( TK_Enabled ),
TKGet( TK_Height ),
- TKGet( TK_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_PositionX ),
TKGet( TK_PositionY ),
TKGet( TK_Repeat ),
@@ -271,7 +269,7 @@ rtl::OUString OptimizerDialog::ImplInsertFormattedField(
Any( fEffectiveMin ),
Any( sal_True ),
Any( (sal_Int32)12 ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( nXPos ),
Any( nYPos ),
Any( (sal_Bool)sal_True ),
@@ -286,9 +284,9 @@ rtl::OUString OptimizerDialog::ImplInsertFormattedField(
Sequence< Any > aValues( pValues, nCount );
Reference< XTextComponent > xTextComponent( insertFormattedField(
rControlName, aNames, aValues ), UNO_QUERY_THROW );
- xTextComponent->addTextListener( this );
- Reference< XSpinField > xSpinField( xTextComponent, UNO_QUERY_THROW );
- xSpinField->addSpinListener( this );
+ xTextComponent->addTextListener( this );
+ Reference< XSpinField > xSpinField( xTextComponent, UNO_QUERY_THROW );
+ xSpinField->addSpinListener( this );
return rControlName;
}
@@ -296,22 +294,22 @@ rtl::OUString OptimizerDialog::ImplInsertFormattedField(
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertComboBox(
- const OUString& rControlName,
- const rtl::OUString& rHelpURL,
- const sal_Bool bEnabled,
- const Sequence< OUString >& rItemList,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Int16 nTabIndex,
- bool bListen )
+ const OUString& rControlName,
+ const rtl::OUString& rHelpURL,
+ const sal_Bool bEnabled,
+ const Sequence< OUString >& rItemList,
+ sal_Int32 nXPos,
+ sal_Int32 nYPos,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Int16 nTabIndex,
+ bool bListen )
{
OUString pNames[] = {
TKGet( TK_Dropdown ),
TKGet( TK_Enabled ),
TKGet( TK_Height ),
- TKGet( TK_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_LineCount ),
TKGet( TK_PositionX ),
TKGet( TK_PositionY ),
@@ -324,7 +322,7 @@ rtl::OUString OptimizerDialog::ImplInsertComboBox(
Any( sal_True ),
Any( bEnabled ),
Any( nHeight ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( (sal_Int16)8),
Any( nXPos ),
Any( nYPos ),
@@ -339,27 +337,27 @@ rtl::OUString OptimizerDialog::ImplInsertComboBox(
Sequence< Any > aValues( pValues, nCount );
Reference< XTextComponent > xTextComponent( insertComboBox(
rControlName, aNames, aValues ), UNO_QUERY_THROW );
- if ( bListen )
- xTextComponent->addTextListener( this );
+ if ( bListen )
+ xTextComponent->addTextListener( this );
return rControlName;
}
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertRadioButton(
- const rtl::OUString& rControlName,
- const OUString& rLabel,
- const rtl::OUString& rHelpURL,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Bool bMultiLine,
- sal_Int16 nTabIndex )
+ const rtl::OUString& rControlName,
+ const OUString& rLabel,
+ const rtl::OUString& rHelpURL,
+ 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_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_Label ),
TKGet( TK_MultiLine ),
TKGet( TK_PositionX ),
@@ -370,7 +368,7 @@ rtl::OUString OptimizerDialog::ImplInsertRadioButton(
Any pValues[] = {
Any( nHeight ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( rLabel ),
Any( bMultiLine ),
Any( nXPos ),
@@ -385,28 +383,28 @@ rtl::OUString OptimizerDialog::ImplInsertRadioButton(
Sequence< Any > aValues( pValues, nCount );
Reference< XRadioButton > xRadioButton( insertRadioButton(
rControlName, aNames, aValues ) );
- xRadioButton->addItemListener( this );
+ xRadioButton->addItemListener( this );
return rControlName;
}
//
-----------------------------------------------------------------------------
rtl::OUString OptimizerDialog::ImplInsertListBox(
- const OUString& rControlName,
- const rtl::OUString& rHelpURL,
- const sal_Bool bEnabled,
- const Sequence< OUString >& rItemList,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
- sal_Int16 nTabIndex )
+ const OUString& rControlName,
+ const rtl::OUString& rHelpURL,
+ const sal_Bool bEnabled,
+ const Sequence< OUString >& rItemList,
+ 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_HelpURL ),
+ TKGet( TK_HelpURL ),
TKGet( TK_LineCount ),
TKGet( TK_MultiSelection ),
TKGet( TK_PositionX ),
@@ -420,7 +418,7 @@ rtl::OUString OptimizerDialog::ImplInsertListBox(
Any( sal_True ),
Any( bEnabled ),
Any( nHeight ),
- Any( rHelpURL ),
+ Any( rHelpURL ),
Any( (sal_Int16)8),
Any( sal_False ),
Any( nXPos ),
@@ -436,7 +434,7 @@ rtl::OUString OptimizerDialog::ImplInsertListBox(
Sequence< Any > aValues( pValues, nCount );
Reference< XListBox > xListBox( insertListBox( rControlName, aNames,
aValues ) );
- xListBox->addActionListener( this );
+ xListBox->addActionListener( this );
return rControlName;
}
@@ -444,10 +442,10 @@ rtl::OUString OptimizerDialog::ImplInsertListBox(
void OptimizerDialog::InitNavigationBar()
{
- sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
- sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
- sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
- sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
+ sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
+ sal_Int32 nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
+ sal_Int32 nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
+ sal_Int32 nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
ImplInsertSeparator( TKGet( TK_lnNavSep1 ), 0, 0, DIALOG_HEIGHT - 26,
OD_DIALOG_WIDTH, 1 );
ImplInsertSeparator( TKGet( TK_lnNavSep2 ), 1, 85, 0, 1, BUTTON_POS_Y -
6 );
@@ -488,7 +486,7 @@ void OptimizerDialog::UpdateControlStatesPage0()
{
aSelectedItems.realloc( 1 );
aSelectedItems[ 0 ] = nSelectedItem;
- if ( nSelectedItem > 2 ) // only allowing to delete
custom themes, the first can|t be deleted
+ if ( nSelectedItem > 2 ) // only allowing to delete
custom themes, the first can't be deleted
bRemoveButtonEnabled = sal_True;
}
setControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_StringItemList
), Any( aItemList ) );
@@ -502,8 +500,8 @@ void OptimizerDialog::InitPage0()
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText0Pg0 ),
getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8,
sal_False, sal_True, mnTabIndex++ ) );
aControlList.push_back( ImplInsertFixedText( 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( ImplInsertSeparator( TKGet( TK_Separator1Pg0 ),
0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) );
- aControlList.push_back( ImplInsertFixedText( 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( ImplInsertListBox( TKGet( TK_ListBox0Pg0 ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP1_LB_SETTINGS),sal_True, aItemList, PAGE_POS_X
+ 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12,
mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText2Pg0 ),
getString( STR_CHOOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60,
PAGE_WIDTH - 12, 8, sal_True, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertListBox( TKGet( TK_ListBox0Pg0 ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP1_LB_SETTINGS),sal_True, aItemList, PAGE_POS_X
+ 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12,
mnTabIndex++ ) );
aControlList.push_back( ImplInsertButton( TKGet( TK_Button0Pg0 ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP1_PB_DELSETTS ),OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT
- 49, 40, 14, mnTabIndex++, sal_True, STR_REMOVE, PushButtonType_STANDARD ) );
maControlPages.push_back( aControlList );
DeactivatePage( 0 );
@@ -530,16 +528,16 @@ void OptimizerDialog::InitPage1()
{
Reference< XCustomPresentationSupplier > aXCPSup( xModel,
UNO_QUERY_THROW );
Reference< XNameContainer > aXCont(
aXCPSup->getCustomPresentations() );
- if ( aXCont.is() )
- aCustomShowList = aXCont->getElementNames();
+ if ( aXCont.is() )
+ aCustomShowList = aXCont->getElementNames();
}
std::vector< rtl::OUString > aControlList;
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText0Pg3 ),
getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8,
sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox0Pg3 ),
getString( STR_DELETE_MASTER_PAGES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_MASTERPAGES ), PAGE_POS_X + 6, PAGE_POS_Y +
14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox2Pg3 ),
getString( STR_DELETE_HIDDEN_SLIDES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_HIDDENSLIDES ), PAGE_POS_X + 6, PAGE_POS_Y +
28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox3Pg3 ),
getString( STR_CUSTOM_SHOW ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_CUSTOMSHOW
), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertListBox( TKGet( TK_ListBox0Pg3 ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP2_LB_CUSTOMSHOW),sal_True, aCustomShowList,
PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg3 ),
getString( STR_DELETE_NOTES_PAGES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_NOTES ), PAGE_POS_X + 6, PAGE_POS_Y + 70,
PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox0Pg3 ),
getString( STR_DELETE_MASTER_PAGES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_MASTERPAGES ), PAGE_POS_X + 6, PAGE_POS_Y +
14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox2Pg3 ),
getString( STR_DELETE_HIDDEN_SLIDES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_HIDDENSLIDES ), PAGE_POS_X + 6, PAGE_POS_Y +
28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox3Pg3 ),
getString( STR_CUSTOM_SHOW ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_CUSTOMSHOW
), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertListBox( TKGet( TK_ListBox0Pg3 ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP2_LB_CUSTOMSHOW),sal_True, aCustomShowList,
PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg3 ),
getString( STR_DELETE_NOTES_PAGES ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_NOTES ), PAGE_POS_X + 6, PAGE_POS_Y + 70,
PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 1 );
@@ -583,7 +581,7 @@ void OptimizerDialog::UpdateControlStatesPage2()
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_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 ) );
@@ -607,9 +605,9 @@ void OptimizerDialog::InitPage2()
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText1Pg1 ),
getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, sal_False,
sal_False, mnTabIndex++ ) );
aControlList.push_back( ImplInsertFormattedField( TKGet(
TK_FormattedField0Pg1 ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP3_MF_QUALITY ),
PAGE_POS_X + 106, PAGE_POS_Y + 38, 50, 0, 100, mnTabIndex++ ) );
aControlList.push_back( ImplInsertFixedText( 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( ImplInsertComboBox( TKGet( TK_ComboBox0Pg1 ),
HID( HID_SDEXT_MINIMIZER_WIZ_STEP3_LB_DPI ), sal_True, aResolutionItemList,
PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg1 ),
getString( STR_REMOVE_CROP_AREA ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_CROP
), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox2Pg1 ),
getString( STR_EMBED_LINKED_GRAPHICS ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_LINKS ), PAGE_POS_X + 6, PAGE_POS_Y + 82,
PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertComboBox( TKGet( TK_ComboBox0Pg1 ),
HID( HID_SDEXT_MINIMIZER_WIZ_STEP3_LB_DPI ), sal_True, aResolutionItemList,
PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg1 ),
getString( STR_REMOVE_CROP_AREA ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_CROP
), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox2Pg1 ),
getString( STR_EMBED_LINKED_GRAPHICS ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_LINKS ), PAGE_POS_X + 6, PAGE_POS_Y + 82,
PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 2 );
UpdateControlStatesPage2();
@@ -648,7 +646,7 @@ void OptimizerDialog::InitPage3()
std::vector< rtl::OUString > aControlList;
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText0Pg2 ),
getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8,
sal_False, sal_True, mnTabIndex++ ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox0Pg2 ),
getString( STR_OLE_REPLACE ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP4_CB_OLE ),
PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox0Pg2 ),
getString( STR_OLE_REPLACE ), HID( HID_SDEXT_MINIMIZER_WIZ_STEP4_CB_OLE ),
PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
aControlList.push_back( ImplInsertRadioButton( TKGet(
TK_RadioButton0Pg2 ), getString( STR_ALL_OLE_OBJECTS ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP4_RB_ALLOLE), PAGE_POS_X + 14, PAGE_POS_Y + 28,
PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
aControlList.push_back( ImplInsertRadioButton( TKGet(
TK_RadioButton1Pg2 ), getString( STR_ALIEN_OLE_OBJECTS_ONLY ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP4_RB_NOTODF),PAGE_POS_X + 14, PAGE_POS_Y + 40,
PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
aControlList.push_back( ImplInsertFixedText( 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++ ) );
@@ -832,7 +830,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 );
if ( i >= 0 )
aStr = aStr.replaceAt( i,
aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) );
-
+
sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 );
if ( j >= 0 )
aStr = aStr.replaceAt( j,
aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) );
@@ -922,7 +920,7 @@ void OptimizerDialog::InitPage4()
Any pValues[] = {
Any( (sal_Int32)12 ),
- Any( OUString(
RTL_CONSTASCII_USTRINGPARAM("STR_SAVE_AS") ) ),//TODO
+ Any( OUString(
RTL_CONSTASCII_USTRINGPARAM("STR_SAVE_AS") ) ), //TODO
Any( (sal_Int32)( PAGE_POS_X + 6 ) ),
Any( (sal_Int32)( DIALOG_HEIGHT - 75 ) ),
Any( (sal_Int32)( 0 ) ),
@@ -955,18 +953,18 @@ void OptimizerDialog::InitPage4()
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText8Pg4 ),
OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, sal_False, sal_False,
mnTabIndex++ ) );
setControlProperty( TKGet( TK_FixedText8Pg4 ), TKGet( TK_Align ), Any(
static_cast< short >( 2 ) ) );
- aControlList.push_back( ImplInsertRadioButton( TKGet(
TK_RadioButton0Pg4 ), getString( STR_APPLY_TO_CURRENT ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP5_RB_CURDOC),PAGE_POS_X + 6, PAGE_POS_Y + 78,
PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
+ aControlList.push_back( ImplInsertRadioButton( TKGet(
TK_RadioButton0Pg4 ), getString( STR_APPLY_TO_CURRENT ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP5_RB_CURDOC),PAGE_POS_X + 6, PAGE_POS_Y + 78,
PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
aControlList.push_back( ImplInsertRadioButton( TKGet(
TK_RadioButton1Pg4 ), getString( STR_SAVE_AS ),
HID(HID_SDEXT_MINIMIZER_WIZ_STEP5_RB_NEWDOC),PAGE_POS_X + 6, PAGE_POS_Y + 90,
PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
aControlList.push_back( ImplInsertFixedText( TKGet( TK_FixedText1Pg4 ),
OUString(), PAGE_POS_X + 6, DIALOG_HEIGHT - 87, PAGE_WIDTH - 12, 8, sal_True,
sal_False, mnTabIndex++ ) );
aControlList.push_back( TKGet( TK_Progress ) );
aControlList.push_back( ImplInsertSeparator( TKGet( TK_Separator1Pg4 ),
0, PAGE_POS_X + 6, DIALOG_HEIGHT - 58, PAGE_WIDTH - 12, 1 ) );
- aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg4 ),
getString( STR_SAVE_SETTINGS ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP5_CB_SAVESETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT
- 47, 100, 8, mnTabIndex++ ) );
- // don't listen to this
+ aControlList.push_back( ImplInsertCheckBox( TKGet( TK_CheckBox1Pg4 ),
getString( STR_SAVE_SETTINGS ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP5_CB_SAVESETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT
- 47, 100, 8, mnTabIndex++ ) );
+ // don't listen to this
aControlList.push_back(
- ImplInsertComboBox(
- TKGet( TK_ComboBox0Pg4 ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP5_LB_SETTINGSNAME ),sal_True, aItemList,
- PAGE_POS_X + 106, DIALOG_HEIGHT - 48, 100, 12, mnTabIndex++ ,
- false) );
+ ImplInsertComboBox(
+ TKGet( TK_ComboBox0Pg4 ), HID(
HID_SDEXT_MINIMIZER_WIZ_STEP5_LB_SETTINGSNAME ),sal_True, aItemList,
+ PAGE_POS_X + 106, DIALOG_HEIGHT - 48, 100, 12,
mnTabIndex++ ,
+ false) );
maControlPages.push_back( aControlList );
DeactivatePage( 4 );
@@ -1025,3 +1023,5 @@ void OptimizerDialog::DeactivatePage( sal_Int16 nStep )
while( aBeg != aEnd )
setVisible( *aBeg++, sal_False );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/minimizer/pppoptimizertoken.cxx
b/main/sdext/source/minimizer/pppoptimizertoken.cxx
index b116a1b398..aba42cb69e 100644
--- a/main/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/main/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sdext.hxx"
@@ -39,11 +37,11 @@ static ::osl::Mutex& getHashMapMutex()
struct TokenTable
{
- const char* pS;
+ const char* pS;
PPPOptimizerTokenEnum pE;
};
-static const TokenTable pTokenTableArray[] =
+static const TokenTable pTokenTableArray[] =
{
{ "rdmNavi", TK_rdmNavi },
{ "lnNavSep1", TK_lnNavSep1 },
@@ -138,11 +136,11 @@ static const TokenTable pTokenTableArray[] =
{ "GraphicURL", TK_GraphicURL },
{ "GraphicStreamURL", TK_GraphicStreamURL },
{ "Height", TK_Height },
- { "HelpURL", TK_HelpURL },
+ { "HelpURL", TK_HelpURL },
{ "Hidden", TK_Hidden },
{ "ID", TK_ID },
{ "ImageURL", TK_ImageURL },
- { "ParentWindow", TK_ParentWindow },// TODO move it
+ { "ParentWindow", TK_ParentWindow }, // TODO move it
{ "InputStream", TK_InputStream },
{ "Interlaced", TK_Interlaced },
{ "IsInternal", TK_IsInternal },
@@ -178,7 +176,7 @@ static const TokenTable pTokenTableArray[] =
{ "Spin", TK_Spin },
{ "Step", TK_Step },
{ "State", TK_State },
- { "StatusListener", TK_StatusListener },
+ { "StatusListener", TK_StatusListener },
{ "StringItemList", TK_StringItemList },
{ "Strings", TK_Strings },
{ "TabIndex", TK_TabIndex },
@@ -228,7 +226,7 @@ static const TokenTable pTokenTableArray[] =
{ "STR_CANCEL", STR_CANCEL },
{ "STR_INTRODUCTION", STR_INTRODUCTION },
{ "STR_INTRODUCTION_T", STR_INTRODUCTION_T },
- { "STR_CHOSE_SETTINGS", STR_CHOSE_SETTINGS },
+ { "STR_CHOOSE_SETTINGS", STR_CHOOSE_SETTINGS },
{ "STR_REMOVE", STR_REMOVE },
{ "STR_GRAPHIC_OPTIMIZATION", STR_GRAPHIC_OPTIMIZATION },
{ "STR_IMAGE_OPTIMIZATION", STR_IMAGE_OPTIMIZATION },
@@ -285,7 +283,7 @@ static const TokenTable pTokenTableArray[] =
{ "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS },
{ "STR_FileSizeSeparator", STR_FILESIZESEPARATOR },
#endif
- { "Last", TK_Last },
+ { "Last", TK_Last },
{ "NotFound", TK_NotFound }
};
@@ -324,3 +322,5 @@ rtl::OUString TKGet( const PPPOptimizerTokenEnum eToken )
: (sal_uInt32)eToken;
return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sdext/source/minimizer/pppoptimizertoken.hxx
b/main/sdext/source/minimizer/pppoptimizertoken.hxx
index de719cb62b..66b65d6437 100644
--- a/main/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/main/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _PPPOPTIMIZER_TOKEN_HXX
#define _PPPOPTIMIZER_TOKEN_HXX
@@ -121,7 +119,7 @@ enum PPPOptimizerTokenEnum
TK_GraphicURL,
TK_GraphicStreamURL,
TK_Height,
- TK_HelpURL,
+ TK_HelpURL,
TK_Hidden,
TK_ID,
TK_ImageURL,
@@ -211,7 +209,7 @@ enum PPPOptimizerTokenEnum
STR_CANCEL,
STR_INTRODUCTION,
STR_INTRODUCTION_T,
- STR_CHOSE_SETTINGS,
+ STR_CHOOSE_SETTINGS,
STR_REMOVE,
STR_GRAPHIC_OPTIMIZATION,
STR_IMAGE_OPTIMIZATION,
@@ -268,7 +266,7 @@ enum PPPOptimizerTokenEnum
STR_CREATING_OLE_REPLACEMENTS,
STR_FILESIZESEPARATOR,
#endif
- TK_Last,
+ TK_Last,
TK_NotFound
};
@@ -276,3 +274,5 @@ PPPOptimizerTokenEnum TKGet( const rtl::OUString& );
rtl::OUString TKGet( const PPPOptimizerTokenEnum );
#endif
+
+/* vim: set noet sw=4 ts=4: */
