sc/source/core/data/documen9.cxx | 2 -- svx/source/unodraw/unobrushitemhelper.cxx | 5 +---- sw/source/core/unocore/unostyle.cxx | 10 +++++----- 3 files changed, 6 insertions(+), 11 deletions(-)
New commits: commit fcbe33f5aebbcbc2559d69d9b964bca3f18dc239 Author: Miklos Vajna <[email protected]> Date: Mon Jun 30 12:19:23 2014 +0200 getSvxBrushItemFromSourceSet: let XFILL_NONE result in COL_AUTO I'm not completely sure about this, but without this, automatic color is translated back as rgba(114, 159, 207, 255), which sounds even worse. Change-Id: I9f96f26b3797d9e289119a4795d2535b6d72262e diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 5ce03ac..c95c200 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -191,10 +191,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt if(!pXFillStyleItem || XFILL_NONE == pXFillStyleItem->GetValue()) { - // no fill, still need to rescue the evtl. set RGB color, but use as transparent color (we have XFILL_NONE) - Color aFillColor(static_cast< const XFillColorItem& >(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue()); - aFillColor.SetTransparency(0xff); - + Color aFillColor(COL_AUTO); return SvxBrushItem(aFillColor, nBackgroundID); } commit cd555d8d4ceecba3d6b410c9cd2b5b684606dd1d Author: Miklos Vajna <[email protected]> Date: Mon Jun 30 11:57:32 2014 +0200 SwXPageStyle: fix FirstIsShared handling At least now beans::UnknownPropertyException is not thrown when it is written. Change-Id: I6d4f8dbb1ac7caffc4bfdfb9c4c1c84eb9179883 diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 37225c6..1be74cd 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2860,7 +2860,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates( const bool bHeader(SFX_STYLE_FAMILY_PAGE == eFamily && sPropName.startsWith("Header")); const bool bFooter(SFX_STYLE_FAMILY_PAGE == eFamily && sPropName.startsWith("Footer")); - if(bHeader || bFooter) + if(bHeader || bFooter || sPropName == UNO_NAME_FIRST_IS_SHARED) { const SvxSetItem* pSetItem; @@ -3416,7 +3416,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( const bool bHeader(rPropName.startsWith("Header")); const bool bFooter(rPropName.startsWith("Footer")); - if(bHeader || bFooter) + if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED) { // it is a Header/Footer entry, access the SvxSetItem containing it's information const SvxSetItem* pSetItem = 0; @@ -3524,7 +3524,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( const bool bHeader(rPropName.startsWith("Header")); const bool bFooter(rPropName.startsWith("Footer")); - if(bHeader || bFooter) + if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED) { const SvxSetItem* pSetItem = 0; @@ -3721,7 +3721,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( const bool bHeader(rPropName.startsWith("Header")); const bool bFooter(rPropName.startsWith("Footer")); - if(bHeader || bFooter) + if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED) { // slot is a Header/Footer slot rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) ); @@ -3795,7 +3795,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( const bool bHeader(rPropName.startsWith("Header")); const bool bFooter(rPropName.startsWith("Footer")); - if(bHeader || bFooter) + if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED) { rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) ); const SfxItemSet& rSet = xStyle->GetItemSet(); commit aebef4d225acaf28f9b2d4ad1f930986c468acd0 Author: Miklos Vajna <[email protected]> Date: Mon Jun 30 11:44:07 2014 +0200 Remove stray fprintf Change-Id: I3cfe170091f11a3039ff6443b283fb45773a4e70 diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index c039862..fc2e7cf 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -146,11 +146,9 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if(pLocalPool) { OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a secondary pool set where the DrawingLayer ItemPool is to be placed (!)"); - fprintf(stderr, "ANS is %p\n", pLocalPool->GetSecondaryPool()); #if 0 pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool()); #endif - fprintf(stderr, "was set to %p\n", pLocalPool->GetSecondaryPool()); } } #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
