summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-05-25 15:12:46 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2017-06-01 08:10:21 +0200
commit8421372dd3c25c7852de388e3c8cc4a8b65dc2de (patch)
tree5389dde37378b1392db271f9b0af5e4cd99afce1
parent10c4276c2c8d7a9b6a5243a0d1d7a00ed5b882a0 (diff)
Watermark: updated Put and QueryValue
Change-Id: Ica65be783130b1981093204edd03dc793a16343b Reviewed-on: https://gerrit.libreoffice.org/38027 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
-rw-r--r--sfx2/source/doc/watermarkitem.cxx35
1 files changed, 23 insertions, 12 deletions
diff --git a/sfx2/source/doc/watermarkitem.cxx b/sfx2/source/doc/watermarkitem.cxx
index ebb794fcd73e..f54745694557 100644
--- a/sfx2/source/doc/watermarkitem.cxx
+++ b/sfx2/source/doc/watermarkitem.cxx
@@ -9,6 +9,7 @@
#include <sfx2/watermarkitem.hxx>
#include <sfx2/sfxsids.hrc>
+#include <comphelper/propertysequence.hxx>
SfxWatermarkItem::SfxWatermarkItem()
: SfxPoolItem( SID_WATERMARK )
@@ -52,26 +53,36 @@ SfxPoolItem* SfxWatermarkItem::Clone( SfxItemPool *) const
bool SfxWatermarkItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
- rVal <<= m_aText;
- rVal <<= m_aFont;
- rVal <<= m_nAngle;
- rVal <<= m_nTransparency;
- rVal <<= m_nColor;
+ rVal <<= comphelper::InitPropertySequence( {
+ { "Text", css::uno::makeAny( m_aText ) },
+ { "Font", css::uno::makeAny( m_aFont ) },
+ { "Angle", css::uno::makeAny( m_nAngle ) },
+ { "Transparency", css::uno::makeAny( m_nTransparency ) },
+ { "Color", css::uno::makeAny( m_nColor ) },
+ } );
return true;
}
bool SfxWatermarkItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
- OUString aText;
+ css::uno::Sequence<css::beans::PropertyValue> aSequence;
- if ( rVal >>= aText )
+ if ( rVal >>= aSequence )
{
- m_aText = aText;
- rVal >>= m_aFont;
- rVal >>= m_nAngle;
- rVal >>= m_nTransparency;
- rVal >>= m_nColor;
+ for(const auto& aEntry : aSequence)
+ {
+ if(aEntry.Name == "Text")
+ aEntry.Value >>= m_aText;
+ if(aEntry.Name == "Font")
+ aEntry.Value >>= m_aFont;
+ if(aEntry.Name == "Angle")
+ aEntry.Value >>= m_nAngle;
+ if(aEntry.Name == "Transparency")
+ aEntry.Value >>= m_nTransparency;
+ if(aEntry.Name == "Color")
+ aEntry.Value >>= m_nColor;
+ }
return true;
}