Tag: cws_src680_oj14
User: fs      
Date: 2007-06-26 11:56:04+0000
Modified:
   dba/reportdesign/inc/RptModel.hxx
   dba/reportdesign/source/core/api/Functions.cxx
   dba/reportdesign/source/core/api/Groups.cxx
   dba/reportdesign/source/core/sdr/RptModel.cxx
   dba/reportdesign/source/core/sdr/RptObject.cxx
   dba/reportdesign/source/ui/dlg/AddField.cxx
   dba/reportdesign/source/ui/dlg/Navigator.cxx
   dba/reportdesign/source/ui/inc/ViewsWindow.hxx
   dba/reportdesign/source/ui/inc/propbrw.hxx
   dba/reportdesign/source/ui/inspection/DefaultInspection.cxx
   dba/reportdesign/source/ui/inspection/GeometryHandler.cxx
   dba/reportdesign/source/ui/report/DesignView.cxx
   dba/reportdesign/source/ui/report/ReportController.cxx
   dba/reportdesign/source/ui/report/ReportWindow.cxx
   dba/reportdesign/source/ui/report/SectionsWindow.cxx
   dba/reportdesign/source/ui/report/ViewsWindow.cxx
   dba/reportdesign/source/ui/report/propbrw.cxx

Log:
 #i10000# (warning-freeness on unxsol*)

File Changes:

Directory: /dba/reportdesign/inc/
=================================

File [changed]: RptModel.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptModel.hxx?r1=1.1.2.2&r2=1.1.2.3
Delta lines:  +2 -3
-------------------
--- RptModel.hxx        2007-06-20 14:23:45+0000        1.1.2.2
+++ RptModel.hxx        2007-06-26 11:55:59+0000        1.1.2.3
@@ -6,9 +6,9 @@
  *
  *  $RCSfile: RptModel.hxx,v $
  *
- *  $Revision: 1.1.2.2 $
+ *  $Revision: 1.1.2.3 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:23:45 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:55:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,7 +66,6 @@
 
        OReportModel( const OReportModel& );
        void operator=(const OReportModel& rSrcModel);
-       FASTBOOL operator==(const OReportModel& rCmpModel) const;
 public:
        TYPEINFO();
 

Directory: /dba/reportdesign/source/core/api/
=============================================

File [changed]: Functions.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/Functions.cxx?r1=1.1.2.1&r2=1.1.2.2
Delta lines:  +3 -3
-------------------
--- Functions.cxx       2007-05-09 13:49:21+0000        1.1.2.1
+++ Functions.cxx       2007-06-26 11:55:59+0000        1.1.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Functions.cxx,v $
  *
- *  $Revision: 1.1.2.1 $
+ *  $Revision: 1.1.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/05/09 13:49:21 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:55:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -92,7 +92,7 @@
 // 
-----------------------------------------------------------------------------
 void SAL_CALL OFunctions::disposing()
 {
-    
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::lang::XComponent::dispose));
+    
::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose));
     m_aFunctions.clear();
     lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this 
) );
     m_aContainerListeners.disposeAndClear( aDisposeEvent );

File [changed]: Groups.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/Groups.cxx?r1=1.1.2.1&r2=1.1.2.2
Delta lines:  +3 -3
-------------------
--- Groups.cxx  2007-05-09 13:49:44+0000        1.1.2.1
+++ Groups.cxx  2007-06-26 11:55:59+0000        1.1.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Groups.cxx,v $
  *
- *  $Revision: 1.1.2.1 $
+ *  $Revision: 1.1.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/05/09 13:49:44 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:55:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -89,7 +89,7 @@
 // 
-----------------------------------------------------------------------------
 void SAL_CALL OGroups::disposing()
 {
-    
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::lang::XComponent::dispose));
+    
::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose));
     m_aGroups.clear();
     lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this 
) );
     m_aContainerListeners.disposeAndClear( aDisposeEvent );

Directory: /dba/reportdesign/source/core/sdr/
=============================================

