summaryrefslogtreecommitdiff
path: root/sdext/source/minimizer/configurationaccess.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:48 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:48 +0200
commit0650647ed5196ab6f65875eacc99be87e6994d6f (patch)
tree0053ac989727ef4a17ddcaa86e72f4406ef5a7f4 /sdext/source/minimizer/configurationaccess.cxx
parentf76f752dc908cfbab1cade605fe4f742233dfa6d (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a9475f3ee585c2d8667a8823f46cb04a96da84b5 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 215bfd8724f8ebc7bdcd7c589dcd3ee2fc3cdef2 Author: Andras Timar <timar@fsf.hu> Date: Mon Feb 7 23:18:59 2011 +0100 Added/modified NLPsolver translations from Pootle nlpsolver/locale/NLPSolverCommon_de.properties | 2 +- nlpsolver/locale/NLPSolverCommon_fa.properties | 14 +++--- nlpsolver/locale/NLPSolverCommon_fr.properties | 4 +- nlpsolver/locale/NLPSolverCommon_nl.properties | 2 +- nlpsolver/locale/NLPSolverCommon_ru.properties | 21 +++++++++ nlpsolver/locale/NLPSolverCommon_zh_TW.properties | 2 +- .../locale/NLPSolverStatusDialog_ast.properties | 4 +- .../locale/NLPSolverStatusDialog_de.properties | 12 +++--- .../locale/NLPSolverStatusDialog_en_GB.properties | 2 +- .../locale/NLPSolverStatusDialog_fa.properties | 46 ++++++++++---------- .../locale/NLPSolverStatusDialog_is.properties | 27 +++++++++++ .../locale/NLPSolverStatusDialog_ru.properties | 27 +++++++++++ 12 files changed, 119 insertions(+), 44 deletions(-) commit 740c46dbb713dcc3b4a07d69ccf7ff7a634cce24 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:23 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 6e673b3b275a5008c654c4bbfb41709d30cd62af Author: Rene Engelhard <rene@debian.org> Date: Wed Jan 12 10:03:30 2011 +0100 fix presenter screens description.xml build sdext/source/presenter/makefile.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c6d30578f94bebfe154237496eceedd338d5982b Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit d36f5922c12c793b156396d68daffb55feb3b182 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: extensions_libreoffice-3.3.1.1
Diffstat (limited to 'sdext/source/minimizer/configurationaccess.cxx')
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx120
1 files changed, 60 insertions, 60 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 7e89eecbcd36..83187bc5b15e 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -70,21 +70,21 @@ void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAcc
Any aValue( rSettings->getByName( aPropertyName ) );
switch( TKGet( aPropertyName ) )
{
- case TK_Name : aValue >>= maName; break;
- case TK_JPEGCompression : aValue >>= mbJPEGCompression; break;
- case TK_JPEGQuality : aValue >>= mnJPEGQuality; break;
- case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break;
- case TK_ImageResolution : aValue >>= mnImageResolution; break;
- case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : aValue >>= mbOLEOptimization; break;
- case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break;
- case TK_SaveAs : aValue >>= mbSaveAs; break;
-// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration
-// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration
- case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break;
+ case TK_Name : aValue >>= maName; break;
+ case TK_JPEGCompression : aValue >>= mbJPEGCompression; break;
+ case TK_JPEGQuality : aValue >>= mnJPEGQuality; break;
+ case TK_RemoveCropArea : aValue >>= mbRemoveCropArea; break;
+ case TK_ImageResolution : aValue >>= mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : aValue >>= mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : aValue >>= mbOLEOptimization; break;
+ case TK_OLEOptimizationType : aValue >>= mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : aValue >>= mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : aValue >>= mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : aValue >>= mbDeleteNotesPages ;break;
+ case TK_SaveAs : aValue >>= mbSaveAs; break;
+// case TK_SaveAsURL : aValue >>= maSaveAsURL; break; // URL is not saved to configuration
+// case TK_FilterName : aValue >>= maFilterName; break; // URL is not saved to configuration
+ case TK_OpenNewDocument : aValue >>= mbOpenNewDocument; break;
default: break;
}
}
@@ -112,11 +112,11 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
TKGet( TK_DeleteHiddenSlides ),
TKGet( TK_DeleteNotesPages ),
TKGet( TK_SaveAs ),
-// TKGet( TK_SaveAsURL ),
-// TKGet( TK_FilterName ),
- TKGet( TK_OpenNewDocument ) };
+// TKGet( TK_SaveAsURL ),
+// TKGet( TK_FilterName ),
+ TKGet( TK_OpenNewDocument ) };
- Any pValues[] = {
+ Any pValues[] = {
Any( maName ),
Any( mbJPEGCompression ),
Any( mnJPEGQuality ),
@@ -129,8 +129,8 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
Any( mbDeleteHiddenSlides ),
Any( mbDeleteNotesPages ),
Any( mbSaveAs ),
-// Any( maSaveAsURL ),
-// Any( maFilterName ),
+// Any( maSaveAsURL ),
+// Any( maFilterName ),
Any( mbOpenNewDocument ) };
sal_Int32 i, nCount = sizeof( pNames ) / sizeof( OUString );
@@ -160,7 +160,7 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti
&& ( rOptimizerSettings.mbDeleteUnusedMasterPages == mbDeleteUnusedMasterPages )
&& ( rOptimizerSettings.mbDeleteHiddenSlides == mbDeleteHiddenSlides )
&& ( rOptimizerSettings.mbDeleteNotesPages == mbDeleteNotesPages );
-// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
+// && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
}
@@ -234,7 +234,7 @@ void ConfigurationAccess::LoadStrings()
}
catch( Exception& )
{
- }
+ }
}
}
}
@@ -344,8 +344,8 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
{
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 ),
@@ -369,7 +369,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
}
Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
- const Reference< XInterface >& xRoot,
+ const Reference< XInterface >& xRoot,
const OUString& sPathToNode )
{
Reference< XInterface > xNode;
@@ -405,22 +405,22 @@ com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimi
{
switch( ePropertyToken )
{
- case TK_Name : aRetValue <<= rSettings.maName; break;
- case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break;
- case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break;
- case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break;
- case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break;
- case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break;
- case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break;
- case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break;
- case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break;
- case TK_FilterName : aRetValue <<= rSettings.maFilterName; break;
- case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break;
- case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break;
+ case TK_Name : aRetValue <<= rSettings.maName; break;
+ case TK_JPEGCompression : aRetValue <<= rSettings.mbJPEGCompression; break;
+ case TK_JPEGQuality : aRetValue <<= rSettings.mnJPEGQuality; break;
+ case TK_RemoveCropArea : aRetValue <<= rSettings.mbRemoveCropArea; break;
+ case TK_ImageResolution : aRetValue <<= rSettings.mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : aRetValue <<= rSettings.mbOLEOptimization; break;
+ case TK_OLEOptimizationType : aRetValue <<= rSettings.mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : aRetValue <<= rSettings.mbDeleteNotesPages; break;
+ case TK_SaveAs : aRetValue <<= rSettings.mbSaveAs; break;
+ case TK_SaveAsURL : aRetValue <<= rSettings.maSaveAsURL; break;
+ case TK_FilterName : aRetValue <<= rSettings.maFilterName; break;
+ case TK_OpenNewDocument : aRetValue <<= rSettings.mbOpenNewDocument; break;
+ case TK_EstimatedFileSize : aRetValue <<= rSettings.mnEstimatedFileSize; break;
default:
break;
}
@@ -438,23 +438,23 @@ void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum eProper
{
switch( ePropertyToken )
{
- case TK_Name : rValue >>= rSettings.maName; break;
- case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break;
- case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break;
- case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break;
- case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break;
- case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break;
- case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break;
- case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break;
- case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
- case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break;
- case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break;
- case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break;
- case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break;
- case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break;
- case TK_FilterName : rValue >>= rSettings.maFilterName; break;
- case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break;
- case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break;
+ case TK_Name : rValue >>= rSettings.maName; break;
+ case TK_JPEGCompression : rValue >>= rSettings.mbJPEGCompression; break;
+ case TK_JPEGQuality : rValue >>= rSettings.mnJPEGQuality; break;
+ case TK_RemoveCropArea : rValue >>= rSettings.mbRemoveCropArea; break;
+ case TK_ImageResolution : rValue >>= rSettings.mnImageResolution; break;
+ case TK_EmbedLinkedGraphics : rValue >>= rSettings.mbEmbedLinkedGraphics; break;
+ case TK_OLEOptimization : rValue >>= rSettings.mbOLEOptimization; break;
+ case TK_OLEOptimizationType : rValue >>= rSettings.mnOLEOptimizationType; break;
+ case TK_DeleteUnusedMasterPages : rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
+ case TK_DeleteHiddenSlides : rValue >>= rSettings.mbDeleteHiddenSlides; break;
+ case TK_DeleteNotesPages : rValue >>= rSettings.mbDeleteNotesPages; break;
+ case TK_CustomShowName : rValue >>= rSettings.maCustomShowName; break;
+ case TK_SaveAs : rValue >>= rSettings.mbSaveAs; break;
+ case TK_SaveAsURL : rValue >>= rSettings.maSaveAsURL; break;
+ case TK_FilterName : rValue >>= rSettings.maFilterName; break;
+ case TK_OpenNewDocument : rValue >>= rSettings.mbOpenNewDocument; break;
+ case TK_EstimatedFileSize : rValue >>= rSettings.mnEstimatedFileSize; break;
default:
break;
}