summaryrefslogtreecommitdiff
path: root/editeng/source
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-04-05 20:06:07 +0200
committerPetr Mladek <pmladek@suse.cz>2011-04-05 20:06:07 +0200
commit33b12b721ecacdc16869cfd78db05f6876137f44 (patch)
tree4cb48f9451ddef111cd65a644268ab3118912a42 /editeng/source
parent9e1bffbc1abd41a11ee1ddbf449e3d631782450a (diff)
parent2833c4cb4dc6c6def3d3cb3b134f22eda3a87207 (diff)
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts: basic/source/runtime/dllmgr.cxx drawinglayer/source/processor2d/vclpixelprocessor2d.cxx editeng/inc/editeng/boxitem.hxx editeng/source/items/frmitems.cxx sfx2/workben/custompanel/makefile.mk
Diffstat (limited to 'editeng/source')
-rw-r--r--editeng/source/items/frmitems.cxx59
1 files changed, 56 insertions, 3 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index bda2be744f..9a519fb2e1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1743,17 +1743,31 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
}
-// -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+namespace
+{
+
+sal_Bool
+lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
{
return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True);
}
+ return bRet;
+}
sal_Bool
SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+// -----------------------------------------------------------------------
+sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
{
SvxBorderStyle nStyle = NO_STYLE;
switch ( rLine.LineStyle )
+
+sal_Bool
+SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+{
+ const bool bRet(lcl_lineToSvxLine(rLine, rSvxLine, bConvert));
+
+ switch ( rLine.LineStyle )
{
default:
case table::BorderLineStyle::SOLID:
@@ -1806,7 +1820,6 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
{
rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) : rLine.LineWidth );
bGuessWidth = sal_False;
- }
return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
}
@@ -1838,6 +1851,46 @@ lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine)
template<typename Item>
bool
+lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert)
+{
+ bool bDone = false;
+ table::BorderLine2 aBorderLine;
+ if (lcl_extractBorderLine(rAny, aBorderLine))
+ {
+ SvxBorderLine aLine;
+ bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
+ rItem.SetLine( bSet ? &aLine : NULL, nLine);
+ bDone = true;
+ }
+ return bDone;
+}
+
+}
+
+{
+
+bool
+lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine)
+{
+ if (rAny >>= rLine)
+ return true;
+
+ table::BorderLine aBorderLine;
+ if (rAny >>= aBorderLine)
+ {
+ rLine.Color = aBorderLine.Color;
+ rLine.InnerLineWidth = aBorderLine.InnerLineWidth;
+ rLine.OuterLineWidth = aBorderLine.OuterLineWidth;
+ rLine.LineDistance = aBorderLine.LineDistance;
+ rLine.LineStyle = table::BorderLineStyle::SOLID;
+ return true;
+ }
+
+ return false;
+}
+
+template<typename Item>
+bool
lcl_setLine(const uno::Any& rAny, Item& rItem, sal_uInt16 nLine, const bool bConvert)
{
bool bDone = false;