summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/appopen.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:41:56 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:41:56 +0000
commitedbc511fdbda78c8b863d30127a1619f8df47840 (patch)
treebed646b67b166626a878edf28b86f0b7198ce2ec /sfx2/source/appl/appopen.cxx
parentf436f70b3f76ed57dc8c4c8f37bf0074b572c029 (diff)
INTEGRATION: CWS hr51 (1.119.26); FILE MERGED
2008/06/06 16:27:24 hr 1.119.26.2: RESYNC: (1.119-1.120); FILE MERGED 2008/06/06 15:09:51 hr 1.119.26.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'sfx2/source/appl/appopen.cxx')
-rw-r--r--sfx2/source/appl/appopen.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index fe310e2c6d..80cfc46b58 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: appopen.cxx,v $
- * $Revision: 1.120 $
+ * $Revision: 1.121 $
*
* This file is part of OpenOffice.org.
*
@@ -239,7 +239,7 @@ void SetTemplate_Impl( const String &rFileName,
//--------------------------------------------------------------------
-ULONG CheckPasswd_Impl
+sal_uInt32 CheckPasswd_Impl
(
//Window *pWin, // Parent des Dialogs
SfxObjectShell* pDoc,