diff options
26 files changed, 18 insertions, 132 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 04dbc407bf42..401befc1179c 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -512,7 +512,6 @@ #define SIP_SA_GRAFINVERT NC_("SIP_SA_GRAFINVERT", "Invert") #define SIP_SA_GRAFMODE NC_("SIP_SA_GRAFMODE", "Image mode") #define SIP_SA_GRAFCROP NC_("SIP_SA_GRAFCROP", "Crop") -#define SIP_SA_GLOW NC_("SIP_SA_GLOW", "Glow effect") #define SIP_SA_GLOW_RAD NC_("SIP_SA_GLOW_RAD", "Radius of glow effect") #define SIP_SA_GLOW_COLOR NC_("SIP_SA_GLOW_COLOR", "Color of glow effect") #define SIP_SA_GLOW_TRANSPARENCY NC_("SIP_SA_GLOW_TRANSPARENCY", "Transparency of glow effect") diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 3b9be15d315f..378ed9676f22 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -416,10 +416,9 @@ constexpr TypedWhichId<SvxTextRotateItem> SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_T constexpr sal_uInt16 SDRATTR_TABLE_LAST (SDRATTR_TABLE_TEXT_ROTATION); constexpr sal_uInt16 SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1); -constexpr TypedWhichId<SdrOnOffItem> SDRATTR_GLOW (SDRATTR_GLOW_FIRST+0); -constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RAD (SDRATTR_GLOW_FIRST+1); -constexpr TypedWhichId<XColorItem> SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+2); -constexpr TypedWhichId<SdrPercentItem> SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST + 3); +constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RAD (SDRATTR_GLOW_FIRST+0); +constexpr TypedWhichId<XColorItem> SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+1); +constexpr TypedWhichId<SdrPercentItem> SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST + 2); constexpr sal_uInt16 SDRATTR_GLOW_LAST (SDRATTR_GLOW_TRANSPARENCY); constexpr sal_uInt16 SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST + 1); diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 449258d430d6..6325025155b8 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -414,11 +414,10 @@ class SvxSetItem; #define SID_ATTR_TRANSFORM_HORI_MIRROR ( SID_SVX_START + 317 ) #define SID_ATTR_TRANSFORM_ANCHOR ( SID_SVX_START + 318 ) #define SID_ATTR_TRANSFORM_VERT_ORIENT ( SID_SVX_START + 319 ) -#define SID_ATTR_GLOW ( SID_SVX_START + 320 ) +#define SID_ATTR_GLOW_RADIUS ( SID_SVX_START + 320 ) #define SID_ATTR_GLOW_COLOR ( SID_SVX_START + 321 ) -#define SID_ATTR_GLOW_RADIUS ( SID_SVX_START + 322 ) -#define SID_ATTR_GLOW_TRANSPARENCY ( SID_SVX_START + 323 ) -#define SID_ATTR_SOFTEDGE_RADIUS ( SID_SVX_START + 324 ) +#define SID_ATTR_GLOW_TRANSPARENCY ( SID_SVX_START + 322 ) +#define SID_ATTR_SOFTEDGE_RADIUS ( SID_SVX_START + 323 ) #define SID_SCAN ( SID_SVX_START + 330 ) #define SID_TWAIN_SELECT ( SID_SVX_START + 331 ) #define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 ) diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index fbc6b1c387b1..d83b24014937 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -210,7 +210,6 @@ { OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, #define GLOW_PROPERTIES \ - { OUString("GlowEffect"), SDRATTR_GLOW, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString{"GlowEffectRad"}, SDRATTR_GLOW_RAD, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ { OUString{"GlowEffectColor"}, SDRATTR_GLOW_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { OUString{"GlowEffectTransparency"}, SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 3650805e6015..49178ebdc996 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -927,7 +927,6 @@ namespace xmloff::token { XML_GCD, XML_GENERATOR, XML_GEQ, - XML_GLOW, XML_GLOW_RADIUS, XML_GLOW_COLOR, XML_GLOW_TRANSPARENCY, diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index cd7c289e9efa..b7e855058e6a 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1470,7 +1470,6 @@ Reference< XShape > const & Shape::createAndInsert( if ( aEffectProperties.maGlow.moGlowRad.has() ) { uno::Reference<beans::XPropertySet> propertySet (mxShape, uno::UNO_QUERY); - propertySet->setPropertyValue("GlowEffect", makeAny(true)); propertySet->setPropertyValue("GlowEffectRad", makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get()))); propertySet->setPropertyValue("GlowEffectColor", makeAny(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper))); propertySet->setPropertyValue("GlowEffectTransparency", makeAny(aEffectProperties.maGlow.moGlowColor.getTransparency())); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 63fec0d6d18c..0be37c8748f0 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3756,8 +3756,12 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet ) if( GetProperty( rXPropSet, "Shadow" ) ) mAny >>= bHasShadow; bool bHasEffects = bHasShadow; - if (!bHasEffects && GetProperty(rXPropSet, "GlowEffect")) - mAny >>= bHasEffects; + if (!bHasEffects && GetProperty(rXPropSet, "GlowEffectRad")) + { + sal_Int32 rad = 0; + mAny >>= rad; + bHasEffects = rad > 0; + } if (!bHasEffects && GetProperty(rXPropSet, "SoftEdgeRad")) { sal_Int32 rad = 0; @@ -3867,13 +3871,11 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet ) void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet) { - bool hasGlow = false; - rXPropSet->getPropertyValue("GlowEffect") >>= hasGlow; - if(!hasGlow) - return; - sal_Int32 nRad = 0; rXPropSet->getPropertyValue("GlowEffectRad") >>= nRad; + if (!nRad) + return; + Sequence< PropertyValue > aGlowAttribs(1); aGlowAttribs[0].Name = "rad"; aGlowAttribs[0].Value <<= oox::drawingml::convertHmmToEmu(nRad); diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 29585cf19e69..b29cf20da73f 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -225,7 +225,6 @@ interface TableDraw SID_DRAW_HLINK_DELETE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OPEN_HYPERLINK [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ] - SID_ATTR_GLOW [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_GLOW_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_GLOW_RADIUS [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_GLOW_TRANSPARENCY [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index b8438a782758..6c54c6e8b3cb 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -389,7 +389,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } break; - case SID_ATTR_GLOW: case SID_ATTR_GLOW_COLOR: case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng index 2f316b6764a0..90e240a5a2a1 100644 --- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng @@ -922,14 +922,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:optional> <!-- TODO: no proposal for loext:glow* --> <rng:optional> - <rng:attribute name="loext:glow"> - <rng:choice> - <rng:value>visible</rng:value> - <rng:value>hidden</rng:value> - </rng:choice> - </rng:attribute> - </rng:optional> - <rng:optional> <rng:attribute name="loext:glow-radius"> <rng:ref name="length"/> </rng:attribute> diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 69ee1650d780..e71a5228c9eb 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -2854,9 +2854,6 @@ void SdOOXMLExportTest2::testShapeGlowEffect() ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); - bool bHasGlow = false; - xShape->getPropertyValue("GlowEffect") >>= bHasGlow; - CPPUNIT_ASSERT(bHasGlow); sal_Int32 nRadius = -1; xShape->getPropertyValue("GlowEffectRad") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index f1d99e2c840a..6711333c866e 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1247,9 +1247,6 @@ void SdExportTest::testGlow() uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); // Check glow properties - bool bGlowEffect = false; - CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffect") >>= bGlowEffect); - CPPUNIT_ASSERT(bGlowEffect); sal_Int32 nGlowEffectRad = 0; CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRad") >>= nGlowEffectRad); CPPUNIT_ASSERT_EQUAL(sal_Int32(529), nGlowEffectRad); // 15 pt = 529.166... mm/100 @@ -1270,10 +1267,6 @@ void SdExportTest::testGlow() assertXPath( pXmlDoc, "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", - "glow", "visible"); - assertXPath( - pXmlDoc, - "/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties", "glow-radius", "0.529cm"); assertXPath( pXmlDoc, diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 32e0d68f8dbe..d1960223a1b9 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -3110,9 +3110,6 @@ void SdImportTest::testShapeGlowEffectPPTXImpoer() = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); - bool bHasGlow = false; - xShape->getPropertyValue("GlowEffect") >>= bHasGlow; - CPPUNIT_ASSERT(bHasGlow); sal_Int32 nRadius = -1; xShape->getPropertyValue("GlowEffectRad") >>= nRadius; CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 mm/100 diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 0f155bee6b8c..4bb8199bc49f 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2860,11 +2860,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_ATTR_GLOW - [ - ExecMethod = FuTemporary ; - StateMethod = GetAttrState ; - ] SID_ATTR_GLOW_COLOR [ ExecMethod = FuTemporary ; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9fbd603f69ac..58cd5e5297b2 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3470,7 +3470,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_ATTR_GLOW: case SID_ATTR_GLOW_COLOR: case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index f506119ad607..bcaea408d937 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -437,7 +437,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_KERNING: case SID_ATTR_CHAR_CASEMAP: - case SID_ATTR_GLOW: case SID_ATTR_GLOW_COLOR: case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 543e643714e4..c36e1771afd7 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -12256,23 +12256,6 @@ SfxVoidItem AccessibilityCheck SID_ACCESSIBILITY_CHECK GroupId = SfxGroupId::Modify; ] -SdrOnOffItem Glow SID_ATTR_GLOW - -[ - AutoUpdate = TRUE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = TRUE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::Document; -] - XColorItem GlowColor SID_ATTR_GLOW_COLOR [ diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 41452ecf4826..fbfa6ebaf67f 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -215,10 +215,9 @@ namespace drawinglayer attribute::SdrGlowAttribute createNewSdrGlowAttribute(const SfxItemSet& rSet) { - const bool bGlow(rSet.Get(SDRATTR_GLOW).GetValue()); - if (!bGlow) - return attribute::SdrGlowAttribute(); sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue(); + if (!nRadius) + return attribute::SdrGlowAttribute(); Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue()); sal_uInt16 nTransparency(rSet.Get(SDRATTR_GLOW_TRANSPARENCY).GetValue()); if (nTransparency) diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.cxx b/svx/source/sidebar/glow/GlowPropertyPanel.cxx index 74a3d26d84ba..26493c3c250e 100644 --- a/svx/source/sidebar/glow/GlowPropertyPanel.cxx +++ b/svx/source/sidebar/glow/GlowPropertyPanel.cxx @@ -27,12 +27,10 @@ GlowPropertyPanel::GlowPropertyPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "GlowPropertyPanel", "svx/ui/sidebarglow.ui", rxFrame) - , maGlowController(SID_ATTR_GLOW, *pBindings, *this) , maGlowColorController(SID_ATTR_GLOW_COLOR, *pBindings, *this) , maGlowRadiusController(SID_ATTR_GLOW_RADIUS, *pBindings, *this) , maGlowTransparencyController(SID_ATTR_GLOW_TRANSPARENCY, *pBindings, *this) , mpBindings(pBindings) - , mxShowGlow(m_xBuilder->weld_check_button("SHOW_GLOW")) , mxGlowRadius(m_xBuilder->weld_metric_spin_button("LB_GLOW_RADIUS", FieldUnit::POINT)) , mxLBGlowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_GLOW_COLOR"), GetFrameWeld())) , mxGlowTransparency( @@ -48,7 +46,6 @@ GlowPropertyPanel::~GlowPropertyPanel() { disposeOnce(); } void GlowPropertyPanel::dispose() { - mxShowGlow.reset(); mxFTRadius.reset(); mxGlowRadius.reset(); mxFTColor.reset(); @@ -56,7 +53,6 @@ void GlowPropertyPanel::dispose() mxFTTransparency.reset(); mxGlowTransparency.reset(); - maGlowController.dispose(); maGlowColorController.dispose(); maGlowRadiusController.dispose(); maGlowTransparencyController.dispose(); @@ -65,20 +61,12 @@ void GlowPropertyPanel::dispose() void GlowPropertyPanel::Initialize() { - mxShowGlow->set_state(TRISTATE_FALSE); - mxShowGlow->connect_toggled(LINK(this, GlowPropertyPanel, ClickGlowHdl)); mxLBGlowColor->SetSelectHdl(LINK(this, GlowPropertyPanel, ModifyGlowColorHdl)); mxGlowRadius->connect_value_changed(LINK(this, GlowPropertyPanel, ModifyGlowRadiusHdl)); mxGlowTransparency->connect_value_changed( LINK(this, GlowPropertyPanel, ModifyGlowTransparencyHdl)); } -IMPL_LINK_NOARG(GlowPropertyPanel, ClickGlowHdl, weld::ToggleButton&, void) -{ - SdrOnOffItem aItem(SDRATTR_GLOW, mxShowGlow->get_state() != TRISTATE_FALSE); - mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_GLOW, SfxCallMode::RECORD, { &aItem }); -} - IMPL_LINK_NOARG(GlowPropertyPanel, ModifyGlowColorHdl, ColorListBox&, void) { XColorItem aItem(SDRATTR_GLOW_COLOR, mxLBGlowColor->GetSelectEntryColor()); @@ -101,11 +89,9 @@ IMPL_LINK_NOARG(GlowPropertyPanel, ModifyGlowTransparencyHdl, weld::MetricSpinBu void GlowPropertyPanel::UpdateControls() { - const bool bEnabled = mxShowGlow->get_state() != TRISTATE_FALSE; - mxGlowRadius->set_sensitive(bEnabled); + const bool bEnabled = mxGlowRadius->get_value(FieldUnit::MM_100TH) != 0; mxLBGlowColor->set_sensitive(bEnabled); mxGlowTransparency->set_sensitive(bEnabled); - mxFTRadius->set_sensitive(bEnabled); mxFTColor->set_sensitive(bEnabled); mxFTTransparency->set_sensitive(bEnabled); } @@ -115,22 +101,6 @@ void GlowPropertyPanel::NotifyItemUpdate(sal_uInt16 nSID, SfxItemState eState, { switch (nSID) { - case SID_ATTR_GLOW: - { - if (eState >= SfxItemState::DEFAULT) - { - const SdrOnOffItem* pItem = dynamic_cast<const SdrOnOffItem*>(pState); - if (pItem) - { - if (pItem->GetValue()) - mxShowGlow->set_state(TRISTATE_TRUE); - else - mxShowGlow->set_state(TRISTATE_FALSE); - } - } - } - break; - case SID_ATTR_GLOW_COLOR: { if (eState >= SfxItemState::DEFAULT) diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.hxx b/svx/source/sidebar/glow/GlowPropertyPanel.hxx index 233ec052e84c..aaffa44e4b20 100644 --- a/svx/source/sidebar/glow/GlowPropertyPanel.hxx +++ b/svx/source/sidebar/glow/GlowPropertyPanel.hxx @@ -37,14 +37,12 @@ public: boost::property_tree::ptree& /*rState*/) override{}; private: - sfx2::sidebar::ControllerItem maGlowController; sfx2::sidebar::ControllerItem maGlowColorController; sfx2::sidebar::ControllerItem maGlowRadiusController; sfx2::sidebar::ControllerItem maGlowTransparencyController; SfxBindings* mpBindings; - std::unique_ptr<weld::CheckButton> mxShowGlow; std::unique_ptr<weld::MetricSpinButton> mxGlowRadius; std::unique_ptr<ColorListBox> mxLBGlowColor; std::unique_ptr<weld::MetricSpinButton> mxGlowTransparency; @@ -55,7 +53,6 @@ private: void Initialize(); void UpdateControls(); - DECL_LINK(ClickGlowHdl, weld::ToggleButton&, void); DECL_LINK(ModifyGlowColorHdl, ColorListBox&, void); DECL_LINK(ModifyGlowRadiusHdl, weld::MetricSpinButton&, void); DECL_LINK(ModifyGlowTransparencyHdl, weld::MetricSpinButton&, void); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 785d88e91ebe..fddb2e89adc0 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -328,7 +328,6 @@ SdrItemPool::SdrItemPool( rPoolDefaults[ SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_BLTR ); rPoolDefaults[ SDRATTR_TABLE_TEXT_ROTATION - SDRATTR_START ] = new SvxTextRotateItem(0, SDRATTR_TABLE_TEXT_ROTATION); - rPoolDefaults[ SDRATTR_GLOW - SDRATTR_START ] = new SdrOnOffItem(SDRATTR_GLOW, false); rPoolDefaults[ SDRATTR_GLOW_RAD - SDRATTR_START ] = new SdrMetricItem(SDRATTR_GLOW_RAD, 0); rPoolDefaults[ SDRATTR_GLOW_COLOR - SDRATTR_START ] = new XColorItem(SDRATTR_GLOW_COLOR, aNullCol); rPoolDefaults[ SDRATTR_GLOW_TRANSPARENCY - SDRATTR_START ] = new SdrPercentItem(SDRATTR_GLOW_TRANSPARENCY, 0); @@ -349,7 +348,6 @@ SdrItemPool::SdrItemPool( mpLocalItemInfos[SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ]._nSID = SID_ATTR_BORDER_DIAG_TLBR; mpLocalItemInfos[SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ]._nSID = SID_ATTR_BORDER_DIAG_BLTR; - mpLocalItemInfos[SDRATTR_GLOW - SDRATTR_START]._nSID = SID_ATTR_GLOW; mpLocalItemInfos[SDRATTR_GLOW_RAD - SDRATTR_START]._nSID = SID_ATTR_GLOW_RADIUS; mpLocalItemInfos[SDRATTR_GLOW_COLOR - SDRATTR_START]._nSID = SID_ATTR_GLOW_COLOR; mpLocalItemInfos[SDRATTR_GLOW_TRANSPARENCY - SDRATTR_START]._nSID = SID_ATTR_GLOW_TRANSPARENCY; @@ -462,7 +460,6 @@ OUString SdrItemPool::GetItemName(sal_uInt16 nWhich) case SDRATTR_SHADOW3D : pResId = SIP_SA_SHADOW3D;break; case SDRATTR_SHADOWPERSP : pResId = SIP_SA_SHADOWPERSP;break; - case SDRATTR_GLOW : pResId = SIP_SA_GLOW;break; case SDRATTR_GLOW_RAD : pResId = SIP_SA_GLOW_RAD;break; case SDRATTR_GLOW_COLOR : pResId = SIP_SA_GLOW_COLOR;break; case SDRATTR_GLOW_TRANSPARENCY : pResId = SIP_SA_GLOW_TRANSPARENCY;break; diff --git a/svx/uiconfig/ui/sidebarglow.ui b/svx/uiconfig/ui/sidebarglow.ui index 9580f9939591..6d5f33520c8b 100644 --- a/svx/uiconfig/ui/sidebarglow.ui +++ b/svx/uiconfig/ui/sidebarglow.ui @@ -131,21 +131,6 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="SHOW_GLOW"> - <property name="label" translatable="yes" context="sidebarglow|SHOW_GLOW">Enable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi index 620227abad2d..3cd0a7fd6ddc 100644 --- a/sw/sdi/drawsh.sdi +++ b/sw/sdi/drawsh.sdi @@ -184,14 +184,6 @@ interface TextDraw : TextDrawBase DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - SID_ATTR_GLOW - [ - Export = FALSE; - ExecMethod = ExecDrawAttrArgs ; - StateMethod = GetDrawAttrState ; - DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; - ] - SID_ATTR_GLOW_COLOR [ Export = FALSE; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 7d37edc78800..8d9a70f5e082 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -932,7 +932,6 @@ namespace xmloff::token { TOKEN( "gcd", XML_GCD ), TOKEN( "generator", XML_GENERATOR ), TOKEN( "geq", XML_GEQ ), - TOKEN( "glow", XML_GLOW ), TOKEN( "glow-radius", XML_GLOW_RADIUS ), TOKEN( "glow-color", XML_GLOW_COLOR ), TOKEN( "glow-transparency", XML_GLOW_TRANSPARENCY ), diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 1902d20c3f30..c9725c2a5ca8 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -153,7 +153,6 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "ShadowTransparence", XML_NAMESPACE_DRAW, XML_SHADOW_OPACITY, XML_TYPE_NEG_PERCENT, 0 ), // glow attributes - GMAPV( "GlowEffect", XML_NAMESPACE_LO_EXT, XML_GLOW, XML_SD_TYPE_VISIBLE_HIDDEN, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAPV( "GlowEffectRad", XML_NAMESPACE_LO_EXT, XML_GLOW_RADIUS, XML_TYPE_MEASURE , 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAPV( "GlowEffectColor", XML_NAMESPACE_LO_EXT, XML_GLOW_COLOR, XML_TYPE_COLOR , 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAPV( "GlowEffectTransparency", XML_NAMESPACE_LO_EXT, XML_GLOW_TRANSPARENCY, XML_TYPE_PERCENT16, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index e7e52379a740..34b9af91e03c 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -847,7 +847,6 @@ gap-width gcd generator geq -glow glow-radius glow-color glow-transparency |