Tag: cws_src680_oj14
User: oj      
Date: 2006/07/04 00:55:49

Modified:
   dba/dbaccess/source/ui/dlg/adminpages.cxx

Log:
 RESYNC: (1.41-1.43); FILE MERGED

File Changes:

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

File [changed]: adminpages.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.cxx?r1=1.41.4.3&r2=1.41.4.4
Delta lines:  +11 -11
---------------------
--- adminpages.cxx      25 Apr 2006 13:02:53 -0000      1.41.4.3
+++ adminpages.cxx      4 Jul 2006 07:55:46 -0000       1.41.4.4
@@ -126,10 +126,10 @@
 //-------------------------------------------------------------------------
        OGenericAdministrationPage::OGenericAdministrationPage(Window* 
_pParent, const ResId& _rId, const SfxItemSet& _rAttrSet)
                :SfxTabPage(_pParent, _rId, _rAttrSet)
+               ,m_abEnableRoadmap(sal_False)
                ,m_pAdminDialog(NULL)
                ,m_pItemSetHelper(NULL)
                ,m_pFT_HeaderText(NULL)
-               ,m_abEnableRoadmap(sal_False)
        {
         DBG_CTOR(OGenericAdministrationPage,NULL);
 
@@ -183,13 +183,13 @@
        }
 
        // 
-----------------------------------------------------------------------
-       void OGenericAdministrationPage::fillViewSettings(OPageSettings* 
_rSettings)
+       void OGenericAdministrationPage::fillViewSettings(OPageSettings* 
/*_rSettings*/)
        {
                // nothing to do
        }
 
        // 
-----------------------------------------------------------------------
-       void OGenericAdministrationPage::restoreViewSettings(const 
OPageSettings* _pPageState)
+       void OGenericAdministrationPage::restoreViewSettings(const 
OPageSettings* /*_pPageState*/)
        {
                // nothing to do
        }
@@ -219,7 +219,7 @@
                if (!aEnumeration.isLoaded())
                {
                        // show an error message
-            OLocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE );
+            LocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE );
                        String sError(ResId(STR_COULDNOTLOAD_ODBCLIB));
                        sError.SearchAndReplaceAscii("#lib#", 
aEnumeration.getLibraryName());
                        ErrorBox aDialog(this, WB_OK, sError);
@@ -262,7 +262,7 @@
                aControlList.clear();
        }
        // 
-----------------------------------------------------------------------
-       void OGenericAdministrationPage::enableHeader( const Bitmap& _rBitmap, 
sal_Int32 _nPixelHeight, GrantAccess )
+       void OGenericAdministrationPage::enableHeader( const Bitmap& 
/*_rBitmap*/, sal_Int32 /*_nPixelHeight*/, GrantAccess )
        {
        }
        // 
-----------------------------------------------------------------------
@@ -273,7 +273,7 @@
                        Reset(*m_pItemSetHelper->getOutputSet());
        }
        // 
-----------------------------------------------------------------------
-       sal_Bool OGenericAdministrationPage::commitPage(COMMIT_REASON _eReason)
+       sal_Bool OGenericAdministrationPage::commitPage(COMMIT_REASON 
/*_eReason*/)
        {
                return sal_True;
        }
@@ -313,7 +313,7 @@
     }
 
     // -----------------------------------------------------------------------
-       IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, 
PushButton*, _pButton)
+       IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, 
PushButton*, /*_pButton*/)
        {        
                OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
                sal_Bool bSuccess = sal_False;
@@ -369,7 +369,7 @@
     }
 
 
-    Point OGenericAdministrationPage::MovePoint(Point _aPixelBasePoint, 
sal_uInt32 _XShift, sal_uInt32 _YShift)
+    Point OGenericAdministrationPage::MovePoint(Point _aPixelBasePoint, 
sal_Int32 _XShift, sal_Int32 _YShift)
     {
         Point rLogicPoint = PixelToLogic( _aPixelBasePoint, MAP_APPFONT );
         sal_uInt32 XPos = rLogicPoint.X() + _XShift;




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

Reply via email to