diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
| commit | 9222f5d065bb2aafcfef93e77c58a82672a9ad22 (patch) | |
| tree | 0dfad9f13099a73ecf3893e9cbdd5020b55cd7b3 /sc | |
| parent | c4dca26eafd60dc4c4f19e0be0b8e086108b3048 (diff) | |
A UNO Any can't contain an Any
...and css::uno::makeAny<css::uno::Any>() was never meant to be used. Introduce
css::uno::toAny for the (template-code) cases that shall return an Any for both
Any and non-Any inputs.
Change-Id: Ifa977d73f1da71b2fedde7e8140b19497c4a0257
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/vba/vbainterior.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaworksheet.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 1d0d322b6368..8647f9505b65 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -366,7 +366,7 @@ ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::excepti sal_Int32 nColor = 0; XLRGBToOORGB( getPatternColor() ) >>= nColor; - return uno::makeAny( GetIndexColor( nColor ) ); + return GetIndexColor( nColor ); } void SAL_CALL ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException, std::exception) diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 49b8c7f6d5ee..d60e10a25dff 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -934,7 +934,7 @@ ScVbaWorksheet::invoke( const OUString& aFunctionName, const uno::Sequence< uno: void SAL_CALL ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) { - setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue ); + setDefaultPropByIntrospection( getValue( aPropertyName ), aValue ); } uno::Any SAL_CALL ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) |