Tag: cws_dev300_dba30d
User: fs      
Date: 2008-06-10 14:08:36+0000
Modified:
   dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx

Log:
 #i10000#

File Changes:

Directory: /dba/dbaccess/source/ui/app/
=======================================

File [changed]: AppDetailPageHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.32.10.6&r2=1.32.10.7
Delta lines:  +22 -22
---------------------
--- AppDetailPageHelper.cxx     2008-06-10 11:11:19+0000        1.32.10.6
+++ AppDetailPageHelper.cxx     2008-06-10 14:08:33+0000        1.32.10.7
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AppDetailPageHelper.cxx,v $
- * $Revision: 1.32.10.6 $
+ * $Revision: 1.32.10.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -182,11 +182,11 @@
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star;
 
-namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
-namespace DatabaseObjectContainer = 
::com::sun::star::sdb::application::DatabaseObjectContainer;
-
 namespace
 {
+    namespace DatabaseObject = 
::com::sun::star::sdb::application::DatabaseObject;
+    namespace DatabaseObjectContainer = 
::com::sun::star::sdb::application::DatabaseObjectContainer;
+
        SvLBoxEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const 
::rtl::OUString& _rName,SvLBoxEntry* _pFirst)
        {
                SvLBoxEntry* pReturn = NULL;
@@ -326,7 +326,7 @@
        m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview );
 
        SetUniqueId(UID_APP_DETAILPAGE_HELPER);
-       for (int i=0; i < ELEMENT_COUNT; ++i)
+       for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
                m_pLists[i] = NULL;
        ImplInitSettings();
 }
@@ -344,7 +344,7 @@
                OSL_ENSURE(0,"Exception thrown while disposing preview frame!");
        }
 
-       for (int i=0; i < ELEMENT_COUNT; ++i)
+       for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
        {
                if ( m_pLists[i] )
                {
@@ -363,7 +363,7 @@
 int OAppDetailPageHelper::getVisibleControlIndex() const
 {
        int i = 0;
-       for (; i < ELEMENT_COUNT ; ++i)
+       for (; i < E_ELEMENT_TYPE_COUNT ; ++i)
        {
                if ( m_pLists[i] && m_pLists[i]->IsVisible() )
                        break;
@@ -374,7 +374,7 @@
 void OAppDetailPageHelper::selectAll()
 {
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                m_pLists[nPos]->lockAutoSelect();
                m_pLists[nPos]->SelectAll(TRUE);
@@ -396,7 +396,7 @@
 {
        SvSortMode eSortMode = SortNone;
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                SvLBoxTreeList* pModel = m_pLists[nPos]->GetModel();
                eSortMode = pModel->GetSortMode();
@@ -407,21 +407,21 @@
 void OAppDetailPageHelper::sortDown()
 {
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
                sort(nPos,SortDescending);
 }
 // 
-----------------------------------------------------------------------------
 void OAppDetailPageHelper::sortUp()
 {
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
                sort(nPos,SortAscending);
 }
 // 
-----------------------------------------------------------------------------
 void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< 
::rtl::OUString>& _rNames ) const
 {
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                DBTreeListBox& rTree = *m_pLists[nPos];
                sal_Int32 nCount = rTree.GetEntryCount();
@@ -455,7 +455,7 @@
 void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& 
_rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
 {
     enum ElementType eType = E_TABLE;
-       for ( size_t i=0; i < ELEMENT_COUNT; eType = static_cast< ElementType 
>( ++i ) )
+       for ( size_t i=0; i < E_ELEMENT_TYPE_COUNT; eType = static_cast< 
ElementType >( ++i ) )
        {
         if ( m_pLists[eType] == &_rControl )
         {
@@ -539,7 +539,7 @@
 void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& 
_aNames)
 {
     int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                DBTreeListBox& rTree = *m_pLists[nPos];
         rTree.SelectAll(FALSE);
@@ -559,7 +559,7 @@
        int nPos = getVisibleControlIndex();
        ::rtl::OUString sComposedName;
 
-       if ( nPos >= ELEMENT_COUNT )
+       if ( nPos >= E_ELEMENT_TYPE_COUNT )
         return sComposedName;
 
     OSL_ENSURE(m_pLists[nPos],"Tables tree view is NULL! -> GPF");
@@ -601,7 +601,7 @@
 {
        sal_Int32 nCount = 0;
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                DBTreeListBox& rTree = *m_pLists[nPos];
                SvLBoxEntry* pEntry = rTree.FirstSelected();
@@ -618,7 +618,7 @@
 {
        sal_Int32 nCount = 0;
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                nCount = m_pLists[nPos]->GetEntryCount();
        }
@@ -673,7 +673,7 @@
 {
        int nPos = getVisibleControlIndex();
        sal_Bool bLeafSelected = sal_False;
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
        {
                DBTreeListBox& rTree = *m_pLists[nPos];
                SvLBoxEntry* pEntry = rTree.FirstSelected( );
@@ -690,7 +690,7 @@
 {
        SvLBoxEntry* pReturn = NULL;
        int nPos = getVisibleControlIndex();
-       if ( nPos < ELEMENT_COUNT )
+       if ( nPos < E_ELEMENT_TYPE_COUNT )
                pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,TRUE );
        return pReturn;
 }
@@ -918,7 +918,7 @@
 void OAppDetailPageHelper::clearPages()
 {
        showPreview(NULL);
-       for (size_t i=0; i < ELEMENT_COUNT; ++i)
+       for (size_t i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
        {
                if ( m_pLists[i] )
                        m_pLists[i]->Clear();
@@ -928,9 +928,9 @@
 sal_Bool OAppDetailPageHelper::isFilled() const
 {
        size_t i = 0;
-       for (; i < ELEMENT_COUNT && !m_pLists[i]; ++i)
+       for (; i < E_ELEMENT_TYPE_COUNT && !m_pLists[i]; ++i)
                ;
-       return i != ELEMENT_COUNT;
+       return i != E_ELEMENT_TYPE_COUNT;
 }
 // 
-----------------------------------------------------------------------------
 void OAppDetailPageHelper::elementReplaced(ElementType _eType




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

Reply via email to