summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 16:07:53 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 16:07:53 -0500
commitaf00ca537358a6b6c8a7f5f17e8819494f6ee36c (patch)
tree80aa887584bd8aa484150892160e94694ed6aa55
parentacc12e35cd8dd6b53ae604d949ad2dcd517d6d4b (diff)
fix mis-merge in desktop
-rwxr-xr-xdesktop/inc/app.hxx2
-rwxr-xr-xdesktop/source/app/app.cxx18
-rwxr-xr-xdesktop/source/app/dispatchwatcher.cxx2
-rwxr-xr-xdesktop/source/deployment/gui/dp_gui.hrc2
-rwxr-xr-xdesktop/source/deployment/registry/component/dp_component.cxx3
5 files changed, 13 insertions, 14 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index e50fe66948..7f9a7efde4 100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -63,7 +63,7 @@ class Desktop : public Application
{
friend class UserInstall;
- void doShutdown();
+ int doShutdown();
public:
enum BootstrapError
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e9859cbe53..38a313980f 100755
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -653,8 +653,8 @@ throw()
// copied from the bundled folder!
//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)))
+ if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName )
+ || (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,14 +1917,14 @@ 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();
@@ -1960,7 +1960,7 @@ void Desktop::doShutdown()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> deinit ucb" );
::ucbhelper::ContentBroker::deinitialize();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- deinit ucb" );
-
+
sal_Bool bRR = pExecGlobals->bRestartRequested;
delete pExecGlobals, pExecGlobals = NULL;
@@ -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();
}
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 04a8645d7b..5f6446ecde 100755
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/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 )
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index c1a40828bb..aa856c4ab6 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/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
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index d5633f0995..fd0ee18296 100755
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/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