fix mis-merge in desktop

desktop/inc/app.hxx

@@ -63,7 +63,7 @@ class Desktop : public Application
 {
     friend class UserInstall;
 
-    void doShutdown();
+    int doShutdown();
 
     public:
         enum BootstrapError

desktop/source/app/app.cxx

@@ -654,7 +654,7 @@ throw()
                         //Also do not copy *.tmp files and *.tmp_ folders. This affects the files/folders
                         //from the help and configuration backend
                         if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName )
-                                       || bExcludeFiles && isExcludedFileOrFolder(aFileName)))
+                                       || (bExcludeFiles && isExcludedFileOrFolder(aFileName))))
                             bFilter = true;
                         else if (!IsDoc && bExcludeFiles && isExcludedFileOrFolder(aFileName))
                             bFilter = true;
@@ -1539,7 +1539,7 @@ struct ExecuteGlobals
 
 static ExecuteGlobals* pExecGlobals = NULL;
 
-void Desktop::Main()
+int Desktop::Main()
 {
     pExecGlobals = new ExecuteGlobals();
 
@@ -1917,13 +1917,13 @@ void Desktop::Main()
     }
     // CAUTION: you do not necessarily get here e.g. on the Mac.
     // please put all deinitialization code into doShutdown
-    doShutdown();
+    return doShutdown();
 }
 
-void Desktop::doShutdown()
+int Desktop::doShutdown()
 {
     if( ! pExecGlobals )
-        return;
+        return EXIT_SUCCESS;
 
     if ( pExecGlobals->bRestartRequested )
         SetRestartState();
@@ -2071,7 +2071,7 @@ sal_Bool Desktop::shouldLaunchQuickstart()
         const SfxPoolItem* pItem=0;
         SfxItemSet aQLSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER);
         SFX_APP()->GetOptions(aQLSet);
-        SfxItemState eState = aQLSet.GetItemState(SID_ATTR_QUICKLAUNCHER, FALSE, &pItem);
+        SfxItemState eState = aQLSet.GetItemState(SID_ATTR_QUICKLAUNCHER, sal_False, &pItem);
         if (SFX_ITEM_SET == eState)
             bQuickstart = ((SfxBoolItem*)pItem)->GetValue();
     }

desktop/source/app/dispatchwatcher.cxx

@@ -94,7 +94,7 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
 {
     String aFilter;
     SfxMedium* pMedium = new SfxMedium( aUrl,
-                                        STREAM_STD_READ, FALSE );
+                                        STREAM_STD_READ, sal_False );
     const SfxFilter *pSfxFilter = NULL;
     SfxFilterMatcher aMatcher;
     if( nFlags == SFX_FILTER_EXPORT )

desktop/source/deployment/gui/dp_gui.hrc

@@ -105,7 +105,7 @@
 #define RID_DLG_UPDATE_LINE                 8
 #define RID_DLG_UPDATE_HELP                 9
 #define RID_DLG_UPDATE_OK                   10
-#define RID_DLG_UPDATE_CANCEL               11
+#define RID_DLG_UPDATE_CLOSE                11
 #define RID_DLG_UPDATE_NORMALALERT          12
 #define RID_DLG_UPDATE_ERROR                14
 #define RID_DLG_UPDATE_NONE                 15

desktop/source/deployment/registry/component/dp_component.cxx

@@ -1885,7 +1885,7 @@ BackendImpl::OtherPlatformPackageImpl::processPackage_(
     if (xServicesRDB.is())
         xServicesRDB->close();
 
-    getMyBackend()->deleteDataFromDb(aURL);
+    getMyBackend()->revokeEntryFromDb(aURL);
 }
 
 BackendImpl * BackendImpl::ComponentsPackageImpl::getMyBackend() const
@@ -1978,7 +1978,6 @@ BackendImpl::ComponentsPackageImpl::ComponentsPackageImpl(
     : Package( myBackend, url, name, name /* display-name */,
                xPackageType, bRemoved, identifier)
 {}
->>>>>>> ooo/DEV300_m101
 
 } // anon namespace