cui/uiconfig/ui/optfltrembedpage.ui | 2 ++
editeng/source/items/frmitems.cxx | 10 +++++-----
include/editeng/brushitem.hxx | 6 +++---
sw/source/filter/ww8/docxattributeoutput.cxx | 6 +++---
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 8e8a97feebd357687927f62b12c89f18c65382a0
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sun Mar 8 14:02:51 2015 +0100
const_cast -> mutable
Change-Id: Idedcb4a9add451fbdf39cad1429669a12b8c11b9
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 0621746..fae0be7 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3939,7 +3939,7 @@ const GraphicObject*
SvxBrushItem::GetGraphicObject(OUString const & referer) co
if( nRes != GRFILTER_OK )
{
- const_cast < SvxBrushItem*> (this)->bLoadAgain = false;
+ bLoadAgain = false;
}
else
{
@@ -3950,7 +3950,7 @@ const GraphicObject*
SvxBrushItem::GetGraphicObject(OUString const & referer) co
}
else
{
- const_cast < SvxBrushItem*> (this)->bLoadAgain = false;
+ bLoadAgain = false;
}
}
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index fee7628..b529d31 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -53,7 +53,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
OUString maStrLink;
OUString maStrFilter;
SvxGraphicPosition eGraphicPos;
- bool bLoadAgain;
+ mutable bool bLoadAgain;
void ApplyGraphicTransparency_Impl();
DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *);
commit b5aa8604ec39f7f8d573fe2dde94b7c7e70d93b8
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sat Mar 7 21:12:12 2015 +0100
Make "Embedded Objects" frame expendable to fill space better
Change-Id: I9b9335464c774bca13013576583877895d673592
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui
b/cui/uiconfig/ui/optfltrembedpage.ui
index a3fe815..c7439b1 100644
--- a/cui/uiconfig/ui/optfltrembedpage.ui
+++ b/cui/uiconfig/ui/optfltrembedpage.ui
@@ -12,6 +12,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -32,6 +33,7 @@
<object class="svtlo-SvSimpleTableContainer"
id="checklbcontainer">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Simple Table
Container-selection1"/>
</child>
commit d4a1e2a491cb50c8fee072458aa2c676c2f1a0fd
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sun Mar 8 14:00:26 2015 +0100
Avoid casting SvxBrushItem:nShadingValue
Change-Id: Ida97950286bc69154d10cbc9b5ac699e7ad608ad
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 2c0adcc..0621746 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3636,7 +3636,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
case MID_SHADING_VALUE:
{
- rVal <<= (sal_Int32)(nShadingValue);
+ rVal <<= nShadingValue;
}
break;
}
@@ -3753,7 +3753,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal,
sal_uInt8 nMemberId )
case MID_SHADING_VALUE:
{
- sal_uInt32 nVal = 0;
+ sal_Int32 nVal = 0;
if (!(rVal >>= nVal))
return false;
@@ -4068,7 +4068,7 @@ void SvxBrushItem::SetGraphicFilter( const OUString& rNew
)
maStrFilter = rNew;
}
-void SvxBrushItem::SetShadingValue( const sal_uInt32 nNew )
+void SvxBrushItem::SetShadingValue( const sal_Int32 nNew )
{
nShadingValue = nNew;
}
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 9a7bb0f..fee7628 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -104,13 +104,13 @@ public:
void PurgeMedium() const;
- sal_uInt32 GetShadingValue() const { return
nShadingValue; }
+ sal_Int32 GetShadingValue() const { return
nShadingValue; }
const Graphic* GetGraphic(OUString const & referer =
OUString()/*TODO*/) const;
const GraphicObject* GetGraphicObject(OUString const & referer =
OUString()/*TODO*/) const;
OUString GetGraphicLink() const { return maStrLink; }
OUString GetGraphicFilter() const { return maStrFilter; }
- void SetShadingValue( const sal_uInt32 nNew );
+ void SetShadingValue( const sal_Int32 nNew );
//UUUU get graphic transparency in percent
sal_Int8 getGraphicTransparency() const;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6033c9a..f7af823 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3818,7 +3818,7 @@ void DocxAttributeOutput::OutputDefaultItem(const
SfxPoolItem& rHt)
{
const SvxBrushItem& rBrushItem = static_cast< const
SvxBrushItem& >(rHt);
bMustWrite = (rBrushItem.GetColor() != COL_AUTO ||
- rBrushItem.GetShadingValue() !=
sal_uInt32(ShadingPattern::CLEAR) ||
+ rBrushItem.GetShadingValue() !=
ShadingPattern::CLEAR ||
rBrushItem.GetGraphic() != NULL ||
rBrushItem.GetGraphicObject() != NULL);
}
@@ -3886,7 +3886,7 @@ void DocxAttributeOutput::OutputDefaultItem(const
SfxPoolItem& rHt)
{
const SvxBrushItem& rBrushItem = static_cast< const
SvxBrushItem& >(rHt);
bMustWrite = (rBrushItem.GetColor() != COL_AUTO ||
- rBrushItem.GetShadingValue() !=
sal_uInt32(ShadingPattern::CLEAR) ||
+ rBrushItem.GetShadingValue() !=
ShadingPattern::CLEAR ||
rBrushItem.GetGraphic() != NULL ||
rBrushItem.GetGraphicObject() != NULL);
}
@@ -6242,7 +6242,7 @@ void DocxAttributeOutput::CharAnimatedText( const
SvxBlinkItem& rBlink )
void DocxAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
{
// Check if the brush shading pattern is 'PCT15'. If so - write it back to
the DOCX
- if (rBrush.GetShadingValue() == +ShadingPattern::PCT15)
+ if (rBrush.GetShadingValue() == ShadingPattern::PCT15)
{
m_pSerializer->singleElementNS( XML_w, XML_shd,
FSNS( XML_w, XML_val ), MSWORD_CH_SHADING_VAL,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
