Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx (original) +++ openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx Sat May 18 10:12:43 2013 @@ -318,10 +318,11 @@ namespace svgio if(!aSvgGradientEntryVector.empty()) { basegfx::B2DHomMatrix aGeoToUnit; + basegfx::B2DHomMatrix aGradientTransform; if(rFillGradient.getGradientTransform()) { - aGeoToUnit = *rFillGradient.getGradientTransform(); + aGradientTransform = *rFillGradient.getGradientTransform(); } if(userSpaceOnUse == rFillGradient.getGradientUnits()) @@ -366,6 +367,7 @@ namespace svgio drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence( rTarget, new drawinglayer::primitive2d::SvgLinearGradientPrimitive2D( + aGradientTransform, rPath, aSvgGradientEntryVector, aStart, @@ -427,6 +429,7 @@ namespace svgio drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence( rTarget, new drawinglayer::primitive2d::SvgRadialGradientPrimitive2D( + aGradientTransform, rPath, aSvgGradientEntryVector, aStart, @@ -1184,7 +1187,7 @@ namespace svgio { } - void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& /* rTokenName */, SVGToken aSVGToken, const rtl::OUString& aContent) { switch(aSVGToken) { @@ -1788,6 +1791,18 @@ namespace svgio readLocalUrl(aContent, maMarkerEndXLink); break; } + case SVGTokenDisplay: + { + // There may be display:none statements inside of style defines, e.g. the following line: + // style="display:none" + // taken from a svg example; this needs to be parsed and set at the owning node. Do not call + // mrOwner.parseAttribute(...) here, this would lead to a recursion + if(aContent.getLength()) + { + mrOwner.setDisplay(getDisplayFromContent(aContent)); + } + break; + } default: { break;
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx (original) +++ openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx Sat May 18 10:12:43 2013 @@ -64,6 +64,15 @@ public: // is in a ListBox, all will be shown, else a ScrollBar will be used sal_Int16 GetListBoxMaximumLineCount() const; + // option to set the width of ColorValueSets in columns; this allows + // adaption to own colr set layouts. The default layout is 12 columns and should + // only be changed when the color palette is changed from the default + sal_Int16 GetColorValueSetColumnCount() const; + + // option to make previews show the content with a checkeded background to allow + // simple identification and better preview of transparent content + sal_Bool GetPreviewUsesCheckeredBackground() const; + void SetIsForPagePreviews(sal_Bool bSet); void SetIsHelpTipsDisappear(sal_Bool bSet); void SetIsAllowAnimatedGraphics(sal_Bool bSet); @@ -76,6 +85,8 @@ public: void SetEdgeBlending(sal_Int16 nSet); void SetListBoxMaximumLineCount(sal_Int16 nSet); + void SetColorValueSetColumnCount(sal_Int16 nSet); + void SetPreviewUsesCheckeredBackground(sal_Bool bSet); sal_Bool IsModified() const; void Commit(); Modified: openoffice/branches/ia2/main/svtools/source/config/accessibilityoptions.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/config/accessibilityoptions.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svtools/source/config/accessibilityoptions.cxx (original) +++ openoffice/branches/ia2/main/svtools/source/config/accessibilityoptions.cxx Sat May 18 10:12:43 2013 @@ -88,6 +88,8 @@ public: sal_Bool IsSelectionInReadonly() const; sal_Int16 GetEdgeBlending() const; sal_Int16 GetListBoxMaximumLineCount() const; + sal_Int16 GetColorValueSetColumnCount() const; + sal_Bool GetPreviewUsesCheckeredBackground() const; void SetAutoDetectSystemHC(sal_Bool bSet); void SetIsForPagePreviews(sal_Bool bSet); @@ -100,6 +102,8 @@ public: void SetSelectionInReadonly(sal_Bool bSet); void SetEdgeBlending(sal_Int16 nSet); void SetListBoxMaximumLineCount(sal_Int16 nSet); + void SetColorValueSetColumnCount(sal_Int16 nSet); + void SetPreviewUsesCheckeredBackground(sal_Bool bSet); sal_Bool IsModified() const { return bIsModified; }; }; @@ -340,6 +344,42 @@ sal_Int16 SvtAccessibilityOptions_Impl:: return nRet; } +sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const +{ + css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); + sal_Int16 nRet = 12; + + try + { + if(xNode.is()) + xNode->getPropertyValue(s_sColorValueSetColumnCount) >>= nRet; + } + catch(const css::uno::Exception& ex) + { + LogHelper::logIt(ex); + } + + return nRet; +} + +sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const +{ + css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); + sal_Bool bRet = sal_False; + + try + { + if(xNode.is()) + xNode->getPropertyValue(s_sPreviewUsesCheckeredBackground) >>= bRet; + } + catch(const css::uno::Exception& ex) + { + LogHelper::logIt(ex); + } + + return bRet; +} + void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet) { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -556,6 +596,24 @@ void SvtAccessibilityOptions_Impl::SetVC StyleSettingsChanged = true; } + const sal_Int16 nMaxColumnCountA(GetColorValueSetColumnCount()); + OSL_ENSURE(nMaxColumnCountA >= 0, "OOps, negative values for ColorValueSetColumnCount are not allowed (!)"); + const sal_uInt16 nMaxColumnCountB(static_cast< sal_uInt16 >(nMaxColumnCountA >= 0 ? nMaxColumnCountA : 0)); + + if(aStyleSettings.GetColorValueSetColumnCount() != nMaxColumnCountB) + { + aStyleSettings.SetColorValueSetColumnCount(nMaxColumnCountB); + StyleSettingsChanged = true; + } + + const bool bPreviewUsesCheckeredBackground(GetPreviewUsesCheckeredBackground()); + + if(aStyleSettings.GetPreviewUsesCheckeredBackground() != bPreviewUsesCheckeredBackground) + { + aStyleSettings.SetPreviewUsesCheckeredBackground(bPreviewUsesCheckeredBackground); + StyleSettingsChanged = true; + } + if(StyleSettingsChanged) { aAllSettings.SetStyleSettings(aStyleSettings); @@ -605,6 +663,46 @@ void SvtAccessibilityOptions_Impl::SetLi } } +void SvtAccessibilityOptions_Impl::SetColorValueSetColumnCount(sal_Int16 nSet) +{ + css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); + + try + { + if(xNode.is() && xNode->getPropertyValue(s_sColorValueSetColumnCount)!=nSet) + { + xNode->setPropertyValue(s_sColorValueSetColumnCount, css::uno::makeAny(nSet)); + ::comphelper::ConfigurationHelper::flush(m_xCfg); + + bIsModified = sal_True; + } + } + catch(const css::uno::Exception& ex) + { + LogHelper::logIt(ex); + } +} + +void SvtAccessibilityOptions_Impl::SetPreviewUsesCheckeredBackground(sal_Bool bSet) +{ + css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); + + try + { + if(xNode.is() && xNode->getPropertyValue(s_sPreviewUsesCheckeredBackground)!=bSet) + { + xNode->setPropertyValue(s_sPreviewUsesCheckeredBackground, css::uno::makeAny(bSet)); + ::comphelper::ConfigurationHelper::flush(m_xCfg); + + bIsModified = sal_True; + } + } + catch(const css::uno::Exception& ex) + { + LogHelper::logIt(ex); + } +} + // ----------------------------------------------------------------------- // class SvtAccessibilityOptions -------------------------------------------------- @@ -715,6 +813,14 @@ sal_Int16 SvtAccessibilityOptions::GetLi { return sm_pSingleImplConfig->GetListBoxMaximumLineCount(); } +sal_Int16 SvtAccessibilityOptions::GetColorValueSetColumnCount() const +{ + return sm_pSingleImplConfig->GetColorValueSetColumnCount(); +} +sal_Bool SvtAccessibilityOptions::GetPreviewUsesCheckeredBackground() const +{ + return sm_pSingleImplConfig->GetPreviewUsesCheckeredBackground(); +} // ----------------------------------------------------------------------- void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet) @@ -765,4 +871,13 @@ void SvtAccessibilityOptions::SetListBox { sm_pSingleImplConfig->SetListBoxMaximumLineCount(nSet); } +void SvtAccessibilityOptions::SetColorValueSetColumnCount(sal_Int16 nSet) +{ + sm_pSingleImplConfig->SetColorValueSetColumnCount(nSet); +} +void SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(sal_Bool bSet) +{ + sm_pSingleImplConfig->SetPreviewUsesCheckeredBackground(bSet); +} + // ----------------------------------------------------------------------- Modified: openoffice/branches/ia2/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx (original) +++ openoffice/branches/ia2/main/svtools/source/inc/configitems/accessibilityoptions_const.hxx Sat May 18 10:12:43 2013 @@ -31,18 +31,20 @@ namespace { - static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility"); - static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC"); - static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews"); - static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear"); - static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds"); - static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics"); - static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText"); - static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor"); - static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont"); - static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly"); - static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending"); - static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount"); + static const ::rtl::OUString s_sAccessibility = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Accessibility"); + static const ::rtl::OUString s_sAutoDetectSystemHC = ::rtl::OUString::createFromAscii("AutoDetectSystemHC"); + static const ::rtl::OUString s_sIsForPagePreviews = ::rtl::OUString::createFromAscii("IsForPagePreviews"); + static const ::rtl::OUString s_sIsHelpTipsDisappear = ::rtl::OUString::createFromAscii("IsHelpTipsDisappear"); + static const ::rtl::OUString s_sHelpTipSeconds = ::rtl::OUString::createFromAscii("HelpTipSeconds"); + static const ::rtl::OUString s_sIsAllowAnimatedGraphics = ::rtl::OUString::createFromAscii("IsAllowAnimatedGraphics"); + static const ::rtl::OUString s_sIsAllowAnimatedText = ::rtl::OUString::createFromAscii("IsAllowAnimatedText"); + static const ::rtl::OUString s_sIsAutomaticFontColor = ::rtl::OUString::createFromAscii("IsAutomaticFontColor"); + static const ::rtl::OUString s_sIsSystemFont = ::rtl::OUString::createFromAscii("IsSystemFont"); + static const ::rtl::OUString s_sIsSelectionInReadonly = ::rtl::OUString::createFromAscii("IsSelectionInReadonly"); + static const ::rtl::OUString s_sEdgeBlending = ::rtl::OUString::createFromAscii("EdgeBlending"); + static const ::rtl::OUString s_sListBoxMaximumLineCount = ::rtl::OUString::createFromAscii("ListBoxMaximumLineCount"); + static const ::rtl::OUString s_sColorValueSetColumnCount = ::rtl::OUString::createFromAscii("ColorValueSetColumnCount"); + static const ::rtl::OUString s_sPreviewUsesCheckeredBackground = ::rtl::OUString::createFromAscii("PreviewUsesCheckeredBackground"); } #endif // INCLUDE_CONFIGITEMS_ACCESSIBILITYOPTIONS_CONST_HXX Modified: openoffice/branches/ia2/main/svx/AllLangResTarget_svx.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/AllLangResTarget_svx.mk?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/AllLangResTarget_svx.mk (original) +++ openoffice/branches/ia2/main/svx/AllLangResTarget_svx.mk Sat May 18 10:12:43 2013 @@ -84,6 +84,7 @@ $(eval $(call gb_SrsTarget_add_files,svx svx/source/sidebar/possize/PosSizePropertyPanel.src \ svx/source/sidebar/text/TextPropertyPanel.src \ svx/source/sidebar/paragraph/ParaPropertyPanel.src \ + svx/source/sidebar/insert/InsertPropertyPanel.src \ svx/source/stbctrls/stbctrls.src \ svx/source/svdraw/svdstr.src \ svx/source/table/table.src \ Modified: openoffice/branches/ia2/main/svx/Library_svx.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/Library_svx.mk?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/Library_svx.mk (original) +++ openoffice/branches/ia2/main/svx/Library_svx.mk Sat May 18 10:12:43 2013 @@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs cppu \ drawinglayer \ editeng \ + fwe \ fwk \ i18nisolang1 \ icuuc \ @@ -213,6 +214,7 @@ $(eval $(call gb_Library_add_exception_o svx/source/sidebar/tools/PopupContainer \ svx/source/sidebar/tools/Popup \ svx/source/sidebar/tools/ValueSetWithTextControl \ + svx/source/sidebar/insert/InsertPropertyPanel \ svx/source/stbctrls/pszctrl \ svx/source/stbctrls/insctrl \ svx/source/stbctrls/selctrl \ Modified: openoffice/branches/ia2/main/svx/Library_svxcore.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/Library_svxcore.mk?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/Library_svxcore.mk (original) +++ openoffice/branches/ia2/main/svx/Library_svxcore.mk Sat May 18 10:12:43 2013 @@ -184,6 +184,7 @@ $(eval $(call gb_Library_add_exception_o svx/source/items/customshapeitem \ svx/source/items/drawitem \ svx/source/items/e3ditem \ + svx/source/items/galleryitem \ svx/source/items/grfitem \ svx/source/sdr/animation/scheduler \ svx/source/sdr/animation/objectanimator \
