include/vcl/outdev.hxx | 2 +-
sd/source/core/stlpool.cxx | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit c9e23d31aef62a00acfa90de8a80fb68f5e9dcbf
Author: matteocam <matteo.campane...@gmail.com>
Date: Wed Jun 4 23:46:45 2014 -0400
Removed experimental change to IsTextFillColor
Change-Id: I99d1bfd3953c0fb01b9e202d93127b4f4f55faae
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b722575..3c3be7c 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1042,7 +1042,7 @@ public:
void SetTextFillColor();
void SetTextFillColor( const Color& rColor );
Color GetTextFillColor() const;
- bool IsTextFillColor() const { return
maFont.GetUnderline() == UNDERLINE_SINGLE; /*return !maFont.IsTransparent();*/ }
+ bool IsTextFillColor() const { return return
!maFont.IsTransparent(); }
void SetTextLineColor();
void SetTextLineColor( const Color& rColor );
commit 3ae8a7302c2c145867ae2072f3ba477ba1b3e0a4
Author: matteocam <matteo.campane...@gmail.com>
Date: Wed Jun 4 22:50:46 2014 -0400
Background color in defaults for named presentation layout
Change-Id: I0f65476a545cdd080768e00161ab4a7682acc359
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 0c7fff4..13e02c5 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -259,6 +259,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString& rLayoutName, bool
rSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE,
EE_CHAR_EMPHASISMARK ) );
rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
+ rSet.Put( SvxBackgroundColorItem( Color (COL_AUTO),
EE_CHAR_BKGCOLOR ) );
rSet.Put( XLineStyleItem(XLINE_NONE) );
rSet.Put( XFillStyleItem(XFILL_NONE) );
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
@@ -376,6 +377,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString& rLayoutName, bool
rTitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE,
EE_CHAR_EMPHASISMARK ) );
rTitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
+ rTitleSet.Put(SvxBackgroundColorItem( Color(COL_AUTO),
EE_CHAR_BKGCOLOR ));
rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
// #i16874# enable kerning by default but only for new documents
@@ -421,6 +423,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString& rLayoutName, bool
rSubtitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE,
EE_CHAR_EMPHASISMARK ) );
rSubtitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
+ rSubtitleSet.Put(SvxBackgroundColorItem( Color(COL_AUTO),
EE_CHAR_BKGCOLOR ));
rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
// #i16874# enable kerning by default but only for new documents
@@ -469,6 +472,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString& rLayoutName, bool
rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE,
EE_CHAR_EMPHASISMARK ) );
rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) );
+ rNotesSet.Put( SvxBackgroundColorItem( Color(COL_AUTO),
EE_CHAR_BKGCOLOR ) );
rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) );
// #i16874# enable kerning by default but only for new documents
rNotesSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
