Tag: cws_src680_qiq
User: fs      
Date: 2006/06/27 05:11:48

Modified:
   dba/dbaccess/source/ui/app/AppControllerDnD.cxx

Log:
 RESYNC: (1.14-1.15); FILE MERGED

File Changes:

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

File [changed]: AppControllerDnD.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.14.76.6&r2=1.14.76.7
Delta lines:  +16 -9
--------------------
--- AppControllerDnD.cxx        18 May 2006 09:16:11 -0000      1.14.76.6
+++ AppControllerDnD.cxx        27 Jun 2006 12:11:45 -0000      1.14.76.7
@@ -326,7 +326,6 @@
        Reference< XHierarchicalNameContainer > xHierarchyName( _rxNames, 
UNO_QUERY );
        if ( _rxNames.is() )
        {
-               bool bConfirm = true;
                ByteString sDialogPosition;
                svtools::QueryDeleteResult_Impl eResult = _bConfirm ? 
svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL;
 
@@ -383,8 +382,7 @@
                     // now that we removed the element, care for all it's 
child elements
                     // which may also be a part of the list
                     // #i33353# - 2004-09-27 - [EMAIL PROTECTED]
-                    sal_Int32 nLastCharPos = aThisRound->getLength() - 1;
-                    OSL_ENSURE( nLastCharPos >= 0, 
"OApplicationController::deleteObjects: empty name?" );
+                    OSL_ENSURE( aThisRound->getLength() - 1 >= 0, 
"OApplicationController::deleteObjects: empty name?" );
                                        ::rtl::OUStringBuffer 
sSmallestSiblingName( *aThisRound );
                     sSmallestSiblingName.append( (sal_Unicode)( '/' + 1) );
 
@@ -455,6 +453,8 @@
                case E_REPORT:
                        deleteObjects( E_REPORT, aList, true );
                        break;
+        case E_NONE:
+            break;
                }
        }
 }
@@ -552,6 +552,8 @@
                                        }
                                }
                                break;
+            default:
+                break;
                }
        }
        catch(const Exception&)
@@ -634,7 +636,8 @@
                                xNameAccess = xSupp->getTables();
                        break;
                }
-
+        case E_NONE:
+            break;
        }
 
     SharedConnection xConnection;
@@ -696,6 +699,8 @@
                                }
                        }
                                break;
+            default:
+                break;
                }
 
                // the owner ship goes to ODataClipboards
@@ -891,6 +896,8 @@
                case E_QUERY:
                        _rFormatIds.push_back(SOT_FORMATSTR_ID_DBACCESS_QUERY);
                        break;
+        default:
+            break;
        }
 }
 // 
-----------------------------------------------------------------------------
@@ -911,7 +918,7 @@
     return m_aTableCopyHelper.copyTagTable( _rDesc, _bCheck, xConnection );
 }
 // 
-----------------------------------------------------------------------------
-IMPL_LINK( OApplicationController, OnAsyncDrop, void*, NOTINTERESTEDIN )
+IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
 {
        m_nAsyncDrop = 0;
        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );




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

Reply via email to