[ooo-build-commit] Branch 'ooo/master' - extensions/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Jun 4 17:14:49 PDT 2009


 extensions/source/plugin/base/nfuncs.cxx        |    2 +-
 extensions/source/plugin/unx/npnapi.cxx         |   21 +++++++++++++--------
 extensions/source/propctrlr/standardcontrol.cxx |    2 +-
 extensions/source/propctrlr/taborder.cxx        |   14 +++++++-------
 4 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit dd6dbb94f39747d5d8587fdb2836e978818b58a5
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jun 4 15:47:31 2009 +0000

    CWS-TOOLING: integrate CWS cmcfixes59
    2009-05-18 10:10:11 +0200 cmc  r272001 : #i102012# remove extensions warnings, and set as warnings-free
    2009-05-16 17:29:59 +0200 cmc  r271981 : #i101990# silence warning, logic is unchanged
    2009-05-16 17:13:59 +0200 cmc  r271980 : #i100412 remove warning, logic is unchanged
    2009-05-16 17:08:57 +0200 cmc  r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent
    2009-05-16 17:01:08 +0200 cmc  r271978 : #i86576# remove uncallable code
    2009-05-16 15:41:46 +0200 cmc  r271977 : #i101988# fix up consts for warning-free

diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 0640c55..a8c194b 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -122,7 +122,7 @@ static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString&
         int nPos;
         if( ( nPos = aLoadURL.indexOf( "://" ) ) != -1 )
         {
-            if( url.getLength() && url.getStr()[ 0 ] == '/' || url.indexOf( '/' ) != -1 )
+            if( url.getLength() && (url.getStr()[ 0 ] == '/' || url.indexOf( '/' ) != -1) )
             {
                 // this means same server but new path
                 nPos = aLoadURL.indexOf( '/', nPos+3 );
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 34ba2f5..4ba43dd 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -365,7 +365,12 @@ static void l_NPN_ReloadPlugins( NPBool /*reloadPages*/ )
 
 static NPError l_NPN_GetValue( NPP, NPNVariable variable, void* value )
 {
-    switch( variable )
+    /*
+     * We want to handle values injected into a NPNVariable which aren't in
+     * the old enum we build against, but that we know are in the new enum
+     * we want to support
+         */
+    switch( (int)variable )
     {
         case NPNVxDisplay:
             *((Display**)value) = pXtAppDisplay;
@@ -396,14 +401,14 @@ static NPError l_NPN_GetValue( NPP, NPNVariable variable, void* value )
             medDebug( 1, "xembed requested\n" );
             break;
         case NPNVToolkit:
-            #ifdef ENABLE_GTK
+#           ifdef ENABLE_GTK
             *(int*)value = NPNVGtk2;
-            #else
+#           else
             *(int*)value = 0;
-            #endif
+#           endif
             medDebug( 1, "toolkit requested\n" );
             break;
-         default:
+        default:
             medDebug( 1, "unknown NPNVariable %x requested\n", variable );
             return NPERR_INVALID_PARAM;
     }
@@ -449,13 +454,13 @@ static NPNetscapeFuncs aNetscapeFuncs =
     l_NPN_MemFree,
     l_NPN_MemFlush,
     l_NPN_ReloadPlugins,
-    #ifdef OJI
+#   ifdef OJI
     l_NPN_GetJavaEnv,
     l_NPN_GetJavaPeer,
-    #else
+#   else
     NULL,
     NULL,
-    #endif
+#   endif
     l_NPN_GetURLNotify,
     l_NPN_PostURLNotify,
     l_NPN_GetValue,
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index c6c673b..8837854 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1055,7 +1055,7 @@ namespace pcr
     {
         SetCompoundControl( TRUE );
 
-        m_pImplEdit = new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | _nStyle & WB_READONLY );
+        m_pImplEdit = new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) );
         SetSubEdit( m_pImplEdit );
         m_pImplEdit->Show();
 
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 3f36535..5b83a83 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -288,13 +288,13 @@ namespace pcr
     //------------------------------------------------------------------------
     IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ )
     {
-        sal_uInt32 nEntryCount = aLB_Controls.GetEntryCount();
+        ULONG nEntryCount = aLB_Controls.GetEntryCount();
         Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount );
         Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels());
         Reference< XControlModel > * pSortedControlModels = aSortedControlModelSeq.getArray();
         const Reference< XControlModel > * pControlModels = aControlModels.getConstArray();
 
-        for (sal_uInt32 i=0; i < nEntryCount; i++)
+        for (ULONG i=0; i < nEntryCount; i++)
         {
             SvLBoxEntry* pEntry = aLB_Controls.GetEntry(i);
 
@@ -362,13 +362,13 @@ namespace pcr
             {
                 SvLBoxEntry* pFirstSelected = FirstSelected();
                 if( !pFirstSelected ) return;
-                sal_uInt32 nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
+                ULONG nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
                 if( nFirstSelPos == 0 ) return;
 
                 SvLBoxEntry* pSelEntry = pFirstSelected;
                 while( pSelEntry )
                 {
-                    sal_uInt32 nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+                    ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
                     SvLBoxEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 );
                     aSelEntryPrevText = GetEntryText( pSelEntryPrev );
                     aImage = GetExpandedEntryBmp(pSelEntryPrev);
@@ -385,12 +385,12 @@ namespace pcr
             {
                 SvLBoxEntry* pLastSelected = LastSelected();
                 if( !pLastSelected ) return;
-                sal_uInt32 nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
+                ULONG nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
 
                 if( (nLastSelPos + nRelPos - i) > (GetEntryCount()-1) ) return;
 
 #if OSL_DEBUG_LEVEL > 0
-                sal_uInt32 nSelCount = GetSelectionCount();
+                ULONG nSelCount = GetSelectionCount();
                 (void)nSelCount;
 #endif
 
@@ -398,7 +398,7 @@ namespace pcr
                 SvLBoxEntry* pSelEntry = pLastSelected;
                 while( pSelEntry )
                 {
-                    sal_uInt32 nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+                    ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
                     SvLBoxEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 );
                     void* pData = pSelEntryNext->GetUserData();
 


More information about the ooo-build-commit mailing list