summaryrefslogtreecommitdiff
path: root/editeng/inc/editeng/boxitem.hxx
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/inc/editeng/boxitem.hxx
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/inc/editeng/boxitem.hxx')
-rw-r--r--editeng/inc/editeng/boxitem.hxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 4fc84213d5..7fa52f2839 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -109,6 +109,7 @@ public:
static com::sun::star::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, sal_Bool bConvert );
static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
+ static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
};
inline void SvxBoxItem::SetDistance( sal_uInt16 nNew )