diff options
Diffstat (limited to 'uui')
78 files changed, 431 insertions, 431 deletions
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx index d3b96d4e2668..b63e89cb7aea 100644 --- a/uui/source/alreadyopen.cxx +++ b/uui/source/alreadyopen.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index b265aee85921..3fd695cc8f3d 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src index 928973947e38..7541396d54d9 100644 --- a/uui/source/alreadyopen.src +++ b/uui/source/alreadyopen.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx index a806ff4e59e8..fea8b9a2745d 100644 --- a/uui/source/cookiedg.cxx +++ b/uui/source/cookiedg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,17 +53,17 @@ CookiesDialog::CookiesDialog( Window* pParent, ModalDialog( pParent, ResId( DLG_COOKIES, *pResMgr ) ), - maCookieFB ( this, ResId( FB_COOKIES, *pResMgr ) ), - maCookieFT ( this, ResId( FT_COOKIES, *pResMgr ) ), - maInFutureLine ( this, ResId( FL_COOKIES, *pResMgr ) ), - maInFutureSendBtn ( this, ResId( RB_INFUTURE_SEND, *pResMgr ) ), - maInFutureIgnoreBtn ( this, ResId( RB_INFUTURE_IGNORE, *pResMgr ) ), + maCookieFB ( this, ResId( FB_COOKIES, *pResMgr ) ), + maCookieFT ( this, ResId( FT_COOKIES, *pResMgr ) ), + maInFutureLine ( this, ResId( FL_COOKIES, *pResMgr ) ), + maInFutureSendBtn ( this, ResId( RB_INFUTURE_SEND, *pResMgr ) ), + maInFutureIgnoreBtn ( this, ResId( RB_INFUTURE_IGNORE, *pResMgr ) ), maInFutureInteractiveBtn( this, ResId( RB_INFUTURE_INTERACTIVE, *pResMgr ) ), - maInFutureGB ( this, ResId( GB_INFUTURE, *pResMgr ) ), - maIgnoreBtn ( this, ResId( BTN_COOKIES_CANCEL, *pResMgr ) ), - maSendBtn ( this, ResId( BTN_COOKIES_OK, *pResMgr ) ), + maInFutureGB ( this, ResId( GB_INFUTURE, *pResMgr ) ), + maIgnoreBtn ( this, ResId( BTN_COOKIES_CANCEL, *pResMgr ) ), + maSendBtn ( this, ResId( BTN_COOKIES_OK, *pResMgr ) ), - mpCookieRequest ( pRequest ) + mpCookieRequest ( pRequest ) { FreeResource(); diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc index 01d93e17de7f..b51309d2e5a0 100644 --- a/uui/source/cookiedg.hrc +++ b/uui/source/cookiedg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ #define UUI_COOKIEDG_HRC //============================================================================ -#define FB_COOKIES 10 -#define FT_COOKIES 11 -#define FL_COOKIES 12 +#define FB_COOKIES 10 +#define FT_COOKIES 11 +#define FL_COOKIES 12 -#define RB_INFUTURE_SEND 20 -#define RB_INFUTURE_IGNORE 21 -#define RB_INFUTURE_INTERACTIVE 22 -#define GB_INFUTURE 23 +#define RB_INFUTURE_SEND 20 +#define RB_INFUTURE_IGNORE 21 +#define RB_INFUTURE_INTERACTIVE 22 +#define GB_INFUTURE 23 -#define BTN_COOKIES_CANCEL 30 -#define BTN_COOKIES_OK 31 +#define BTN_COOKIES_CANCEL 30 +#define BTN_COOKIES_OK 31 #endif // UUI_COOKIEDG_HRC diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx index 42dec3d08611..23956945e70b 100644 --- a/uui/source/cookiedg.hxx +++ b/uui/source/cookiedg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,17 +40,17 @@ struct CntHTTPCookieRequest; //============================================================================ class CookiesDialog : public ModalDialog { - FixedBitmap maCookieFB; - FixedText maCookieFT; - FixedLine maInFutureLine; - RadioButton maInFutureSendBtn; - RadioButton maInFutureIgnoreBtn; - RadioButton maInFutureInteractiveBtn; - GroupBox maInFutureGB; - PushButton maIgnoreBtn; - PushButton maSendBtn; + FixedBitmap maCookieFB; + FixedText maCookieFT; + FixedLine maInFutureLine; + RadioButton maInFutureSendBtn; + RadioButton maInFutureIgnoreBtn; + RadioButton maInFutureInteractiveBtn; + GroupBox maInFutureGB; + PushButton maIgnoreBtn; + PushButton maSendBtn; - CntHTTPCookieRequest* mpCookieRequest; + CntHTTPCookieRequest* mpCookieRequest; DECL_LINK( ButtonHdl_Impl, PushButton * ); diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src index 9df0d481d6ae..0737ff3f5ca3 100644 --- a/uui/source/cookiedg.src +++ b/uui/source/cookiedg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx index 900336d043b0..130f928fdb74 100644 --- a/uui/source/filechanged.cxx +++ b/uui/source/filechanged.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx index 09c542d1f781..2c3735975367 100644 --- a/uui/source/filechanged.hxx +++ b/uui/source/filechanged.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src index fa07c40c0853..b566f6344b73 100644 --- a/uui/source/filechanged.src +++ b/uui/source/filechanged.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 4bda9fb9e579..3c09d66767b3 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "fltdlg.hxx" @@ -40,7 +40,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XStringWidth.hpp> #include <cppuhelper/implbase1.hxx> diff --git a/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc index 8a6b2fddcd16..3fe7f792d2d7 100644 --- a/uui/source/fltdlg.hrc +++ b/uui/source/fltdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,11 +28,11 @@ #ifndef UUI_FLTDLG_HRC #define UUI_FLTDLG_HRC -#define BTN_OK 20 -#define BTN_CANCEL 21 -#define BTN_HELP 22 +#define BTN_OK 20 +#define BTN_CANCEL 21 +#define BTN_HELP 22 -#define FT_URL 30 -#define LB_FILTERS 31 +#define FT_URL 30 +#define LB_FILTERS 31 -#endif /* UUI_FLTDLG_HRC */ +#endif /* UUI_FLTDLG_HRC */ diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index 7284ae001437..f9cec7899a38 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src index 84e27cd1be1f..82b230e38fd5 100644 --- a/uui/source/fltdlg.src +++ b/uui/source/fltdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ ModalDialog DLG_FILTER_SELECT { - HelpId = HID_DLG_FILTER_SELECT ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 250 , 200 ) ; - Moveable = TRUE ; + HelpId = HID_DLG_FILTER_SELECT ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 250 , 200 ) ; + Moveable = TRUE ; Text [ en-US ] = "Filter Selection" ; FixedText FT_URL @@ -53,33 +53,33 @@ ModalDialog DLG_FILTER_SELECT ListBox LB_FILTERS { - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 19 ) ; - Size = MAP_APPFONT ( 182 , 175 ) ; - TabStop = TRUE ; - Sort = FALSE ; + Border = TRUE ; + Pos = MAP_APPFONT ( 6 , 19 ) ; + Size = MAP_APPFONT ( 182 , 175 ) ; + TabStop = TRUE ; + Sort = FALSE ; AutoHScroll = TRUE; }; OKButton BTN_OK { - Pos = MAP_APPFONT ( 194 , 19 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( 194 , 19 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT ( 194 , 36 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 194 , 36 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; HelpButton BTN_HELP { - Pos = MAP_APPFONT ( 194 , 56 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 194 , 56 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; }; diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx index 650bb50bedfb..aefa4851669f 100644 --- a/uui/source/getcontinuations.hxx +++ b/uui/source/getcontinuations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 73fa61f31ff4..d166b8671431 100755..100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -270,7 +270,7 @@ handleAuthenticationRequest_( aInfo.SetCanRememberPassword( ePreferredRememberMode != eAlternateRememberMode); aInfo.SetIsRememberPassword( - eDefaultRememberMode != ucb::RememberAuthentication_NO); + ePreferredRememberMode == eDefaultRememberMode); aInfo.SetIsRememberPersistent( ePreferredRememberMode == ucb::RememberAuthentication_PERSISTENT); @@ -679,7 +679,7 @@ UUIInteractionHelper::handlePasswordRequest( ::rtl::OUString aDocumentName; bool bMSCryptoMode = false; bool bIsPasswordToModify = false; - + bool bDoHandleRequest = false; uno::Any aAnyRequest(rRequest->getRequest()); @@ -716,7 +716,7 @@ UUIInteractionHelper::handlePasswordRequest( bDoHandleRequest = true; } - + task::DocumentMSPasswordRequest aDocumentMSPasswordRequest; if (!bDoHandleRequest && (aAnyRequest >>= aDocumentMSPasswordRequest)) { @@ -730,7 +730,7 @@ UUIInteractionHelper::handlePasswordRequest( if (bDoHandleRequest) { - handlePasswordRequest_( pParent, nMode, rContinuations, + handlePasswordRequest_( pParent, nMode, rContinuations, aDocumentName, bMSCryptoMode, bIsPasswordToModify ); return true; } diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx index db8da498c407..0c8d237f4a57 100644 --- a/uui/source/iahndl-cookies.cxx +++ b/uui/source/iahndl-cookies.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 3176171c4865..6388a900cfb1 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index c05762a82332..7a0a0c24ddba 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index d21fe3e98f0b..d233f93c7eb8 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index bb8148e17645..cac71ae2775a 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 4df133c7c674..24d60bdb2e9f 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 0879e3574da3..e90a0649936a 100755 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 581099462845..0f54e9ee8af1 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 796186fd5140..2641c5d32974 100755 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,7 +174,7 @@ #define HID_DLG_COOKIES (HID_UUI_START + 1) #define HID_DLG_MASTERPASSWORD_UUI (HID_UUI_START + 2) #define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START + 3) -#define HID_DLG_FILTER_SELECT (HID_UUI_START + 4) +#define HID_DLG_FILTER_SELECT (HID_UUI_START + 4) #define HID_DLG_PASSWORD_UUI (HID_UUI_START + 5) #define HID_DLG_PASSWORD_CRT (HID_UUI_START + 6) #define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START + 7) diff --git a/uui/source/ids.src b/uui/source/ids.src index 378b513b2e42..efff26286130 100644 --- a/uui/source/ids.src +++ b/uui/source/ids.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index ef4b3f7b0a71..08bc6724189f 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ sal_Bool SAL_CALL UUIInteractionHandler::supportsService(rtl::OUString const & rServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > + uno::Sequence< rtl::OUString > aNames(getSupportedServiceNames_static()); for (sal_Int32 i = 0; i < aNames.getLength(); ++i) if (aNames[i] == rServiceName) diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx index d470a07c9795..11c9b45075f7 100644 --- a/uui/source/interactionhandler.hxx +++ b/uui/source/interactionhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx index 7591deaff1c8..b5320a13038f 100644 --- a/uui/source/lockfailed.cxx +++ b/uui/source/lockfailed.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx index 2336d366ba80..70ba10796141 100644 --- a/uui/source/lockfailed.hxx +++ b/uui/source/lockfailed.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src index 1a3e1534d0ff..4ccc1c78b356 100644 --- a/uui/source/lockfailed.src +++ b/uui/source/lockfailed.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index d7ded58b5dde..efb0b77feab4 100755 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags ) if ( bAccountHide ) { - long nOffset = aAccountED.GetPosPixel().Y() - + long nOffset = aAccountED.GetPosPixel().Y() - aPasswordED.GetPosPixel().Y(); lcl_Move( aSavePasswdBtn, nOffset ); lcl_Move( aUseSysCredsCB, nOffset ); @@ -182,7 +182,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags ) if ( bUseSysCredsHide ) { - long nOffset = aUseSysCredsCB.GetPosPixel().Y() - + long nOffset = aUseSysCredsCB.GetPosPixel().Y() - aSavePasswdBtn.GetPosPixel().Y(); lcl_Move( aButtonsFL, nOffset ); lcl_Move( aOKBtn, nOffset ); @@ -265,21 +265,21 @@ LoginDialog::LoginDialog aLogin1FL ( this, ResId( FL_LOGIN_1, *pResMgr ) ), aRequestInfo ( this, ResId( FT_INFO_LOGIN_REQUEST, *pResMgr ) ), aLogin2FL ( this, ResId( FL_LOGIN_2, *pResMgr ) ), - aPathFT ( this, ResId( FT_LOGIN_PATH, *pResMgr ) ), - aPathED ( this, ResId( ED_LOGIN_PATH, *pResMgr ) ), - aPathBtn ( this, ResId( BTN_LOGIN_PATH, *pResMgr ) ), - aNameFT ( this, ResId( FT_LOGIN_USERNAME, *pResMgr ) ), - aNameED ( this, ResId( ED_LOGIN_USERNAME, *pResMgr ) ), - aPasswordFT ( this, ResId( FT_LOGIN_PASSWORD, *pResMgr ) ), - aPasswordED ( this, ResId( ED_LOGIN_PASSWORD, *pResMgr ) ), - aAccountFT ( this, ResId( FT_LOGIN_ACCOUNT, *pResMgr ) ), - aAccountED ( this, ResId( ED_LOGIN_ACCOUNT, *pResMgr ) ), - aSavePasswdBtn ( this, ResId( CB_LOGIN_SAVEPASSWORD, *pResMgr ) ), - aUseSysCredsCB ( this, ResId( CB_LOGIN_USESYSCREDS, *pResMgr ) ), + aPathFT ( this, ResId( FT_LOGIN_PATH, *pResMgr ) ), + aPathED ( this, ResId( ED_LOGIN_PATH, *pResMgr ) ), + aPathBtn ( this, ResId( BTN_LOGIN_PATH, *pResMgr ) ), + aNameFT ( this, ResId( FT_LOGIN_USERNAME, *pResMgr ) ), + aNameED ( this, ResId( ED_LOGIN_USERNAME, *pResMgr ) ), + aPasswordFT ( this, ResId( FT_LOGIN_PASSWORD, *pResMgr ) ), + aPasswordED ( this, ResId( ED_LOGIN_PASSWORD, *pResMgr ) ), + aAccountFT ( this, ResId( FT_LOGIN_ACCOUNT, *pResMgr ) ), + aAccountED ( this, ResId( ED_LOGIN_ACCOUNT, *pResMgr ) ), + aSavePasswdBtn ( this, ResId( CB_LOGIN_SAVEPASSWORD, *pResMgr ) ), + aUseSysCredsCB ( this, ResId( CB_LOGIN_USESYSCREDS, *pResMgr ) ), aButtonsFL ( this, ResId( FL_BUTTONS, *pResMgr ) ), - aOKBtn ( this, ResId( BTN_LOGIN_OK, *pResMgr ) ), - aCancelBtn ( this, ResId( BTN_LOGIN_CANCEL, *pResMgr ) ), - aHelpBtn ( this, ResId( BTN_LOGIN_HELP, *pResMgr ) ) + aOKBtn ( this, ResId( BTN_LOGIN_OK, *pResMgr ) ), + aCancelBtn ( this, ResId( BTN_LOGIN_CANCEL, *pResMgr ) ), + aHelpBtn ( this, ResId( BTN_LOGIN_HELP, *pResMgr ) ) { UniString aRequest; @@ -313,15 +313,15 @@ LoginDialog::LoginDialog LoginDialog::~LoginDialog() { -} +} // ----------------------------------------------------------------------- void LoginDialog::SetUseSystemCredentials( BOOL bUse ) -{ +{ if ( aUseSysCredsCB.IsVisible() ) { - aUseSysCredsCB.Check( bUse ); + aUseSysCredsCB.Check( bUse ); EnableUseSysCredsControls_Impl( bUse ); } } diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc index b541740bd768..d2a5d48aaf00 100755 --- a/uui/source/logindlg.hrc +++ b/uui/source/logindlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,8 +34,8 @@ #define FT_LOGIN_ERROR 11 #define FT_INFO_LOGIN_REQUEST 20 -#define FT_LOGIN_PATH 21 -#define ED_LOGIN_PATH 22 +#define FT_LOGIN_PATH 21 +#define ED_LOGIN_PATH 22 #define BTN_LOGIN_PATH 23 #define FT_LOGIN_USERNAME 24 #define ED_LOGIN_USERNAME 25 @@ -49,9 +49,9 @@ #define FL_LOGIN_2 33 #define FL_BUTTONS 34 -#define BTN_LOGIN_OK 50 -#define BTN_LOGIN_CANCEL 51 -#define BTN_LOGIN_HELP 52 +#define BTN_LOGIN_OK 50 +#define BTN_LOGIN_CANCEL 51 +#define BTN_LOGIN_HELP 52 #define STR_LOGIN_REALM 60 diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 05ba8e8d55d4..a349929ce7bd 100755 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ #include <vcl/fixed.hxx> //============================================================================ -#define LF_NO_PATH 0x0001 // hide "path" -#define LF_NO_USERNAME 0x0002 // hide "name" -#define LF_NO_PASSWORD 0x0004 // hide "password" -#define LF_NO_SAVEPASSWORD 0x0008 // hide "save password" -#define LF_NO_ERRORTEXT 0x0010 // hide message -#define LF_PATH_READONLY 0x0020 // "path" readonly -#define LF_USERNAME_READONLY 0x0040 // "name" readonly -#define LF_NO_ACCOUNT 0x0080 // hide "account" -#define LF_NO_USESYSCREDS 0x0100 // hide "use system cedentials" +#define LF_NO_PATH 0x0001 // hide "path" +#define LF_NO_USERNAME 0x0002 // hide "name" +#define LF_NO_PASSWORD 0x0004 // hide "password" +#define LF_NO_SAVEPASSWORD 0x0008 // hide "save password" +#define LF_NO_ERRORTEXT 0x0010 // hide message +#define LF_PATH_READONLY 0x0020 // "path" readonly +#define LF_USERNAME_READONLY 0x0040 // "name" readonly +#define LF_NO_ACCOUNT 0x0080 // hide "account" +#define LF_NO_USESYSCREDS 0x0100 // hide "use system cedentials" //............................................................................ //............................................................................ @@ -54,27 +54,27 @@ class LoginDialog : public ModalDialog { FixedText aErrorFT; - FixedInfo aErrorInfo; - FixedLine aLogin1FL; - FixedInfo aRequestInfo; - FixedLine aLogin2FL; - FixedText aPathFT; - Edit aPathED; - PushButton aPathBtn; - FixedText aNameFT; - Edit aNameED; - FixedText aPasswordFT; - Edit aPasswordED; - FixedText aAccountFT; - Edit aAccountED; - CheckBox aSavePasswdBtn; + FixedInfo aErrorInfo; + FixedLine aLogin1FL; + FixedInfo aRequestInfo; + FixedLine aLogin2FL; + FixedText aPathFT; + Edit aPathED; + PushButton aPathBtn; + FixedText aNameFT; + Edit aNameED; + FixedText aPasswordFT; + Edit aPasswordED; + FixedText aAccountFT; + Edit aAccountED; + CheckBox aSavePasswdBtn; CheckBox aUseSysCredsCB; - FixedLine aButtonsFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + FixedLine aButtonsFL; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - void HideControls_Impl( USHORT nFlags ); + void HideControls_Impl( USHORT nFlags ); void EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled ); DECL_LINK( OKHdl_Impl, OKButton * ); @@ -102,8 +102,8 @@ public: void SetUseSystemCredentials( BOOL bUse ); void SetErrorText( const String& rTxt ) { aErrorInfo.SetText( rTxt ); } void SetLoginRequestText( const String& rTxt ) { aRequestInfo.SetText( rTxt ); } - void ClearPassword(); - void ClearAccount(); + void ClearPassword(); + void ClearAccount(); }; // ----------------------------------------------------------------------- diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index bf6a97c3b0ff..d9a0e538c982 100755 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,13 +58,13 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 165 , 3*8 ) ; WordBreak = TRUE ; }; - + FixedLine FL_LOGIN_1 { Pos = MAP_APPFONT( 6 , 41 ) ; Size = MAP_APPFONT( 165 , 8 ) ; }; - + FixedText FT_INFO_LOGIN_REQUEST { Pos = MAP_APPFONT( 6 , 52 ) ; @@ -72,25 +72,25 @@ ModalDialog DLG_UUI_LOGIN WordBreak = TRUE ; Text [ en-US ] = "Enter user name and password for: \n%1" ; }; - + String STR_LOGIN_REALM { Text [ en-US ] = "Enter user name and password for: \n\"%2\" on %1" ; }; - + FixedLine FL_LOGIN_2 { Pos = MAP_APPFONT( 6 , 71 ) ; Size = MAP_APPFONT( 165 , 8 ) ; }; - + FixedText FT_LOGIN_PATH { Pos = MAP_APPFONT( 6 , 84 ) ; Size = MAP_APPFONT( 112 , 8 ) ; Text [ en-US ] = "~Path" ; }; - + Edit ED_LOGIN_PATH { HelpId = HID_LOGIN_DLG_PATH; @@ -105,14 +105,14 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 50 , 14 ) ; Text = "~Browse..." ; }; - + FixedText FT_LOGIN_USERNAME { Pos = MAP_APPFONT( 6 , 110 ) ; Size = MAP_APPFONT( 165 , 8 ) ; Text [ en-US ] = "~User name" ; }; - + Edit ED_LOGIN_USERNAME { HelpId = HID_LOGIN_DLG_USER_NAME; @@ -120,14 +120,14 @@ ModalDialog DLG_UUI_LOGIN Pos = MAP_APPFONT( 6 , 121 ) ; Size = MAP_APPFONT( 165 , 12 ) ; }; - + FixedText FT_LOGIN_PASSWORD { Pos = MAP_APPFONT( 6 , 136 ) ; Size = MAP_APPFONT( 165 , 8 ) ; Text [ en-US ] = "Pass~word" ; }; - + Edit ED_LOGIN_PASSWORD { HelpId = HID_LOGIN_DLG_PASSWORD; @@ -136,14 +136,14 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 165 , 12 ) ; PassWord = TRUE ; }; - + FixedText FT_LOGIN_ACCOUNT { Pos = MAP_APPFONT( 6 , 162 ) ; Size = MAP_APPFONT( 165 , 8 ) ; Text [ en-US ] = "A~ccount"; }; - + Edit ED_LOGIN_ACCOUNT { HelpId = HID_LOGIN_DLG_ACCOUNT; @@ -152,7 +152,7 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 165 , 12 ) ; PassWord = TRUE ; }; - + CheckBox CB_LOGIN_SAVEPASSWORD { HelpId = HID_LOGIN_DLG_REMEMBER_PASSWORD; @@ -160,7 +160,7 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 165 , 10 ) ; Text [ en-US ] = "~Remember password" ; }; - + CheckBox CB_LOGIN_USESYSCREDS { HelpId = HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS; @@ -168,26 +168,26 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 165 , 10 ) ; Text [ en-US ] = "~Use system credentials" ; }; - + FixedLine FL_BUTTONS { Pos = MAP_APPFONT( 0 , 216 ) ; Size = MAP_APPFONT( 177 , 8 ) ; }; - + OKButton BTN_LOGIN_OK { Pos = MAP_APPFONT( 6 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; DefButton = TRUE ; }; - + CancelButton BTN_LOGIN_CANCEL { Pos = MAP_APPFONT( 66 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; }; - + HelpButton BTN_LOGIN_HELP { Pos = MAP_APPFONT( 121 , 227 ) ; diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index af2ef194f22e..b9e82b862f84 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ IMPL_LINK( MasterPasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG ) MasterPasswordCreateDialog::MasterPasswordCreateDialog ( - Window* pParent, - ResMgr* pResMgr + Window* pParent, + ResMgr* pResMgr ) : ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD_CRT, *pResMgr ) ), @@ -80,8 +80,8 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog aFTMasterPasswordCrt ( this, ResId( FT_MASTERPASSWORD_CRT, *pResMgr ) ), aEDMasterPasswordCrt ( this, ResId( ED_MASTERPASSWORD_CRT, *pResMgr ) ), - aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT, *pResMgr ) ), - aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT, *pResMgr ) ), + aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT, *pResMgr ) ), + aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT, *pResMgr ) ), aFTCautionText ( this, ResId( FT_CAUTIONTEXT, *pResMgr ) ), aFLCautionText ( this, ResId( FL_CAUTIONTEXT, *pResMgr ) ), @@ -89,8 +89,8 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog aFTMasterPasswordWarning ( this, ResId( FT_MASTERPASSWORD_WARNING, *pResMgr ) ), aFL ( this, ResId( FL_FIXED_LINE, *pResMgr ) ), aOKBtn ( this, ResId( BTN_MASTERPASSCRT_OK, *pResMgr ) ), - aCancelBtn ( this, ResId( BTN_MASTERPASSCRT_CANCEL, *pResMgr ) ), - aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ), + aCancelBtn ( this, ResId( BTN_MASTERPASSCRT_CANCEL, *pResMgr ) ), + aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ), pResourceMgr ( pResMgr ), nMinLen ( 5 ) diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc index ff84830b5842..634a047478b6 100644 --- a/uui/source/masterpasscrtdlg.hrc +++ b/uui/source/masterpasscrtdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,17 +37,17 @@ #define FT_MASTERPASSWORD_CRT 20 #define ED_MASTERPASSWORD_CRT 21 -#define FT_MASTERPASSWORD_REPEAT 22 -#define ED_MASTERPASSWORD_REPEAT 23 -#define FT_MASTERPASSWORD_WARNING 24 +#define FT_MASTERPASSWORD_REPEAT 22 +#define ED_MASTERPASSWORD_REPEAT 23 +#define FT_MASTERPASSWORD_WARNING 24 #define FL_FIXED_LINE 30 #define FT_CAUTIONTEXT 30 #define FL_CAUTIONTEXT 31 -#define BTN_MASTERPASSCRT_OK 50 -#define BTN_MASTERPASSCRT_CANCEL 51 -#define BTN_MASTERPASSCRT_HELP 52 +#define BTN_MASTERPASSCRT_OK 50 +#define BTN_MASTERPASSCRT_CANCEL 51 +#define BTN_MASTERPASSCRT_HELP 52 #define ROW_0 (RSC_SP_FLGR_INNERBORDER_TOP) #define ROW_1 (ROW_0+7*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 29134b6b8fbc..6c652cbb44c4 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,19 +47,19 @@ private: FixedText aFTInfoText; FixedLine aFLInfoText; - FixedText aFTMasterPasswordCrt; - Edit aEDMasterPasswordCrt; - FixedText aFTMasterPasswordRepeat; - Edit aEDMasterPasswordRepeat; + FixedText aFTMasterPasswordCrt; + Edit aEDMasterPasswordCrt; + FixedText aFTMasterPasswordRepeat; + Edit aEDMasterPasswordRepeat; FixedText aFTCautionText; FixedLine aFLCautionText; - FixedText aFTMasterPasswordWarning; + FixedText aFTMasterPasswordWarning; FixedLine aFL; OKButton aOKBtn; CancelButton aCancelBtn; - HelpButton aHelpBtn; + HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); @@ -68,11 +68,11 @@ private: public: MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); - String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); } + String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); } private: - ResMgr* pResourceMgr; - sal_uInt16 nMinLen; + ResMgr* pResourceMgr; + sal_uInt16 nMinLen; void CalculateTextHeight(); }; diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src index 870cc8a2456f..65e24205a583 100644 --- a/uui/source/masterpasscrtdlg.src +++ b/uui/source/masterpasscrtdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index a5e35eaf755b..898b2eb9fe4f 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,21 +50,21 @@ IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) MasterPasswordDialog::MasterPasswordDialog ( - Window* pParent, - ::com::sun::star::task::PasswordRequestMode aDialogMode, - ResMgr* pResMgr + Window* pParent, + ::com::sun::star::task::PasswordRequestMode aDialogMode, + ResMgr* pResMgr ) : ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD, *pResMgr ) ), - aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD, *pResMgr ) ), - aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD, *pResMgr ) ), + aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD, *pResMgr ) ), + aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD, *pResMgr ) ), aFL ( this, ResId( FL_FIXED_LINE, *pResMgr ) ), - aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK, *pResMgr ) ), - aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL, *pResMgr ) ), - aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP, *pResMgr ) ), - nDialogMode ( aDialogMode ), - pResourceMgr ( pResMgr ) + aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK, *pResMgr ) ), + aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL, *pResMgr ) ), + aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP, *pResMgr ) ), + nDialogMode ( aDialogMode ), + pResourceMgr ( pResMgr ) { if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) { diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc index 7263b577a8cf..ae6b95b1df07 100644 --- a/uui/source/masterpassworddlg.hrc +++ b/uui/source/masterpassworddlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define UUI_MASTERPASSWORD_HRC //============================================================================ -#define FT_MASTERPASSWORD 20 -#define ED_MASTERPASSWORD 21 -#define FT_MASTERPASSWORD_REPEAT 22 -#define ED_MASTERPASSWORD_REPEAT 23 +#define FT_MASTERPASSWORD 20 +#define ED_MASTERPASSWORD 21 +#define FT_MASTERPASSWORD_REPEAT 22 +#define ED_MASTERPASSWORD_REPEAT 23 #define FL_FIXED_LINE 30 -#define BTN_MASTERPASSWORD_OK 50 -#define BTN_MASTERPASSWORD_CANCEL 51 -#define BTN_MASTERPASSWORD_HELP 52 +#define BTN_MASTERPASSWORD_OK 50 +#define BTN_MASTERPASSWORD_CANCEL 51 +#define BTN_MASTERPASSWORD_HELP 52 #endif // UUI_MASTERPASSWORD_HRC diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index a78cb6eb50b8..07753fbd3d4f 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ //============================================================================ class MasterPasswordDialog : public ModalDialog { - FixedText aFTMasterPassword; - Edit aEDMasterPassword; + FixedText aFTMasterPassword; + Edit aEDMasterPassword; FixedLine aFL; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); @@ -55,11 +55,11 @@ class MasterPasswordDialog : public ModalDialog public: MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); - String GetMasterPassword() const { return aEDMasterPassword.GetText(); } + String GetMasterPassword() const { return aEDMasterPassword.GetText(); } private: - ::com::sun::star::task::PasswordRequestMode nDialogMode; - ResMgr* pResourceMgr; + ::com::sun::star::task::PasswordRequestMode nDialogMode; + ResMgr* pResourceMgr; }; #endif // UUI_MASTERPASSWORDDLG_HXX diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src index c7bc835d92ee..29d799c5cc47 100644 --- a/uui/source/masterpassworddlg.src +++ b/uui/source/masterpassworddlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ ModalDialog DLG_UUI_MASTERPASSWORD { Pos = MAP_APPFONT( 0, 35 ); Size = MAP_APPFONT( 175, 6 ); - }; - + }; + OKButton BTN_MASTERPASSWORD_OK { Pos = MAP_APPFONT ( 65 , 45 ) ; @@ -76,7 +76,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD { Pos = MAP_APPFONT ( 5 , 45 ) ; Size = MAP_APPFONT ( 51 , 13 ) ; - }; + }; Text [ en-US ] = "Enter Master Password"; }; diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx index 855b4b67f778..204e2374d163 100644 --- a/uui/source/mphndl.hxx +++ b/uui/source/mphndl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,13 +43,13 @@ class UUIInteractionHandler: public com::sun::star::task::XInteractionHandler { ::com::sun::star::uno::Reference< ::com::sun::star::task::XPasswordContainer > mPContainer; - + public: static sal_Char const m_aImplementationName[]; UUIInteractionHandler( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const & ); - + virtual com::sun::star::uno::Any SAL_CALL queryInterface(com::sun::star::uno::Type const & rType) throw (com::sun::star::uno::RuntimeException); diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index f5d735b38d5b..03c8bd3755c6 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace container = ::com::sun::star::container; using namespace com::sun::star::system; -#define DEFINE_CONST_UNICODE( CONSTASCII ) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONSTASCII ) ) +#define DEFINE_CONST_UNICODE( CONSTASCII ) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONSTASCII ) ) namespace uui { @@ -148,7 +148,7 @@ IMPL_LINK( NewerVersionWarningDialog, UpdateHdl, PushButton*, EMPTYARG ) xDesktop->getCurrentFrame(), uno::UNO_QUERY ); if ( !xDispatchProvider.is() ) xDispatchProvider = uno::Reference < frame::XDispatchProvider > ( xDesktop, uno::UNO_QUERY ); - + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 ); if ( xDispatch.is() ) diff --git a/uui/source/newerverwarn.hrc b/uui/source/newerverwarn.hrc index 9097cf026b08..96551021cbaa 100644 --- a/uui/source/newerverwarn.hrc +++ b/uui/source/newerverwarn.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx index 574f3587daee..d108bbbfc8d2 100644 --- a/uui/source/newerverwarn.hxx +++ b/uui/source/newerverwarn.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src index 3de289d69baa..c9889e6648fd 100644 --- a/uui/source/newerverwarn.src +++ b/uui/source/newerverwarn.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx index 6112f157ca27..7b6e6a47a591 100644 --- a/uui/source/openlocked.cxx +++ b/uui/source/openlocked.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index c72704848fcc..ddb54713dfaa 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src index 9ec075774352..0e862064bcec 100644 --- a/uui/source/openlocked.src +++ b/uui/source/openlocked.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx index 1fc6024bcd19..6dbaeedd937d 100644 --- a/uui/source/passcrtdlg.cxx +++ b/uui/source/passcrtdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, ,aOKBtn ( this, ResId( BTN_PASSCRT_OK, *pResMgr ) ) ,aCancelBtn ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr ) ) ,aHelpBtn ( this, ResId( BTN_PASSCRT_HELP, *pResMgr ) ) - ,pResourceMgr ( pResMgr ) + ,pResourceMgr ( pResMgr ) ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode { FreeResource(); @@ -103,7 +103,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() ); long nNewLabelHeight = 0; - for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; + for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; nNewLabelHeight < aRect.GetHeight(); nNewLabelHeight += nTextHeight ) {} ; diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc index 5a999aa99209..8e3740abf037 100644 --- a/uui/source/passcrtdlg.hrc +++ b/uui/source/passcrtdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx index 8ad19c59924d..4e9d065ee157 100644 --- a/uui/source/passcrtdlg.hxx +++ b/uui/source/passcrtdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,18 +38,18 @@ //============================================================================ class PasswordCreateDialog : public ModalDialog { - FixedText aFTPasswordCrt; - Edit aEDPasswordCrt; - FixedText aFTPasswordRepeat; - Edit aEDPasswordRepeat; + FixedText aFTPasswordCrt; + Edit aEDPasswordCrt; + FixedText aFTPasswordRepeat; + Edit aEDPasswordRepeat; FixedText aFTWarning; FixedLine aFixedLine1; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - ResMgr* pResourceMgr; - sal_uInt16 nMinLen; + ResMgr* pResourceMgr; + sal_uInt16 nMinLen; DECL_LINK( OKHdl_Impl, OKButton * ); DECL_LINK( EditHdl_Impl, Edit * ); @@ -57,7 +57,7 @@ class PasswordCreateDialog : public ModalDialog public: PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false ); - String GetPassword() const { return aEDPasswordCrt.GetText(); } + String GetPassword() const { return aEDPasswordCrt.GetText(); } }; #endif // UUI_PASSCRTDLG_HXX diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src index a74752ed589e..b4ba3f212523 100644 --- a/uui/source/passcrtdlg.src +++ b/uui/source/passcrtdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ ModalDialog DLG_UUI_PASSWORD_CRT { Pos = MAP_APPFONT( 105, 110 ); Size = MAP_APPFONT( 37, 15 ); - }; + }; FixedText FT_PASSWORD_REPEAT { Pos = MAP_APPFONT( 3, 34 ); @@ -102,7 +102,7 @@ ModalDialog DLG_UUI_PASSWORD_CRT { Pos = MAP_APPFONT( 0, 104 ); Size = MAP_APPFONT( 145, 6 ); - }; + }; Text [ en-US ] = "Enter Password"; }; diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index c89184f54bc1..b66659ff6e94 100755 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ PasswordDialog::PasswordDialog( ResMgr * pResMgr, rtl::OUString& aDocURL, bool bOpenToModify ) - + :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) ) ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr )) ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr )) @@ -91,7 +91,7 @@ PasswordDialog::PasswordDialog( Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() ); long nNewLabelHeight = 0; - for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; + for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; nNewLabelHeight < aRect.GetHeight(); nNewLabelHeight += nTextHeight ) {} ; diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index ad7517b7a62b..edda2504c1cd 100644 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index fe5fe7f2ef84..e5a0a7885b2b 100755 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ //============================================================================ class PasswordDialog : public ModalDialog { - FixedText aFTPassword; - Edit aEDPassword; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + FixedText aFTPassword; + Edit aEDPassword; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; FixedLine aFixedLine1; @@ -52,11 +52,11 @@ class PasswordDialog : public ModalDialog public: PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, bool bOpenToModify = false ); - String GetPassword() const { return aEDPassword.GetText(); } + String GetPassword() const { return aEDPassword.GetText(); } private: - ::com::sun::star::task::PasswordRequestMode nDialogMode; - ResMgr* pResourceMgr; + ::com::sun::star::task::PasswordRequestMode nDialogMode; + ResMgr* pResourceMgr; }; #endif // PASSWORDDLG_HXX diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index 33767057e1bd..7a96c4aa5a29 100755 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src index 91b244ae543e..6476e2831981 100755 --- a/uui/source/passworderrs.src +++ b/uui/source/passworderrs.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index 319109bd45df..eeed50049c47 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver() delete m_pImpl; } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL UUIInteractionRequestStringResolver::getImplementationName() throw (star::uno::RuntimeException) { @@ -71,10 +71,10 @@ UUIInteractionRequestStringResolver::getSupportedServiceNames() return getSupportedServiceNames_static(); } -star::beans::Optional< rtl::OUString > SAL_CALL -UUIInteractionRequestStringResolver::getStringFromInformationalRequest( - const star::uno::Reference< - star::task::XInteractionRequest >& Request ) +star::beans::Optional< rtl::OUString > SAL_CALL +UUIInteractionRequestStringResolver::getStringFromInformationalRequest( + const star::uno::Reference< + star::task::XInteractionRequest >& Request ) throw (star::uno::RuntimeException) { try diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index b021bcebeb88..9b52a3f37103 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class UUIInteractionHelper; class UUIInteractionRequestStringResolver: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, com::sun::star::task::XInteractionRequestStringResolver > { @@ -75,15 +75,15 @@ private: virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & rServiceName) throw (com::sun::star::uno::RuntimeException); - + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::beans::Optional< rtl::OUString > SAL_CALL - getStringFromInformationalRequest( - const com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest >& Request ) + virtual com::sun::star::beans::Optional< rtl::OUString > SAL_CALL + getStringFromInformationalRequest( + const com::sun::star::uno::Reference< + com::sun::star::task::XInteractionRequest >& Request ) throw (com::sun::star::uno::RuntimeException); }; diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index e283ca27d93f..6b62384feb92 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ using namespace ::com::sun::star::security; #include "secmacrowarnings.hrc" #ifdef _MSC_VER -#pragma warning (disable : 4355) // 4355: this used in initializer-list +#pragma warning (disable : 4355) // 4355: this used in initializer-list #endif using namespace ::com::sun::star; @@ -55,15 +55,15 @@ namespace { String GetContentPart( const String& _rRawString, const String& _rPartId ) { - String s; + String s; - xub_StrLen nContStart = _rRawString.Search( _rPartId ); + xub_StrLen nContStart = _rRawString.Search( _rPartId ); if( nContStart != STRING_NOTFOUND ) { nContStart = nContStart + _rPartId.Len(); - ++nContStart; // now it's start of content, directly after Id + ++nContStart; // now it's start of content, directly after Id - xub_StrLen nContEnd = _rRawString.Search( sal_Unicode( ',' ), nContStart ); + xub_StrLen nContEnd = _rRawString.Search( sal_Unicode( ',' ), nContStart ); s = String( _rRawString, nContStart, nContEnd - nContStart ); } @@ -74,23 +74,23 @@ namespace MacroWarning::MacroWarning( Window* _pParent, bool _bWithSignatures, ResMgr& rResMgr ) - :ModalDialog ( _pParent, ResId( RID_XMLSECDLG_MACROWARN, rResMgr ) ) - ,mpInfos ( NULL ) - ,maSymbolImg ( this, ResId( IMG_SYMBOL, rResMgr ) ) - ,maDocNameFI ( this, ResId( FI_DOCNAME, rResMgr ) ) - ,maDescr1aFI ( this, ResId( FI_DESCR1A, rResMgr ) ) - ,maDescr1bFI ( this, ResId( FI_DESCR1B, rResMgr ) ) - ,maSignsFI ( this, ResId( FI_SIGNS, rResMgr ) ) - ,maViewSignsBtn ( this, ResId( PB_VIEWSIGNS, rResMgr ) ) - ,maDescr2FI ( this, ResId( FI_DESCR2, rResMgr ) ) - ,maAlwaysTrustCB ( this, ResId( CB_ALWAYSTRUST, rResMgr ) ) - ,maBottomSepFL ( this, ResId( FL_BOTTOM_SEP, rResMgr ) ) - ,maEnableBtn ( this, ResId( PB_ENABLE, rResMgr ) ) - ,maDisableBtn ( this, ResId( PB_DISABLE, rResMgr ) ) - ,maHelpBtn ( this, ResId( BTN_HELP, rResMgr ) ) - ,mbSignedMode ( true ) + :ModalDialog ( _pParent, ResId( RID_XMLSECDLG_MACROWARN, rResMgr ) ) + ,mpInfos ( NULL ) + ,maSymbolImg ( this, ResId( IMG_SYMBOL, rResMgr ) ) + ,maDocNameFI ( this, ResId( FI_DOCNAME, rResMgr ) ) + ,maDescr1aFI ( this, ResId( FI_DESCR1A, rResMgr ) ) + ,maDescr1bFI ( this, ResId( FI_DESCR1B, rResMgr ) ) + ,maSignsFI ( this, ResId( FI_SIGNS, rResMgr ) ) + ,maViewSignsBtn ( this, ResId( PB_VIEWSIGNS, rResMgr ) ) + ,maDescr2FI ( this, ResId( FI_DESCR2, rResMgr ) ) + ,maAlwaysTrustCB ( this, ResId( CB_ALWAYSTRUST, rResMgr ) ) + ,maBottomSepFL ( this, ResId( FL_BOTTOM_SEP, rResMgr ) ) + ,maEnableBtn ( this, ResId( PB_ENABLE, rResMgr ) ) + ,maDisableBtn ( this, ResId( PB_DISABLE, rResMgr ) ) + ,maHelpBtn ( this, ResId( BTN_HELP, rResMgr ) ) + ,mbSignedMode ( true ) ,mbShowSignatures ( _bWithSignatures ) - ,mnActSecLevel ( 0 ) + ,mnActSecLevel ( 0 ) { FreeResource(); @@ -138,7 +138,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) { if( mbSignedMode && maAlwaysTrustCB.IsChecked() ) - { // insert path into trusted path list + { // insert path into trusted path list uno::Sequence< uno::Any > aArgs( 1 ); aArgs[0] = uno::makeAny( maODFVersion ); uno::Reference< security::XDocumentDigitalSignatures > xD( @@ -151,7 +151,7 @@ IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) { DBG_ASSERT( mpInfos, "-MacroWarning::EnableBtnHdl(): no infos, search in nirvana..." ); - sal_Int32 nCnt = mpInfos->getLength(); + sal_Int32 nCnt = mpInfos->getLength(); for( sal_Int32 i = 0 ; i < nCnt ; ++i ) xD->addAuthorToTrustedSources( (*mpInfos)[ i ].Signer ); } @@ -344,12 +344,12 @@ void MacroWarning::SetStorage( const cssu::Reference < css::embed::XStorage >& r { mxStore = rxStore; maODFVersion = aODFVersion; - sal_Int32 nCnt = rInfos.getLength(); + sal_Int32 nCnt = rInfos.getLength(); if( mxStore.is() && nCnt > 0 ) { mpInfos = &rInfos; - String aCN_Id( String::CreateFromAscii( "CN" ) ); - String s; + String aCN_Id( String::CreateFromAscii( "CN" ) ); + String s; s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id ); for( sal_Int32 i = 1 ; i < nCnt ; ++i ) @@ -368,8 +368,8 @@ void MacroWarning::SetCertificate( const cssu::Reference< css::security::XCertif mxCert = _rxCert; if( mxCert.is() ) { - String aCN_Id( String::CreateFromAscii( "CN" ) ); - String s; + String aCN_Id( String::CreateFromAscii( "CN" ) ); + String s; s = GetContentPart( mxCert->getSubjectName(), aCN_Id ); maSignsFI.SetText( s ); maViewSignsBtn.Enable(); diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc index 38e8974a3d2c..38ea65952ef0 100644 --- a/uui/source/secmacrowarnings.hrc +++ b/uui/source/secmacrowarnings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,47 +32,47 @@ // --------- general metrics --------- -#define SEP_FL_SPACE_Y 6 -#define SEP_FL_ADJ_Y(val) (val-3) -#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM) -#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT) -#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5) -#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3) -#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) -#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) +#define SEP_FL_SPACE_Y 6 +#define SEP_FL_ADJ_Y(val) (val-3) +#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM) +#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT) +#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5) +#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3) +#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) +#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH) // --------- signed macro warning --------- -#define FI_DOCNAME 1 -#define FI_DESCR1A 2 -#define FI_SIGNS 3 -#define PB_VIEWSIGNS 4 -#define FI_DESCR2 5 -#define CB_ALWAYSTRUST 6 -#define PB_ENABLE 7 -#define PB_DISABLE 8 -#define FI_DESCR1B 9 -#define FL_BOTTOM_SEP 10 -#define BTN_HELP 11 -#define IMG_SYMBOL 12 +#define FI_DOCNAME 1 +#define FI_DESCR1A 2 +#define FI_SIGNS 3 +#define PB_VIEWSIGNS 4 +#define FI_DESCR2 5 +#define CB_ALWAYSTRUST 6 +#define PB_ENABLE 7 +#define PB_DISABLE 8 +#define FI_DESCR1B 9 +#define FL_BOTTOM_SEP 10 +#define BTN_HELP 11 +#define IMG_SYMBOL 12 #define MW_WIDTH 220 #define MW_HEIGHT 190 -#define MW_SYMBOL_WIDTH (20) +#define MW_SYMBOL_WIDTH (20) #define MW_SYMBOL_HEIGHT (20) -#define MW_COL_0 (RSC_SP_DLG_INNERBORDER_LEFT) +#define MW_COL_0 (RSC_SP_DLG_INNERBORDER_LEFT) #define MW_COL_1 (MW_COL_0+MW_SYMBOL_WIDTH+RSC_SP_CTRL_DESC_X) #define MW_COL_4 (MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) #define MW_COL_3 (MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH) -#define MW_COL_2 (MW_COL_3-RSC_SP_CTRL_DESC_X) +#define MW_COL_2 (MW_COL_3-RSC_SP_CTRL_DESC_X) #define MW_COL_A (DLGS_BOTTOM_OK_X(MW_WIDTH)) -#define MW_COL_C (DLGS_BOTTOM_CANCEL_X(MW_WIDTH)) -#define MW_COL_E (DLGS_BOTTOM_HELP_X(MW_WIDTH)) +#define MW_COL_C (DLGS_BOTTOM_CANCEL_X(MW_WIDTH)) +#define MW_COL_E (DLGS_BOTTOM_HELP_X(MW_WIDTH)) #define MW_ROW_0 (RSC_SP_DLG_INNERBORDER_TOP) #define MW_ROW_1 (MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 4e229eebb0c6..9889d9a363be 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,32 +55,32 @@ class MacroWarning : public ModalDialog { private: - cssu::Reference< css::security::XCertificate > mxCert; - cssu::Reference< css::embed::XStorage > mxStore; + cssu::Reference< css::security::XCertificate > mxCert; + cssu::Reference< css::embed::XStorage > mxStore; ::rtl::OUString maODFVersion; - const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos; - - FixedImage maSymbolImg; - FixedInfo maDocNameFI; - FixedInfo maDescr1aFI; - FixedInfo maDescr1bFI; - FixedInfo maSignsFI; - PushButton maViewSignsBtn; - FixedInfo maDescr2FI; - CheckBox maAlwaysTrustCB; - FixedLine maBottomSepFL; + const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos; + + FixedImage maSymbolImg; + FixedInfo maDocNameFI; + FixedInfo maDescr1aFI; + FixedInfo maDescr1bFI; + FixedInfo maSignsFI; + PushButton maViewSignsBtn; + FixedInfo maDescr2FI; + CheckBox maAlwaysTrustCB; + FixedLine maBottomSepFL; OKButton maEnableBtn; CancelButton maDisableBtn; - HelpButton maHelpBtn; + HelpButton maHelpBtn; - const bool mbSignedMode; // modus of dialog (signed / unsigned macros) + const bool mbSignedMode; // modus of dialog (signed / unsigned macros) const bool mbShowSignatures; - sal_Int32 mnActSecLevel; + sal_Int32 mnActSecLevel; - DECL_LINK( ViewSignsBtnHdl, void* ); - DECL_LINK( EnableBtnHdl, void* ); - DECL_LINK( DisableBtnHdl, void* ); - DECL_LINK( AlwaysTrustCheckHdl, void* ); + DECL_LINK( ViewSignsBtnHdl, void* ); + DECL_LINK( EnableBtnHdl, void* ); + DECL_LINK( DisableBtnHdl, void* ); + DECL_LINK( AlwaysTrustCheckHdl, void* ); void InitControls(); void FitControls(); @@ -93,10 +93,10 @@ public: void SetDocumentURL( const String& rDocURL ); - void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore, + void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore, const ::rtl::OUString& aODFVersion, const cssu::Sequence< css::security::DocumentSignatureInformation >& _rInfos ); - void SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert ); + void SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert ); }; #endif diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src index 6d0039da7746..9ae4186ec89e 100644 --- a/uui/source/secmacrowarnings.src +++ b/uui/source/secmacrowarnings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 95d4d65b6faf..7ec7c34056af 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index bed776e7f3de..95ddef20386d 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >( getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY ); - + xDocumentDigitalSignatures.get()->showCertificate(getCert()); return 0; @@ -65,10 +65,10 @@ IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) SSLWarnDialog::SSLWarnDialog ( - Window* pParent, + Window* pParent, const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - ResMgr* pResMgr + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + ResMgr* pResMgr ) : ModalDialog( pParent, ResId( DLG_UUI_SSLWARN, *pResMgr ) ), @@ -80,7 +80,7 @@ SSLWarnDialog::SSLWarnDialog m_aWarnImage ( this, ResId( IMG_WARN, *pResMgr ) ), m_xServiceFactory ( xServiceFactory ), m_rXCert ( rXCert ), - pResourceMgr ( pResMgr ) + pResourceMgr ( pResMgr ) { FreeResource(); m_aWarnImage.SetImage( WarningBox::GetStandardImage() ); diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc index f5bbf00c6f37..6dc5822bf6cb 100644 --- a/uui/source/sslwarndlg.hrc +++ b/uui/source/sslwarndlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,11 +32,11 @@ // local identifiers #define FT_LABEL_1 1 -#define PB_OK 4 +#define PB_OK 4 #define PB_VIEW__CERTIFICATE 5 -#define PB_CANCEL 6 -#define IMG_WARN 7 -#define FL_LINE 9 +#define PB_CANCEL 6 +#define IMG_WARN 7 +#define FL_LINE 9 // Dims @@ -50,11 +50,11 @@ #define DLG_TEXT_START_X RSC_SP_DLG_INNERBORDER_LEFT + DLG_WARMIMG_WIDTH + RSC_SP_CTRL_X -#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT +#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT #define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 20 #define DLG_CTLBTN_CANCEL_START_X DLG_WIDTH - 45 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH #define DLG_CTLBTN_OK_START_X DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X -#define DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 25 +#define DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 25 #define DLG_CTLBTN_CERT_START_X DLG_TEXT_START_X #endif //UUI_SSLWARN_HRC diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index cf8aa0a5511c..4e94cc88559e 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,13 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ +#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; +namespace dcss = ::com::sun::star; using namespace com::sun::star; @@ -53,31 +53,31 @@ private: FixedText m_aLabel1; PushButton m_aOkButton; CancelButton m_aCancelButton; - PushButton m_aCommandButtonViewCert; - FixedLine m_aLine; + PushButton m_aCommandButtonViewCert; + FixedLine m_aLine; FixedImage m_aWarnImage; - + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& m_xServiceFactory; const cssu::Reference< dcss::security::XCertificate >& m_rXCert; Window* m_pParent; - ResMgr* pResourceMgr; + ResMgr* pResourceMgr; DECL_LINK( OKHdl_Impl, PushButton * ); DECL_LINK( ViewCertHdl_Impl, PushButton * ); public: - SSLWarnDialog( Window* pParent, + SSLWarnDialog( Window* pParent, const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, ResMgr * pResMgr ); - + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > getServiceFactory() { return m_xServiceFactory; }; - - cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; - + + cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; + Window* getParent() { return m_pParent; }; - + void setDescription1Text( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); }; }; diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src index acae9453a971..bea7d06da3cf 100644 --- a/uui/source/sslwarndlg.src +++ b/uui/source/sslwarndlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,15 +88,15 @@ ModalDialog DLG_UUI_SSLWARN { Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ); Size = MAP_APPFONT( DLG_WARMIMG_WIDTH , DLG_WARMIMG_HEIGHT ); - + Fixed = Image { /* ImageBitmap = Bitmap { File = "certificate_40x56.png"; }; */ MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;}; }; - + }; - + FixedLine FL_LINE { Pos = MAP_APPFONT( 0, DLG_CTLBTN_START_Y - RSC_SP_FLGR_INNERBORDER_TOP - RSC_CD_FIXEDLINE_HEIGHT ); diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx index 893455d134de..80599081a3ef 100644 --- a/uui/source/trylater.cxx +++ b/uui/source/trylater.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx index cb8082b4a6a9..e8040c153e36 100644 --- a/uui/source/trylater.hxx +++ b/uui/source/trylater.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/trylater.src b/uui/source/trylater.src index 4f328fed7c02..acc799ac168f 100644 --- a/uui/source/trylater.src +++ b/uui/source/trylater.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 3a58d69842ea..e49ba7680c18 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >( getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY ); - + xDocumentDigitalSignatures.get()->showCertificate(getCert()); return 0; @@ -72,13 +72,13 @@ IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG ) UnknownAuthDialog::UnknownAuthDialog ( - Window* pParent, + Window* pParent, const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - ResMgr* pResMgr + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + ResMgr* pResMgr ) : ModalDialog( pParent, ResId( DLG_UUI_UNKNOWNAUTH, *pResMgr ) ), - + m_aCommandButtonOK ( this, ResId( PB_OK, *pResMgr ) ), m_aCommandButtonCancel ( this, ResId( PB_CANCEL, *pResMgr ) ), m_aCommandButtonHelp ( this, ResId( PB_HELP, *pResMgr ) ), @@ -92,7 +92,7 @@ UnknownAuthDialog::UnknownAuthDialog m_rXCert ( rXCert ), pResourceMgr ( pResMgr ) { - //SetMapMode( MapMode( MAP_APPFONT ) ); + //SetMapMode( MapMode( MAP_APPFONT ) ); FreeResource(); m_aWarnImage.SetImage( WarningBox::GetStandardImage() ); diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc index e9cc84fc1896..9bb6b0dea642 100644 --- a/uui/source/unknownauthdlg.hrc +++ b/uui/source/unknownauthdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,14 +30,14 @@ #include <svtools/controldims.hrc> // local identifiers -#define RB_ACCEPT_1 1 -#define PB_OK 2 +#define RB_ACCEPT_1 1 +#define PB_OK 2 #define PB_VIEW__CERTIFICATE 3 -#define PB_CANCEL 4 +#define PB_CANCEL 4 #define FT_LABEL_1 5 -#define RB_DONTACCEPT_2 6 -#define IMG_WARN 7 -#define PB_HELP 8 +#define RB_DONTACCEPT_2 6 +#define IMG_WARN 7 +#define PB_HELP 8 #define FL_LINE 10 // Dims @@ -54,7 +54,7 @@ #define DLG_RADIOBTN_START_Y RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_Y + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y -#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT +#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT #define DLG_CTLBTN_OK_START_X DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 0d1f3ba1540b..0ca6c38fe8c3 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,16 +33,16 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ +#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; +namespace dcss = ::com::sun::star; -using namespace com::sun::star; +using namespace com::sun::star; //===================================================================== //= Https_UADialog @@ -59,27 +59,27 @@ private: FixedLine m_aLine; FixedText m_aLabel1; FixedImage m_aWarnImage; - + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& m_xServiceFactory; const cssu::Reference< dcss::security::XCertificate >& m_rXCert; Window* m_pParent; - ResMgr* pResourceMgr; + ResMgr* pResourceMgr; DECL_LINK( OKHdl_Impl, PushButton * ); DECL_LINK( ViewCertHdl_Impl, PushButton * ); public: - UnknownAuthDialog( Window* pParent, + UnknownAuthDialog( Window* pParent, const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, ResMgr * pResMgr ); - + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > getServiceFactory() { return m_xServiceFactory; }; - - cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; - + + cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; + Window* getParent() { return m_pParent; }; - + void setDescriptionText( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); }; }; diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src index d20a28a00704..aadb52282d42 100644 --- a/uui/source/unknownauthdlg.src +++ b/uui/source/unknownauthdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,16 +50,16 @@ ModalDialog DLG_UUI_UNKNOWNAUTH { Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ); Size = MAP_APPFONT( DLG_WARMIMG_WIDTH , DLG_WARMIMG_HEIGHT ); - + Fixed = Image { /* ImageBitmap = Bitmap { File = "certificate_40x56.png"; }; */ MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;}; }; - + }; - - + + PushButton PB_VIEW__CERTIFICATE { Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y ); @@ -68,7 +68,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH Text [ en-US ] = "Examine Certificate..."; }; - + HelpButton PB_HELP { Pos = MAP_APPFONT( DLG_CTLBTN_HELP_START_X, DLG_CTLBTN_START_Y ); @@ -124,12 +124,12 @@ ModalDialog DLG_UUI_UNKNOWNAUTH WordBreak = TRUE; }; - + FixedLine FL_LINE { Pos = MAP_APPFONT( 0, DLG_CTLBTN_START_Y - RSC_SP_FLGR_INNERBORDER_TOP - RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ); }; - + }; |