File [changed]: RptModel.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptModel.cxx?r1=1.1.2.2&r2=1.1.2.3
Delta lines:  +3 -3
-------------------
--- RptModel.cxx        2007-06-20 14:27:31+0000        1.1.2.2
+++ RptModel.cxx        2007-06-26 11:55:59+0000        1.1.2.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: RptModel.cxx,v $
  *
- *  $Revision: 1.1.2.2 $
+ *  $Revision: 1.1.2.3 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:27:31 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:55:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,7 +66,7 @@
 {
 
 using namespace com::sun::star;
-DBG_NAME( rpt_OReportModel );
+DBG_NAME( rpt_OReportModel )
 TYPEINIT1(OReportModel,SdrModel);
 
 //----------------------------------------------------------------------------

File [changed]: RptObject.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.1.2.5&r2=1.1.2.6
Delta lines:  +5 -5
-------------------
--- RptObject.cxx       2007-05-29 16:28:22+0000        1.1.2.5
+++ RptObject.cxx       2007-06-26 11:56:00+0000        1.1.2.6
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: RptObject.cxx,v $
  *
- *  $Revision: 1.1.2.5 $
+ *  $Revision: 1.1.2.6 $
  *
- *  last change: $Author: oj $ $Date: 2007/05/29 16:28:22 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -236,7 +236,7 @@
                                }
                                return s_aNameMap;
                        }
-            break;
+
                case OBJ_DLG_FIXEDTEXT:
         case OBJ_DLG_FORMATTEDFIELD:
                        {
@@ -256,7 +256,7 @@
                                }
                                return s_aNameMap;
                        }
-                       break;
+
         case OBJ_CUSTOMSHAPE:
             {
                                static TPropertyNamePair s_aNameMap;
@@ -267,7 +267,7 @@
                 }
                                return s_aNameMap;
                        }
-            break;
+
         default:
             break;
        }

Directory: /dba/reportdesign/source/ui/dlg/
===========================================

File [changed]: AddField.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/AddField.cxx?r1=1.1.2.6&r2=1.1.2.7
Delta lines:  +4 -2
-------------------
--- AddField.cxx        2007-06-06 11:25:22+0000        1.1.2.6
+++ AddField.cxx        2007-06-26 11:56:00+0000        1.1.2.7
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AddField.cxx,v $
  *
- *  $Revision: 1.1.2.6 $
+ *  $Revision: 1.1.2.7 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/06 11:25:22 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -129,6 +129,8 @@
 
        // SvLBox
        virtual BOOL DoubleClickHdl();
+private:
+    using SvTreeListBox::ExecuteDrop;
 };
 // 
-----------------------------------------------------------------------------
 uno::Sequence< beans::PropertyValue > 
OAddFieldWindowListBox::getSelectedFieldDescriptor()

File [changed]: Navigator.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/Navigator.cxx?r1=1.1.2.2&r2=1.1.2.3
Delta lines:  +7 -2
-------------------
--- Navigator.cxx       2007-06-05 11:45:02+0000        1.1.2.2
+++ Navigator.cxx       2007-06-26 11:56:00+0000        1.1.2.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Navigator.cxx,v $
  *
- *  $Revision: 1.1.2.2 $
+ *  $Revision: 1.1.2.3 $
  *
- *  last change: $Author: oj $ $Date: 2007/06/05 11:45:02 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -170,6 +170,8 @@
                     ,   public comphelper::OSelectionChangeListener
                     ,  public ::comphelper::OPropertyChangeListener
 {
+    class UserData;
+    friend class UserData;
     class UserData : public ::cppu::BaseMutex
                     ,public ::comphelper::OPropertyChangeListener
                     ,public ::comphelper::OContainerListener
@@ -260,7 +262,10 @@
 
     SvLBoxEntry* find(const uno::Reference< uno::XInterface >& _xContent);
     void removeEntry(SvLBoxEntry* _pEntry,bool _bRemove = true);
+private:
+    using SvTreeListBox::ExecuteDrop;
 };
+
 // 
