diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 11:22:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-28 10:17:47 +0000 |
commit | 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch) | |
tree | 041d55126e9770b81f68fadfaaa69e82313786b3 /sd | |
parent | d3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff) |
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89
Reviewed-on: https://gerrit.libreoffice.org/34714
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/FullScreenPane.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/func/fuhhconv.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/tools/ConfigurationAccess.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 |
16 files changed, 41 insertions, 41 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 379f2fe48e16..1552292e5df6 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -1456,7 +1456,7 @@ void SdTiledRenderingTest::testTdf104405() // trigger the clone-formatting/paintbrush command to copy formatting contents of cell uno::Sequence< beans::PropertyValue > aArgs(1); aArgs[0].Name = "PersistentCopy"; - aArgs[0].Value = uno::makeAny(true); + aArgs[0].Value <<= true; comphelper::dispatchCommand(".uno:FormatPaintbrush", aArgs); Scheduler::ProcessEventsToIdle(); diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 230900ac81a4..e23930d05d4c 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -941,7 +941,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const } else { - aTo = makeAny( false ); + aTo <<= false; aAttributeName = "Visibility"; } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 76e00b457c96..8b2fa727dbb9 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -370,7 +370,7 @@ bool PowerPointExport::exportDocument() std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = sBaseURI; - aProperty.Value = makeAny( getFileUrl() ); + aProperty.Value <<= getFileUrl(); aProperties.push_back( aProperty ); exportPPT(aProperties); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 2c3574f93d52..22b21c66c063 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -2432,7 +2432,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( bHasValue ) { - aValues[nKeyTime] = makeAny( ValuePair( aValue1, aValue2 ) ); + aValues[nKeyTime] <<= ValuePair( aValue1, aValue2 ); } else { @@ -2797,7 +2797,7 @@ void AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rT rTarget >>= aParaTarget.Shape; /* FIXME: Paragraph should be sal_Int32 as well */ aParaTarget.Paragraph = static_cast<sal_Int16>(nPara); - rTarget = makeAny( aParaTarget ); + rTarget <<= aParaTarget; rSubType = ShapeAnimationSubType::ONLY_TEXT; dump( " paragraph %d,", (sal_Int32)nPara); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index b66cd3f2294c..cec616602373 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -167,7 +167,7 @@ bool SdPPTFilter::Export() std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = "BaseURI"; - aProperty.Value = makeAny( mrMedium.GetBaseURL( true ) ); + aProperty.Value <<= mrMedium.GetBaseURL( true ); aProperties.push_back( aProperty ); bRet = PPTExport( aProperties, xStorRef, mxModel, mxStatusIndicator, pBas, nCnvrtFlags ); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 0e43dede5120..6a597c6d95ce 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -841,7 +841,7 @@ css::uno::Sequence< css::uno::Any > if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { uno::Sequence<uno::Any> aRet( 1 ); - aRet[0] = uno::makeAny( xSel ); + aRet[0] <<= xSel; return aRet; } } @@ -852,7 +852,7 @@ css::uno::Sequence< css::uno::Any > if ( xPara.is() ) { uno::Sequence<uno::Any> aRet( 1 ); - aRet[0] = uno::makeAny( xPara ); + aRet[0] <<= xPara; return aRet; } } @@ -882,7 +882,7 @@ css::uno::Sequence< css::uno::Any > xChildSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { uno::Sequence<uno::Any> aRet( 1 ); - aRet[0] = uno::makeAny( xChildSel ); + aRet[0] <<= xChildSel; return aRet; } } @@ -896,7 +896,7 @@ css::uno::Sequence< css::uno::Any > if ( xPara.is() ) { uno::Sequence<uno::Any> aRet( 1 ); - aRet[0] = uno::makeAny( xPara ); + aRet[0] <<= xPara; return aRet; } } diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index f9aa985b59a2..bdf409161d80 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1372,7 +1372,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) if( nPos == 1 ) { Color aSelectedColor = mpCLBDimColor->GetSelectEntryColor(); - aDimColor = makeAny( (sal_Int32)aSelectedColor.GetRGBColor() ); + aDimColor <<= (sal_Int32)aSelectedColor.GetRGBColor(); } if( (mpSet->getPropertyState( nHandleDimColor ) == STLPropertyState::Ambiguous) || @@ -1434,12 +1434,12 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) else if( nPos == 1 ) { // this means stop sound - aNewSoundURL = makeAny( true ); + aNewSoundURL <<= true; } else { OUString aSoundURL( maSoundList[ nPos-2 ] ); - aNewSoundURL = makeAny( aSoundURL ); + aNewSoundURL <<= aSoundURL; } if( mpSet->getPropertyState( nHandleSoundURL ) != STLPropertyState::Ambiguous ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1803799e3569..a2ac3a0cc5ff 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1199,7 +1199,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() } else if( pEffect->getCommand() == EffectCommands::STOPAUDIO ) { - aSoundSource = makeAny( true ); + aSoundSource <<= true; } addValue( pSet, nHandleSoundURL, aSoundSource ); diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index ec9a875076bd..a92f734adce5 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -162,7 +162,7 @@ void SAL_CALL FullScreenPane::setAccessible ( if (pParentWindow != nullptr) xAccessibleParent = pParentWindow->GetAccessible(); Sequence<Any> aArguments (1); - aArguments[0] = Any(xAccessibleParent); + aArguments[0] <<= xAccessibleParent; xInitializable->initialize(aArguments); } GetWindow()->SetAccessible(rxAccessible); @@ -196,11 +196,11 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() Sequence<Any> aArg (5); // common: first any is VCL pointer to window (for VCL canvas) - aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow.get())); + aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get()); aArg[1] = Any(); - aArg[2] = makeAny(css::awt::Rectangle()); - aArg[3] = makeAny(false); - aArg[4] = makeAny(mxWindow); + aArg[2] <<= css::awt::Rectangle(); + aArg[3] <<= false; + aArg[4] <<= mxWindow; Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index bc68ead02288..81a4ab23b393 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -207,8 +207,8 @@ void FuHangulHanjaConversion::StartChineseConversion() Any* pArray = aSeq.getArray(); PropertyValue aParam; aParam.Name = "ParentWindow"; - aParam.Value = makeAny(xDialogParentWindow); - pArray[0] = makeAny(aParam); + aParam.Value <<= xDialogParentWindow; + pArray[0] <<= aParam; xInit->initialize( aSeq ); //execute dialog diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index f452e0d41893..72893b7aac5a 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -151,11 +151,11 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( Sequence<Any> aArg (5); // common: first any is VCL pointer to window (for VCL canvas) - aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow.get())); + aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get()); aArg[1] = Any(); - aArg[2] = makeAny(css::awt::Rectangle()); - aArg[3] = makeAny(false); - aArg[4] = makeAny(rxWindow); + aArg[2] <<= css::awt::Rectangle(); + aArg[3] <<= false; + aArg[4] <<= rxWindow; Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 2da56df510a4..91751a91f24b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -815,12 +815,12 @@ bool SlideshowImpl::startPreview( Sequence< beans::PropertyValue > aProperties(nPropertyCount); aProperties[0].Name = "AutomaticAdvancement"; - aProperties[0].Value = uno::makeAny( (double)1.0 ); // one second timeout + aProperties[0].Value <<= (double)1.0; // one second timeout if( mxPreviewAnimationNode.is() ) { aProperties[1].Name = "NoSlideTransitions"; - aProperties[1].Value = uno::makeAny( true ); + aProperties[1].Value <<= true; } bRet = startShowImpl( aProperties ); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 7d030d2a8e6d..269df8a8fb44 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -81,21 +81,21 @@ CacheConfiguration::CacheConfiguration() // Obtain access to Impress configuration. Sequence<Any> aCreationArguments(3); - aCreationArguments[0] = makeAny(beans::PropertyValue( + aCreationArguments[0] <<= beans::PropertyValue( "nodepath", 0, makeAny(sPathToImpressConfigurationRoot), - 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); Reference<XInterface> xRoot (xProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index e813a8e0124e..dd10efa08cd3 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -60,21 +60,21 @@ void ConfigurationAccess::Initialize ( try { 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) sAccessService = "com.sun.star.configuration.ConfigurationAccess"; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 1af83e0f39f3..806e60e36c02 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1622,7 +1622,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->Name = maStrPlayFull; pProperties->Handle = -1; - pProperties->Value = css::uno::makeAny(pInfo->mbSecondPlayFull); + pProperties->Value <<= pInfo->mbSecondPlayFull; pProperties->State = beans::PropertyState_DIRECT_VALUE; } break; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 27077422358f..8ef2221e9dcc 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1246,7 +1246,7 @@ public: // FIXME: is this always true ? aProperties[2].Name = "PageIncludesNonprintableArea"; - aProperties[2].Value = makeAny( true ); + aProperties[2].Value <<= true; return aProperties; } |