diff options
Diffstat (limited to 'sw/source/uibase/dialog/watermarkdialog.cxx')
| -rw-r--r-- | sw/source/uibase/dialog/watermarkdialog.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index 71ab0a74046c..413d20f28415 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -21,6 +21,7 @@ #include <svtools/ctrltool.hxx> #include <comphelper/lok.hxx> #include <sfx2/viewsh.hxx> +#include <svl/itemset.hxx> #define IS_MOBILE (comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone()) @@ -32,7 +33,7 @@ SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindin , m_xFont(m_xBuilder->weld_combo_box("FontBox")) , m_xAngle(m_xBuilder->weld_metric_spin_button("Angle", FieldUnit::DEGREE)) , m_xTransparency(m_xBuilder->weld_metric_spin_button("Transparency", FieldUnit::PERCENT)) - , m_xColor(new ColorListBox(m_xBuilder->weld_menu_button("Color"), m_xDialog.get())) + , m_xColor(new ColorListBox(m_xBuilder->weld_menu_button("Color"), [this]{ return m_xDialog.get(); })) { InitFields(); @@ -78,13 +79,13 @@ void SwWatermarkDialog::InitFields() m_xOKButton->connect_clicked(LINK(this, SwWatermarkDialog, OKButtonHdl)); // Get watermark properties - const SfxPoolItem* pItem; - SfxItemState eState = m_rBindings.GetDispatcher()->QueryState( SID_WATERMARK, pItem ); + SfxPoolItemHolder aResult; + const SfxItemState eState(m_rBindings.GetDispatcher()->QueryState(SID_WATERMARK, aResult)); + const SfxWatermarkItem* pWatermark(static_cast<const SfxWatermarkItem*>(aResult.getItem())); - if( !(eState >= SfxItemState::DEFAULT && pItem && pItem->Which() == SID_WATERMARK)) + if( !(eState >= SfxItemState::DEFAULT && pWatermark && pWatermark->Which() == SID_WATERMARK)) return; - const SfxWatermarkItem* pWatermark = static_cast<const SfxWatermarkItem*>( pItem ); const OUString& sText = pWatermark->GetText(); m_xTextInput->set_text(sText); OUString sFontName = pWatermark->GetFont(); @@ -104,11 +105,11 @@ IMPL_LINK_NOARG(SwWatermarkDialog, OKButtonHdl, weld::Button&, void) css::uno::Sequence<css::beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence( { - { "Text", css::uno::makeAny( sText ) }, - { "Font", css::uno::makeAny( m_xFont->get_active_text() ) }, - { "Angle", css::uno::makeAny( static_cast<sal_Int16>( m_xAngle->get_value(FieldUnit::DEGREE) ) ) }, - { "Transparency", css::uno::makeAny( static_cast<sal_Int16>( m_xTransparency->get_value(FieldUnit::PERCENT) ) ) }, - { "Color", css::uno::makeAny( static_cast<sal_uInt32>( m_xColor->GetSelectEntryColor().GetRGBColor() ) ) } + { "Text", css::uno::Any( sText ) }, + { "Font", css::uno::Any( m_xFont->get_active_text() ) }, + { "Angle", css::uno::Any( static_cast<sal_Int16>( m_xAngle->get_value(FieldUnit::DEGREE) ) ) }, + { "Transparency", css::uno::Any( static_cast<sal_Int16>( m_xTransparency->get_value(FieldUnit::PERCENT) ) ) }, + { "Color", css::uno::Any( static_cast<sal_uInt32>( m_xColor->GetSelectEntryColor().GetRGBColor() ) ) } } ) ); comphelper::dispatchCommand( ".uno:Watermark", aPropertyValues ); |