-----------------------------------------------------------------------------
 NavigatorTree::NavigatorTree( Window* pParent,OReportController* _pController )
         :SvTreeListBox( pParent, 
WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )

Directory: /dba/reportdesign/source/ui/inc/
===========================================

File [changed]: ViewsWindow.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ViewsWindow.hxx?r1=1.1.2.5&r2=1.1.2.6
Delta lines:  +32 -4
--------------------
--- ViewsWindow.hxx     2007-06-05 11:42:39+0000        1.1.2.5
+++ ViewsWindow.hxx     2007-06-26 11:56:00+0000        1.1.2.6
@@ -6,9 +6,9 @@
  *
  *  $RCSfile: ViewsWindow.hxx,v $
  *
- *  $Revision: 1.1.2.5 $
+ *  $Revision: 1.1.2.6 $
  *
- *  last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -86,7 +86,35 @@
        class OEndMarker;
        class OReportSection;
        class OSectionView;
-    struct RectangleLess;
+
+    // 
-----------------------------------------------------------------------------
+    struct RectangleLess : public ::std::binary_function< Rectangle, 
Rectangle, bool>
+    {
+        enum CompareMode { 
POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL 
};
+        CompareMode m_eCompareMode;
+        Point       m_aRefPoint;
+        RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : 
m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){}
+        bool operator() (const Rectangle& lhs, const Rectangle& rhs) const 
+        {
+            switch(m_eCompareMode)
+            {
+            case POS_LEFT:
+                return lhs.Left() < rhs.Left();
+            case POS_RIGHT:
+                return lhs.Right() >= rhs.Right();
+            case POS_UPPER:
+                return lhs.Top() < rhs.Top();
+            case POS_DOWN:
+                return lhs.Bottom() >= rhs.Bottom();
+            case POS_CENTER_HORIZONTAL:
+                return abs(m_aRefPoint.X() - lhs.Center().X()) < 
abs(m_aRefPoint.X() - rhs.Center().X());
+            case POS_CENTER_VERTICAL:
+                return abs(lhs.Center().Y() - m_aRefPoint.Y()) < 
abs(rhs.Center().Y() - m_aRefPoint.Y());
+            }
+            return false;
+        }
+    };
+
        class OViewsWindow :    public Window
                                                ,       public ::cppu::BaseMutex
                                                ,       public 
::comphelper::OPropertyChangeListener

File [changed]: propbrw.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/propbrw.hxx?r1=1.1.2.1&r2=1.1.2.2
Delta lines:  +4 -2
-------------------
--- propbrw.hxx 2007-05-09 14:02:03+0000        1.1.2.1
+++ propbrw.hxx 2007-06-26 11:56:00+0000        1.1.2.2
@@ -6,9 +6,9 @@
  *
  *  $RCSfile: propbrw.hxx,v $
  *
- *  $Revision: 1.1.2.1 $
+ *  $Revision: 1.1.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/05/09 14:02:03 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -138,6 +138,8 @@
        inline OSectionView*    GetCurView() const { return m_pView; }
     ::rtl::OUString         getCurrentPage() const;
     inline void             setCurrentPage(const ::rtl::OUString& 
_sLastActivePage) { m_sLastActivePage = _sLastActivePage; }
+private:
+    using Window::Update;
 };
 
//==============================================================================
 } // rptui

Directory: /dba/reportdesign/source/ui/inspection/
==================================================

File [changed]: DefaultInspection.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/DefaultInspection.cxx?r1=1.1.2.2&r2=1.1.2.3
Delta lines:  +5 -5
-------------------
--- DefaultInspection.cxx       2007-06-06 08:39:14+0000        1.1.2.2
+++ DefaultInspection.cxx       2007-06-26 11:56:00+0000        1.1.2.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DefaultInspection.cxx,v $
  *
- *  $Revision: 1.1.2.2 $
+ *  $Revision: 1.1.2.3 $
  *
