summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx68
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx4
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx12
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx6
4 files changed, 45 insertions, 45 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index efd92521c3ba..5abfc7dcf580 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -294,13 +294,13 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
{
Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxContext );
Sequence< Any > aCreationArguments( 2 );
- aCreationArguments[0] = makeAny( PropertyValue(
+ aCreationArguments[0] <<= PropertyValue(
"nodepath", 0,
makeAny( GetPathToConfigurationRoot() ),
- PropertyState_DIRECT_VALUE ) );
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ PropertyState_DIRECT_VALUE );
+ aCreationArguments[1] <<= beans::PropertyValue(
"lazywrite", 0, makeAny( true ),
- PropertyState_DIRECT_VALUE ) );
+ PropertyState_DIRECT_VALUE );
OUString sAccessService;
if ( bReadOnly )
sAccessService = "com.sun.star.configuration.ConfigurationAccess";
@@ -439,36 +439,36 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence()
{
Sequence< PropertyValue > aRet( 15 );
OptimizerSettings& rSettings( maSettings.front() );
- aRet[ 0 ].Name = "JPEGCompression";
- aRet[ 0 ].Value= Any( rSettings.mbJPEGCompression );
- aRet[ 1 ].Name = "JPEGQuality";
- aRet[ 1 ].Value= Any( rSettings.mnJPEGQuality );
- aRet[ 2 ].Name = "RemoveCropArea";
- aRet[ 2 ].Value= Any( rSettings.mbRemoveCropArea );
- aRet[ 3 ].Name = "ImageResolution";
- aRet[ 3 ].Value= Any( rSettings.mnImageResolution );
- aRet[ 4 ].Name = "EmbedLinkedGraphics";
- aRet[ 4 ].Value= Any( rSettings.mbEmbedLinkedGraphics );
- aRet[ 5 ].Name = "OLEOptimization";
- aRet[ 5 ].Value= Any( rSettings.mbOLEOptimization );
- aRet[ 6 ].Name = "OLEOptimizationType";
- aRet[ 6 ].Value= Any( rSettings.mnOLEOptimizationType );
- aRet[ 7 ].Name = "DeleteUnusedMasterPages";
- aRet[ 7 ].Value= Any( rSettings.mbDeleteUnusedMasterPages );
- aRet[ 8 ].Name = "DeleteHiddenSlides";
- aRet[ 8 ].Value= Any( rSettings.mbDeleteHiddenSlides );
- aRet[ 9 ].Name = "DeleteNotesPages";
- aRet[ 9 ].Value= Any( rSettings.mbDeleteNotesPages );
- aRet[ 10].Name = "CustomShowName";
- aRet[ 10].Value= Any( rSettings.maCustomShowName );
- aRet[ 11].Name = "SaveAsURL";
- aRet[ 11].Value= Any( rSettings.maSaveAsURL );
- aRet[ 12].Name = "FilterName";
- aRet[ 12].Value= Any( rSettings.maFilterName );
- aRet[ 13].Name = "OpenNewDocument";
- aRet[ 13].Value= Any( rSettings.mbOpenNewDocument );
- aRet[ 14].Name = "EstimatedFileSize";
- aRet[ 14].Value= Any( rSettings.mnEstimatedFileSize );
+ aRet[ 0 ].Name = "JPEGCompression";
+ aRet[ 0 ].Value <<= rSettings.mbJPEGCompression;
+ aRet[ 1 ].Name = "JPEGQuality";
+ aRet[ 1 ].Value <<= rSettings.mnJPEGQuality;
+ aRet[ 2 ].Name = "RemoveCropArea";
+ aRet[ 2 ].Value <<= rSettings.mbRemoveCropArea;
+ aRet[ 3 ].Name = "ImageResolution";
+ aRet[ 3 ].Value <<= rSettings.mnImageResolution;
+ aRet[ 4 ].Name = "EmbedLinkedGraphics";
+ aRet[ 4 ].Value <<= rSettings.mbEmbedLinkedGraphics;
+ aRet[ 5 ].Name = "OLEOptimization";
+ aRet[ 5 ].Value <<= rSettings.mbOLEOptimization;
+ aRet[ 6 ].Name = "OLEOptimizationType";
+ aRet[ 6 ].Value <<= rSettings.mnOLEOptimizationType;
+ aRet[ 7 ].Name = "DeleteUnusedMasterPages";
+ aRet[ 7 ].Value <<= rSettings.mbDeleteUnusedMasterPages;
+ aRet[ 8 ].Name = "DeleteHiddenSlides";
+ aRet[ 8 ].Value <<= rSettings.mbDeleteHiddenSlides;
+ aRet[ 9 ].Name = "DeleteNotesPages";
+ aRet[ 9 ].Value <<= rSettings.mbDeleteNotesPages;
+ aRet[ 10].Name = "CustomShowName";
+ aRet[ 10].Value <<= rSettings.maCustomShowName;
+ aRet[ 11].Name = "SaveAsURL";
+ aRet[ 11].Value <<= rSettings.maSaveAsURL;
+ aRet[ 12].Name = "FilterName";
+ aRet[ 12].Value <<= rSettings.maFilterName;
+ aRet[ 13].Name = "OpenNewDocument";
+ aRet[ 13].Value <<= rSettings.mbOpenNewDocument;
+ aRet[ 14].Name = "EstimatedFileSize";
+ aRet[ 14].Value <<= rSettings.mnEstimatedFileSize;
return aRet;
}
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index b8ed17b82526..ff0930521f85 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -754,8 +754,8 @@ void Parser::readImage()
aMaxRange[i] = aDataSequence[i+nMaskColors/2] / 255.0;
}
- aMaskRanges[0] = uno::makeAny(aMinRange);
- aMaskRanges[1] = uno::makeAny(aMaxRange);
+ aMaskRanges[0] <<= aMinRange;
+ aMaskRanges[1] <<= aMaxRange;
m_pSink->drawColorMaskedImage( aImg, aMaskRanges );
}
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 2ad9c1269581..23867f4bc931 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -46,21 +46,21 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
if (rxContext.is())
{
Sequence<Any> aCreationArguments(3);
- aCreationArguments[0] = makeAny(beans::PropertyValue(
+ aCreationArguments[0] <<= beans::PropertyValue(
"nodepath",
0,
makeAny(rsRootName),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[1] <<= beans::PropertyValue(
"depth",
0,
makeAny((sal_Int32)-1),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[2] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[2] <<= beans::PropertyValue(
"lazywrite",
0,
makeAny(true),
- beans::PropertyState_DIRECT_VALUE));
+ beans::PropertyState_DIRECT_VALUE);
OUString sAccessService;
if (eMode == READ_ONLY)
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 2e56f5bdc414..749e8a58d08a 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -539,15 +539,15 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
{
default:
case VM_Standard:
- aValue = Any(sal_Int32(0));
+ aValue <<= sal_Int32(0);
break;
case VM_Notes:
- aValue = Any(sal_Int32(1));
+ aValue <<= sal_Int32(1);
break;
case VM_SlideOverview:
- aValue = Any(sal_Int32(2));
+ aValue <<= sal_Int32(2);
break;
}