cui/qa/uitest/dialogs/chardlg.py | 49 +++++++++++ cui/source/inc/chardlg.hxx | 3 cui/source/tabpages/chardlg.cxx | 40 ++++++++- cui/uiconfig/ui/effectspage.ui | 30 ++++++ include/svx/flagsdef.hxx | 1 oox/CppunitTest_oox_drawingml.mk | 45 ++++++++++ oox/Module_oox.mk | 1 oox/qa/unit/data/transparent-text.pptx |binary oox/qa/unit/drawingml.cxx | 100 +++++++++++++++++++++++ oox/source/drawingml/textcharacterproperties.cxx | 10 ++ oox/source/export/drawingml.cxx | 12 ++ oox/source/token/properties.txt | 1 sd/source/ui/dlg/dlgchar.cxx | 2 13 files changed, 291 insertions(+), 3 deletions(-)
New commits: commit 78b905b94e93c5262382c4635654da8944d49b53 Author: Miklos Vajna <[email protected]> AuthorDate: Fri Nov 22 17:12:04 2019 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Feb 21 15:58:59 2020 +0100 cui: add UI for semi-transparent shape text - Make font color only work with the RGB color, otherwise the preview would be white for e.g. half-transparent red. - Add label and widget to see already set transparency. - Add a flag to show these only for Draw/Impress and leave Writer/Calc unchanged. - Update returned item set to contain transparency in case the widget changes. (cherry picked from commit b4554b8eddd048532269df610e89ae739c46fab7) Conflicts: cui/source/tabpages/chardlg.cxx cui/uiconfig/ui/effectspage.ui Change-Id: If77771076ff4b10a4a5d468a6583809a94deb57e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89182 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py new file mode 100644 index 000000000000..59cf10d18c29 --- /dev/null +++ b/cui/qa/uitest/dialogs/chardlg.py @@ -0,0 +1,49 @@ +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.framework import UITestCase +from uitest.uihelper.common import select_pos + +# Test for cui/source/tabpages/chardlg.cxx. +class Test(UITestCase): + + def testSvxCharEffectsPage(self): + # Start Impress. + self.ui_test.create_doc_in_start_center("impress") + template = self.xUITest.getTopFocusWindow() + self.ui_test.close_dialog_through_button(template.getChild("cancel")) + doc = self.xUITest.getTopFocusWindow() + editWin = doc.getChild("impress_win") + # Select the title shape. + editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) + editWin.executeAction("TYPE", mkPropertyValues({"TEXT": "t"})) + self.xUITest.executeCommand(".uno:SelectAll") + + # Now use Format -> Character. + self.ui_test.execute_dialog_through_command(".uno:FontDialog") + xDialog = self.xUITest.getTopFocusWindow() + xTabs = xDialog.getChild("tabcontrol") + # Select RID_SVXPAGE_CHAR_EFFECTS. + select_pos(xTabs, "1") + xFontTransparency = xDialog.getChild("fonttransparencymtr") + for _ in range(5): + xFontTransparency.executeAction("UP", tuple()) + self.ui_test.close_dialog_through_button(xDialog.getChild("ok")) + + # Verify the result. + component = self.ui_test.get_component() + drawPage = component.getDrawPages().getByIndex(0) + shape = drawPage.getByIndex(0) + + # Without the accompanying fix in place, this test would have failed with: + # AssertionError: 100 != 5 + # i.e. the dialog did not set transparency to 5%, instead it left the character color at + # COL_AUTO. + self.assertEqual(shape.CharTransparence, 5) + self.ui_test.close_doc() + +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 0aa3cd9499f1..b5e905ccee12 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -187,6 +187,8 @@ private: std::unique_ptr<weld::Label> m_xFontColorFT; std::unique_ptr<ColorListBox> m_xFontColorLB; + std::unique_ptr<weld::Label> m_xFontTransparencyFT; + std::unique_ptr<weld::MetricSpinButton> m_xFontTransparencyMtr; std::unique_ptr<weld::Label> m_xEffectsFT; std::unique_ptr<weld::ComboBox> m_xEffectsLB; std::unique_ptr<weld::Label> m_xReliefFT; @@ -225,6 +227,7 @@ private: DECL_LINK(TristClickHdl_Impl, weld::ToggleButton&, void); DECL_LINK(UpdatePreview_Impl, weld::ComboBox&, void); DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void); + DECL_LINK(ModifyFontTransparencyHdl_Impl, weld::MetricSpinButton&, void); public: virtual ~SvxCharEffectsPage() override; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 3886d27235d9..067f1c773ec0 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1335,6 +1335,9 @@ SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& , m_bUnderlineColorDisabled(false) , m_xFontColorFT(m_xBuilder->weld_label("fontcolorft")) , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pParent.GetFrameWeld())) + , m_xFontTransparencyFT(m_xBuilder->weld_label("fonttransparencyft")) + , m_xFontTransparencyMtr( + m_xBuilder->weld_metric_spin_button("fonttransparencymtr", FieldUnit::PERCENT)) , m_xEffectsFT(m_xBuilder->weld_label("effectsft")) , m_xEffectsLB(m_xBuilder->weld_combo_box("effectslb")) , m_xReliefFT(m_xBuilder->weld_label("reliefft")) @@ -1388,6 +1391,7 @@ void SvxCharEffectsPage::dispose() { m_xUnderlineColorLB.reset(); m_xOverlineColorLB.reset(); + m_xFontTransparencyMtr.reset(); m_xFontColorLB.reset(); SvxCharBasePage::dispose(); } @@ -1412,6 +1416,8 @@ void SvxCharEffectsPage::Initialize() } m_xFontColorLB->SetSelectHdl(LINK(this, SvxCharEffectsPage, ColorBoxSelectHdl_Impl)); + m_xFontTransparencyMtr->connect_value_changed( + LINK(this, SvxCharEffectsPage, ModifyFontTransparencyHdl_Impl)); // handler Link<weld::ComboBox&,void> aLink = LINK( this, SvxCharEffectsPage, SelectListBoxHdl_Impl ); @@ -1577,7 +1583,19 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) m_aPreviewWin.Invalidate(); - m_xFontColorLB->SelectEntry(aColor); + Color aRGBColor = aColor; + if (aRGBColor.GetTransparency()) + { + aRGBColor.SetTransparency(0); + } + m_xFontColorLB->SelectEntry(aRGBColor); + + if (m_xFontTransparencyMtr->get_visible() && aColor != COL_AUTO) + { + double fTransparency = aColor.GetTransparency() * 100.0 / 255; + m_xFontTransparencyMtr->set_value(basegfx::fround(fTransparency), + FieldUnit::PERCENT); + } m_aOrigFontColor = aColor; m_bOrigFontColor = true; @@ -1598,6 +1616,14 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) if (bChanged) { aSelectedColor = m_xFontColorLB->GetSelectEntryColor(); + + if (m_xFontTransparencyMtr->get_value_changed_from_saved()) + { + double fTransparency + = m_xFontTransparencyMtr->get_value(FieldUnit::PERCENT) * 255.0 / 100; + aSelectedColor.SetTransparency(static_cast<sal_uInt8>(basegfx::fround(fTransparency))); + } + if (m_bOrigFontColor) bChanged = aSelectedColor != m_aOrigFontColor; if (m_bEnableNoneFontColor && bChanged && aSelectedColor == COL_NONE_COLOR) @@ -1681,6 +1707,11 @@ IMPL_LINK(SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox&, rBox, void) UpdatePreview_Impl(); } +IMPL_LINK_NOARG(SvxCharEffectsPage, ModifyFontTransparencyHdl_Impl, weld::MetricSpinButton&, void) +{ + m_bNewFontColor = true; +} + DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -2083,6 +2114,7 @@ void SvxCharEffectsPage::ChangesApplied() m_xShadowBtn->save_state(); m_xBlinkingBtn->save_state(); m_xHiddenBtn->save_state(); + m_xFontTransparencyMtr->save_value(); } bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) @@ -2446,6 +2478,12 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) if ( ( nFlags & SVX_PREVIEW_CHARACTER ) == SVX_PREVIEW_CHARACTER ) // the writer uses SID_ATTR_BRUSH as font background m_bPreviewBackgroundToCharacter = true; + if ((nFlags & SVX_ENABLE_CHAR_TRANSPARENCY) != SVX_ENABLE_CHAR_TRANSPARENCY) + { + // Only show these in case client code explicitly wants this. + m_xFontTransparencyFT->hide(); + m_xFontTransparencyMtr->hide(); + } } } diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 466ca4b40da7..3e924675b3cd 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -144,6 +144,31 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="fonttransparencyft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="effectspage|fonttransparencyft">_Transparency:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fonttransparencymtr</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="fonttransparencymtr"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="adjustment">adjustmentPercent</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">7</property> + </packing> + </child> <child> <object class="GtkComboBoxText" id="effectslb"> <property name="visible">True</property> @@ -525,4 +550,9 @@ </packing> </child> </object> + <object class="GtkAdjustment" id="adjustmentPercent"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> </interface> diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index 1b09540e7198..750e5c9326fc 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -67,6 +67,7 @@ namespace o3tl #define SVX_RELATIVE_MODE 0x02 // flags for SvxCharEffectsPage #define SVX_ENABLE_FLASH 0x04 +#define SVX_ENABLE_CHAR_TRANSPARENCY 0x08 // Default values for Number Format Category List and Preview diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 298e0e69ae01..27f770dcfb5d 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -56,6 +56,8 @@ void SdCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) } else if (rId == "RID_SVXPAGE_CHAR_EFFECTS") { + // Opt in for character transparency. + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, SVX_ENABLE_CHAR_TRANSPARENCY)); rPage.PageCreated(aSet); } else if (rId == "RID_SVXPAGE_BACKGROUND") commit b42d90670048c04f88faa62f3f3457eb12d9cf87 Author: Miklos Vajna <[email protected]> AuthorDate: Thu Nov 21 17:53:35 2019 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Feb 21 15:58:46 2020 +0100 oox: add PPTX import/export for semi-transparent shape text And start a drawingml test suite in oox, so the test and the tested code is close to each other (just like how it's done in chart2/ already). Change-Id: I9a2810691f12604d240e4394e6a5ff4e7f52f1c1 Reviewed-on: https://gerrit.libreoffice.org/83412 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins (cherry picked from commit 1e64d9ebaa231caef5fb062009b8f76465e415f4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89181 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/oox/CppunitTest_oox_drawingml.mk b/oox/CppunitTest_oox_drawingml.mk new file mode 100644 index 000000000000..dd0288074e32 --- /dev/null +++ b/oox/CppunitTest_oox_drawingml.mk @@ -0,0 +1,45 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,oox_drawingml)) + +$(eval $(call gb_CppunitTest_use_externals,oox_drawingml,\ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,oox_drawingml, \ + oox/qa/unit/drawingml \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,oox_drawingml, \ + comphelper \ + cppu \ + oox \ + sal \ + test \ + unotest \ + utl \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,oox_drawingml)) + +$(eval $(call gb_CppunitTest_use_ure,oox_drawingml)) +$(eval $(call gb_CppunitTest_use_vcl,oox_drawingml)) + +$(eval $(call gb_CppunitTest_use_rdb,oox_drawingml,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,oox_drawingml,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,oox_drawingml)) + +# vim: set noet sw=4 ts=4: diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk index 961e3be66887..b24f57501c59 100644 --- a/oox/Module_oox.mk +++ b/oox/Module_oox.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_check_targets,oox,\ CppunitTest_oox_vba_encryption \ CppunitTest_oox_crypto \ CppunitTest_oox_mathml \ + CppunitTest_oox_drawingml \ )) # vim: set noet sw=4 ts=4: diff --git a/oox/qa/unit/data/transparent-text.pptx b/oox/qa/unit/data/transparent-text.pptx new file mode 100644 index 000000000000..b7b3ede4dc3d Binary files /dev/null and b/oox/qa/unit/data/transparent-text.pptx differ diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx new file mode 100644 index 000000000000..e3c455c04867 --- /dev/null +++ b/oox/qa/unit/drawingml.cxx @@ -0,0 +1,100 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <test/bootstrapfixture.hxx> +#include <unotest/macros_test.hxx> + +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> +#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/XStorable.hpp> + +#include <comphelper/embeddedobjectcontainer.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/propertyvalue.hxx> +#include <comphelper/scopeguard.hxx> +#include <comphelper/storagehelper.hxx> +#include <unotools/mediadescriptor.hxx> +#include <unotools/tempfile.hxx> + +using namespace ::com::sun::star; + +/// oox drawingml tests. +class OoxDrawingmlTest : public test::BootstrapFixture, public unotest::MacrosTest +{ +private: + uno::Reference<uno::XComponentContext> mxComponentContext; + uno::Reference<lang::XComponent> mxComponent; + +public: + void setUp() override; + void tearDown() override; + uno::Reference<lang::XComponent>& getComponent() { return mxComponent; } + void loadAndReload(const OUString& rURL, const OUString& rFilterName); +}; + +void OoxDrawingmlTest::setUp() +{ + test::BootstrapFixture::setUp(); + + mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); + mxDesktop.set(frame::Desktop::create(mxComponentContext)); +} + +void OoxDrawingmlTest::tearDown() +{ + if (mxComponent.is()) + mxComponent->dispose(); + + test::BootstrapFixture::tearDown(); +} + +void OoxDrawingmlTest::loadAndReload(const OUString& rURL, const OUString& rFilterName) +{ + mxComponent = loadFromDesktop(rURL); + uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); + utl::MediaDescriptor aMediaDescriptor; + aMediaDescriptor["FilterName"] <<= rFilterName; + utl::TempFile aTempFile; + xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + mxComponent->dispose(); + validate(aTempFile.GetFileName(), test::OOXML); + mxComponent = loadFromDesktop(aTempFile.GetURL()); +} + +char const DATA_DIRECTORY[] = "/oox/qa/unit/data/"; + +CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTransparentText) +{ + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "transparent-text.pptx"; + loadAndReload(aURL, "Impress Office Open XML"); + + uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY); + uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), + uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xParagraph( + xShape->createEnumeration()->nextElement(), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPortion(xParagraph->createEnumeration()->nextElement(), + uno::UNO_QUERY); + + sal_Int16 nTransparency = 0; + xPortion->getPropertyValue("CharTransparence") >>= nTransparency; + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 75 + // - Actual : 0 + // i.e. the transparency of the character color was lost on import/export. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(75), nTransparency); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 552dcf933e81..a33b98ae2e0c 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -105,7 +105,15 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil } if ( maFillProperties.moFillType.has() ) - rPropMap.setProperty( PROP_CharColor, maFillProperties.getBestSolidColor().getColor( rFilter.getGraphicHelper() )); + { + Color aColor = maFillProperties.getBestSolidColor(); + rPropMap.setProperty(PROP_CharColor, aColor.getColor(rFilter.getGraphicHelper())); + + if (aColor.hasTransparency()) + { + rPropMap.setProperty(PROP_CharTransparence, aColor.getTransparency()); + } + } if( moLang.has() && !moLang.get().isEmpty() ) { diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index bc6b7db45a44..59dc29a527bc 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1792,13 +1792,23 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool ::Color color( *o3tl::doAccess<sal_uInt32>(mAny) ); SAL_INFO("oox.shape", "run color: " << sal_uInt32(color) << " auto: " << sal_uInt32(COL_AUTO)); + // WriteSolidFill() handles MAX_PERCENT as "no transparency". + sal_Int32 nTransparency = MAX_PERCENT; + if (rXPropSet->getPropertySetInfo()->hasPropertyByName("CharTransparence")) + { + rXPropSet->getPropertyValue("CharTransparence") >>= nTransparency; + // UNO scale is 0..100, OOXML scale is 0..100000; also UNO tracks transparency, OOXML + // tracks opacity. + nTransparency = MAX_PERCENT - (nTransparency * PER_PERCENT); + } + // tdf#104219 In LibreOffice and MS Office, there are two types of colors: // Automatic and Fixed. OOXML is setting automatic color, by not providing color. if( color != COL_AUTO ) { color.SetTransparency(0); // TODO: special handle embossed/engraved - WriteSolidFill( color ); + WriteSolidFill(color, nTransparency); } } diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 7b107ffc4aec..883a10107c2b 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -81,6 +81,7 @@ CharPostureComplex CharShadowed CharStrikeout CharStyleName +CharTransparence CharUnderline CharUnderlineColor CharUnderlineHasColor _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