- *  last change: $Author: oj $ $Date: 2007/06/06 08:39:14 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -266,7 +266,7 @@
 
         const struct
         {
-            sal_Char*   programmaticName;
+            const sal_Char* programmaticName;
             USHORT      uiNameResId;
             sal_uInt32  helpId;
         } aCategories[] = {

File [changed]: GeometryHandler.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/GeometryHandler.cxx?r1=1.1.2.13&r2=1.1.2.14
Delta lines:  +2 -3
-------------------
--- GeometryHandler.cxx 2007-06-20 14:23:57+0000        1.1.2.13
+++ GeometryHandler.cxx 2007-06-26 11:56:00+0000        1.1.2.14
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: GeometryHandler.cxx,v $
  *
- *  $Revision: 1.1.2.13 $
+ *  $Revision: 1.1.2.14 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:23:57 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -731,7 +731,6 @@
         const beans::Property aProp = getProperty(PropertyName);
         return xConversionHelper->convertToPropertyValue( sControlValue, 
aProp.Type );
     }
-    return uno::Any();
 }
 
 uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const 
::rtl::OUString & PropertyName, const uno::Any & _rControlValue) throw 
(uno::RuntimeException, beans::UnknownPropertyException)

Directory: /dba/reportdesign/source/ui/report/
==============================================

File [changed]: DesignView.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/DesignView.cxx?r1=1.1.2.11&r2=1.1.2.12
Delta lines:  +3 -3
-------------------
--- DesignView.cxx      2007-06-19 08:05:16+0000        1.1.2.11
+++ DesignView.cxx      2007-06-26 11:56:01+0000        1.1.2.12
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DesignView.cxx,v $
  *
- *  $Revision: 1.1.2.11 $
+ *  $Revision: 1.1.2.12 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/19 08:05:16 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -100,7 +100,7 @@
 //==================================================================
 // class ODesignView
 //==================================================================
-DBG_NAME( rpt_ODesignView );
+DBG_NAME( rpt_ODesignView )
 
//------------------------------------------------------------------------------
 ODesignView::ODesignView(   Window* pParent,
                                                        const Reference< 
XMultiServiceFactory >& _rxOrb,

File [changed]: ReportController.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.1.2.28&r2=1.1.2.29
Delta lines:  +2 -4
-------------------
--- ReportController.cxx        2007-06-20 14:23:57+0000        1.1.2.28
+++ ReportController.cxx        2007-06-26 11:56:01+0000        1.1.2.29
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ReportController.cxx,v $
  *
- *  $Revision: 1.1.2.28 $
+ *  $Revision: 1.1.2.29 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:23:57 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1658,7 +1658,6 @@
                                        case RET_CANCEL:
                                                // don't change anything here 
so return
                                                return;
-                                               break;
                                        case RET_NO:
                                                setModified(sal_False);         
// and we are not modified yet
                                                break;
@@ -1670,7 +1669,6 @@
                        //getJoinView()->setReadOnly(!isEditable());
                        InvalidateAll();
                        return;
-                       break;
         case SID_GROUP:
             {
                 ::boost::shared_ptr<OReportSection> pReportSection = 
m_pMyOwnView->getMarkedSection();

File [changed]: ReportWindow.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.1.2.7&r2=1.1.2.8
Delta lines:  +3 -3
-------------------
--- ReportWindow.cxx    2007-06-20 14:23:57+0000        1.1.2.7
+++ ReportWindow.cxx    2007-06-26 11:56:01+0000        1.1.2.8
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ReportWindow.cxx,v $
  *
- *  $Revision: 1.1.2.7 $
+ *  $Revision: 1.1.2.8 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:23:57 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -111,7 +111,7 @@
 //==================================================================
 // class OReportWindow
 //==================================================================
-DBG_NAME( rpt_OReportWindow );
+DBG_NAME( rpt_OReportWindow )
 
//------------------------------------------------------------------------------
 OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* 
_pView) 
 : Window(_pParent,WB_DIALOGCONTROL)

File [changed]: SectionsWindow.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/SectionsWindow.cxx?r1=1.1.2.1&r2=1.1.2.2
Delta lines:  +3 -3
-------------------
--- SectionsWindow.cxx  2007-05-09 13:51:42+0000        1.1.2.1
+++ SectionsWindow.cxx  2007-06-26 11:56:01+0000        1.1.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: SectionsWindow.cxx,v $
  *
- *  $Revision: 1.1.2.1 $
+ *  $Revision: 1.1.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/05/09 13:51:42 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -324,7 +324,7 @@
        ::std::for_each(m_aSections.begin(),m_aSections.end(),
                
::std::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),::std::select1st<TSectionsMap::value_type>()));
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
-        
::std::compose1(::boost::bind(&OStartMarker::Invalidate,_1,USHORT(INVALIDATE_NOERASE)),::std::select1st<TSectionsMap::value_type>()));
+        
::std::compose1(::boost::bind(&OStartMarker::Window::Invalidate,_1,USHORT(INVALIDATE_NOERASE)),::std::select1st<TSectionsMap::value_type>()));
 }
 //----------------------------------------------------------------------------
 sal_Int32 OSectionsWindow::getMinHeight(USHORT _nPos) const

