diff options
| author | Stephan Bergmann <sb@openoffice.org> | 2000-11-10 09:57:09 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sb@openoffice.org> | 2000-11-10 09:57:09 +0000 |
| commit | 95f9d481441487e001d9cf74e49782cf24e90289 (patch) | |
| tree | 0aa3de50c1bbd08ad0b2bd66c6d23a24f95339f5 /uui | |
| parent | 8ce2d3e144e4f4eb5add32ff0400e068456b1a9f (diff) | |
Renamed DLG_LOGIN DLG_UUI_LOGIN because of collision with svtools/solar.hrc.
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/ids.hrc | 8 | ||||
| -rw-r--r-- | uui/source/logindlg.cxx | 6 | ||||
| -rw-r--r-- | uui/source/logindlg.src | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 51eac28eec71..b989391e56c2 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -2,9 +2,9 @@ * * $RCSfile: ids.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:04:10 $ + * last change: $Author: sb $ $Date: 2000-11-10 10:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ // // The UUI Resources // -// $Author: hr $ $Date: 2000-09-18 17:04:10 $ $Revision: 1.1.1.1 $ +// $Author: sb $ $Date: 2000-11-10 10:57:09 $ $Revision: 1.2 $ //============================================================================ #ifndef UUI_IDS_HRC @@ -75,7 +75,7 @@ //============================================================================ #define RID_KEEP_PASSWORD (RID_UUI_START + 0) #define RID_SAVE_PASSWORD (RID_UUI_START + 1) -#define DLG_LOGIN (RID_UUI_START + 2) +#define DLG_UUI_LOGIN (RID_UUI_START + 2) #define DLG_COOKIES (RID_UUI_START + 3) #define STR_COOKIES_RECV_START (RID_UUI_START + 4) #define STR_COOKIES_RECV_COOKIES (RID_UUI_START + 5) diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 994c94d9bb4a..61e1c2c1fa9b 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: logindlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sb $ $Date: 2000-10-04 13:16:57 $ + * last change: $Author: sb $ $Date: 2000-11-10 10:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -269,7 +269,7 @@ LoginDialog::LoginDialog ResMgr* pResMgr ) : - ModalDialog( pParent, ResId( DLG_LOGIN, pResMgr ) ), + ModalDialog( pParent, ResId( DLG_UUI_LOGIN, pResMgr ) ), aErrorInfo ( this, ResId( INFO_LOGIN_ERROR ) ), aErrorGB ( this, ResId( GB_LOGIN_ERROR ) ), diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index 7be92e21f908..94dc71a833a1 100644 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src @@ -2,9 +2,9 @@ * * $RCSfile: logindlg.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2000-11-09 12:04:07 $ + * last change: $Author: sb $ $Date: 2000-11-10 10:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #include <logindlg.hrc> #endif -ModalDialog DLG_LOGIN +ModalDialog DLG_UUI_LOGIN { HelpId = HID_DLG_LOGIN ; Border = TRUE ; |