sw/source/core/inc/tblrwcl.hxx | 4 ++--
sw/source/ui/dbui/mmaddressblockpage.hxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5cb50258947b14e21d74fec507faf231f3bcc180
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Apr 25 16:27:57 2012 +0300
WaE: hides overloaded virtual function, different approach, thanks to mst_
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index beacab6..11f89c2 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -168,7 +168,7 @@ class AddressMultiLineEdit : public MultiLineEdit, public
SfxListener
Link m_aSelectionLink;
SwCustomizeAddressBlockDialog* m_pParentDialog;
- using Window::Notify;
+ using MultiLineEdit::Notify;
using MultiLineEdit::SetText;
commit bfc64dc4dab7d9dc5210465851990d2e07b78b6c
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Apr 25 15:39:10 2012 +0300
WaE: defined as a struct here but previously declared as a class
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 34b18d2..4a279d8 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -47,8 +47,8 @@ class SwCntntNode;
class SfxPoolItem;
class SwShareBoxFmts;
class SwFmtFrmSize;
-class _CpyPara;
-class _InsULPara;
+struct _CpyPara;
+struct _InsULPara;
sal_Bool lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara );
sal_Bool lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