File [changed]: ViewsWindow.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.1.2.10&r2=1.1.2.11
Delta lines:  +3 -36
--------------------
--- ViewsWindow.cxx     2007-06-20 14:23:57+0000        1.1.2.10
+++ ViewsWindow.cxx     2007-06-26 11:56:01+0000        1.1.2.11
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ViewsWindow.cxx,v $
  *
- *  $Revision: 1.1.2.10 $
+ *  $Revision: 1.1.2.11 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/20 14:23:57 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -375,7 +375,7 @@
        ::std::for_each(m_aSections.begin(),m_aSections.end(),
                
::std::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper()));
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
-               
::std::compose1(::boost::bind(&OReportSection::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper()));
+               
::std::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper()));
 }
 
//------------------------------------------------------------------------------
 sal_Int32 OViewsWindow::getTotalHeight(const OReportSection* _pSection) const
@@ -833,39 +833,6 @@
        return pRet;
 }
 // 
-----------------------------------------------------------------------------
-struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, 
bool>
-{
-    enum CompareMode { 
POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL 
};
-    CompareMode m_eCompareMode;
-    Point       m_aRefPoint;
-    RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : 
m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){}
-    bool operator() (const Rectangle& lhs, const Rectangle& rhs) const 
-    {
-        switch(m_eCompareMode)
-        {
-            case POS_LEFT:
-                return lhs.Left() < rhs.Left();
-                break;
-            case POS_RIGHT:
-                return lhs.Right() >= rhs.Right();
-                break;
-            case POS_UPPER:
-                return lhs.Top() < rhs.Top();
-                break;
-            case POS_DOWN:
-                return lhs.Bottom() >= rhs.Bottom();
-                break;
-            case POS_CENTER_HORIZONTAL:
-                return abs(m_aRefPoint.X() - lhs.Center().X()) < 
abs(m_aRefPoint.X() - rhs.Center().X());
-                break;
-            case POS_CENTER_VERTICAL:
-                return abs(lhs.Center().Y() - m_aRefPoint.Y()) < 
abs(rhs.Center().Y() - m_aRefPoint.Y());
-                break;
-        }
-        return false;
-    }
-};
-// 
-----------------------------------------------------------------------------
 void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles,  bool 
_bBoundRects)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();

File [changed]: propbrw.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/propbrw.cxx?r1=1.1.2.3&r2=1.1.2.4
Delta lines:  +3 -3
-------------------
--- propbrw.cxx 2007-06-05 20:19:14+0000        1.1.2.3
+++ propbrw.cxx 2007-06-26 11:56:01+0000        1.1.2.4
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: propbrw.cxx,v $
  *
- *  $Revision: 1.1.2.3 $
+ *  $Revision: 1.1.2.4 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/05 20:19:14 $
+ *  last change: $Author: fs $ $Date: 2007/06/26 11:56:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -183,7 +183,7 @@
 // PropBrw
 //============================================================================
 
-DBG_NAME( rpt_PropBrw );
+DBG_NAME( rpt_PropBrw )
 
 //----------------------------------------------------------------------------
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to