[Libreoffice-commits] core.git: reportdesign/source

[Miklos Vajna]

 reportdesign/source/ui/dlg/AddField.cxx      |    2 +-
 reportdesign/source/ui/dlg/GroupsSorting.cxx |    1 -
 reportdesign/source/ui/dlg/Navigator.cxx     |    1 -
 reportdesign/source/ui/inc/CondFormat.hxx    |    1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 28177b61a843cab1094d04d189bb5fedcc6ea55a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jun 30 20:35:47 2014 +0200

    error: direct base 'boost::noncopyable' inaccessible due to ambiguity
    
    Change-Id: I3d2d530ebdb3341956e9b7a3c1f22b621a52deff

diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 1b447be..5bea9c5 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -60,7 +60,7 @@ using namespace lang;
 using namespace container;
 using namespace ::svx;
 
-class OAddFieldWindowListBox: public SvTreeListBox, private boost::noncopyable
+class OAddFieldWindowListBox: public SvTreeListBox
 {
     OAddFieldWindow*                    m_pTabWin;
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6a0a18c..9557309 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -82,7 +82,6 @@ typedef ::svt::EditBrowseBox OFieldExpressionControl_Base;
 typedef ::cppu::WeakImplHelper1< container::XContainerListener > TContainerListenerBase;
 class OFieldExpressionControl : public TContainerListenerBase
                                ,public OFieldExpressionControl_Base
-                               ,private boost::noncopyable
 {
     ::osl::Mutex                    m_aMutex;
     ::std::vector<sal_Int32>        m_aGroupPositions;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 8d912fc..f89a445 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -111,7 +111,6 @@ class NavigatorTree :   public ::cppu::BaseMutex
                     ,   public reportdesign::ITraverseReport
                     ,   public comphelper::OSelectionChangeListener
                     ,   public ::comphelper::OPropertyChangeListener
-                    ,   private boost::noncopyable
 {
     class UserData;
     friend class UserData;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 2a177e5..86b3d3c 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -68,7 +68,6 @@ namespace rptui
     \************************************************************************/
     class ConditionalFormattingDialog  :public ModalDialog
                                         ,public IConditionalFormatAction
-                                        ,private ::boost::noncopyable
     {
         typedef ::boost::shared_ptr< Condition >    ConditionPtr;
         typedef ::std::vector< ConditionPtr >       Conditions;